From 3cbaafe7c8dc4ca28217f40e37ccca4b357bea69 Mon Sep 17 00:00:00 2001 From: Brian Wells Date: Fri, 19 Mar 2021 11:22:39 -0500 Subject: [PATCH 1/5] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index cea0a81b..273c5b2a 100644 --- a/composer.json +++ b/composer.json @@ -21,16 +21,16 @@ "require": { "ext-json": "*", "guzzlehttp/guzzle": "^6.3", - "php": "~7.1", + "php": ">=7.1", "symfony/filesystem": ">=2.3", "symfony/process": ">=3.3", "wrench/wrench": "~2.0.10" }, "require-dev": { - "jakub-onderka/php-parallel-lint": "~1.0.0", + "php-parallel-lint/php-parallel-lint": "^1.2", "nette/php-generator": "~2.1|~3.0", - "phpstan/phpstan": "^0.11.4", - "phpunit/phpunit": "~6.4" + "phpstan/phpstan": "^0.12.82", + "phpunit/phpunit": "~6.4|^9.0" }, "autoload": { "psr-4": { From ee51390017109c010effb3c2b539ee0521e2dc9d Mon Sep 17 00:00:00 2001 From: Brian Wells Date: Fri, 19 Mar 2021 11:22:44 -0500 Subject: [PATCH 2/5] Update config.yml --- .circleci/config.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a80157db..1181ab65 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,6 +139,52 @@ jobs: - store_test_results: path: /tmp/phpunit +test_8_0: + docker: + - image: circleci/php:8.0-node-browsers + steps: + - checkout + - run: sudo docker-php-ext-install sockets + - restore_cache: + keys: + - v3_composer_{{ .Branch }} + - run: + command: | + composer update --prefer-dist --no-progress --classmap-authoritative + - save_cache: + key: v3_composer_{{ .Branch }} + paths: + - ~/.composer/cache + - run: + command: | + mkdir -p /tmp/phpunit + PHPUNIT_FLAGS="--log-junit /tmp/phpunit/junit.xml" make -e test + - store_test_results: + path: /tmp/phpunit + + test_8_0_lowest: + docker: + - image: circleci/php:8.0-node-browsers + steps: + - checkout + - run: sudo docker-php-ext-install sockets + - restore_cache: + keys: + - v3_composer_lowest_{{ .Branch }} + - run: + command: | + composer update --prefer-dist --no-progress --classmap-authoritative --prefer-lowest + - save_cache: + key: v3_composer_lowest_{{ .Branch }} + paths: + - ~/.composer/cache + - run: + command: | + mkdir -p /tmp/phpunit + PHPUNIT_FLAGS="--log-junit /tmp/phpunit/junit.xml" make -e lint phpunit + - store_test_results: + path: /tmp/phpunit + check_protocol: docker: - image: circleci/php:7.3-node-browsers @@ -205,6 +251,8 @@ workflows: - test_7_3_lowest - test_7_4 - test_7_4_lowest + - test_8_0 + - test_8_0_lowest - check_protocol nightly: From 4ce56579706dbd8fb264ec0e4b2e680a131262ba Mon Sep 17 00:00:00 2001 From: Brian Wells Date: Fri, 19 Mar 2021 11:22:47 -0500 Subject: [PATCH 3/5] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4fbb073c..525642da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vendor/ /composer.lock +.phpunit.result.cache From cff16a48f90a06b059d36f737fb195a453db11de Mon Sep 17 00:00:00 2001 From: Brian Wells Date: Fri, 19 Mar 2021 11:22:51 -0500 Subject: [PATCH 4/5] Update phpstan.neon --- phpstan.neon | 1 + 1 file changed, 1 insertion(+) diff --git a/phpstan.neon b/phpstan.neon index ee1b742f..1e56f302 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,4 +1,5 @@ parameters: + checkMissingIterableValueType: false excludes_analyse: # Probably some messed-up imports in PHPStan 0.9, reports errors such as: # Method ChromeDevtoolsProtocol\Session::accessibility() should return ChromeDevtoolsProtocol\Domain\AccessibilityDomainInterface but returns object. From c48fdc81cd068f051ebc6c02476666c45aa3da6e Mon Sep 17 00:00:00 2001 From: Brian Wells Date: Fri, 19 Mar 2021 12:17:25 -0500 Subject: [PATCH 5/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 273c5b2a..99372ba7 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "minimum-stability": "stable", "require": { "ext-json": "*", - "guzzlehttp/guzzle": "^6.3", + "guzzlehttp/guzzle": "^7.0", "php": ">=7.1", "symfony/filesystem": ">=2.3", "symfony/process": ">=3.3",