From 0e13a21b9b1622d00ddd5122f7229522db2af7c0 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Fri, 27 Nov 2020 08:55:11 +0100 Subject: [PATCH 1/3] Allow PHP 8 --- .travis.yml | 2 ++ composer.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ee1f9c..9f798d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ matrix: env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" - php: 7.4 env: COMPOSER_FLAGS="--prefer-stable" COVERAGE=true TEST_COMMAND="composer test-ci" + - php: 8.0 + env: COMPOSER_FLAGS="--prefer-stable" TEST_COMMAND="composer test-ci" before_install: - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi diff --git a/composer.json b/composer.json index 6f60d01..d09d616 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "guzzlehttp/psr7": "^1.7", "php-http/client-common": "^2.0", "psr/log": "^1.1", From 04a4410cb32a08830efa489e43bb5eaa99bd15e7 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Fri, 27 Nov 2020 10:57:56 +0100 Subject: [PATCH 2/3] Try 8.0snapshot --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f798d1..8f3630e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ php: - 7.2 - 7.3 - 7.4 + - 8.0snapshot env: global: @@ -26,8 +27,6 @@ matrix: env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" - php: 7.4 env: COMPOSER_FLAGS="--prefer-stable" COVERAGE=true TEST_COMMAND="composer test-ci" - - php: 8.0 - env: COMPOSER_FLAGS="--prefer-stable" TEST_COMMAND="composer test-ci" before_install: - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi From c35e4d856d788dc5bf729f815e2775533cb7a5d4 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 10:04:46 +0100 Subject: [PATCH 3/3] Remove php-cs-fixer, which is incompatible with PHP 8 --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index d09d616..0255840 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ }, "require-dev": { "symfony/phpunit-bridge": "^4.2|^5.0", - "friendsofphp/php-cs-fixer": "^2.14", "phpstan/phpstan": "^0.12.57" }, "autoload": {