From 89c1574e008ecb800573ae4f06a1c20eac6a8a27 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:08:30 +0100 Subject: [PATCH 1/8] Allow PHP 8 --- .travis.yml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b86da7f..8ebbd99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ matrix: - php: 7.2 - php: 7.3 env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" + - php: 8.0snapshot # Force some major versions of Symfony - php: 7.3 diff --git a/composer.json b/composer.json index 5fe9191..4016a01 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.1", + "php": ">=7.1", "symfony/stopwatch": "^3.4 || ^4.0 || ^5.0", "php-http/client-common": "^1.9 || ^2.0" }, From ef6cdb3d0d66cc228b4df1fc30b6e25f10df433f Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:14:37 +0100 Subject: [PATCH 2/8] Use newer PHPSpec to fix namespace issue --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4016a01..3f0e388 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "php-http/client-common": "^1.9 || ^2.0" }, "require-dev": { - "phpspec/phpspec": "^2.5 || ^3.0 || ^4.0" + "phpspec/phpspec": "^7.0" }, "autoload": { "psr-4": { From 6822cdb7e40a507fc5927388778ec9b1fbc4433f Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:16:29 +0100 Subject: [PATCH 3/8] Remove short_array_syntax "Arrays MUST use the short syntax." https://docs.styleci.io/fixers#short_array_syntax --- .styleci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 3417c41..1e6efad 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -6,6 +6,3 @@ finder: path: - "src" - "tests" - -enabled: - - short_array_syntax From 1f5ce5560295b8bfbe80e751defe94d2025ebcf3 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:18:22 +0100 Subject: [PATCH 4/8] Clean up testing matrix --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ebbd99..2cf8f6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,14 @@ matrix: fast_finish: true include: # Test with lowest dependencies - - php: 7.1 + - php: 7.3 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" # Test the latest stable release - - php: 7.1 - - php: 7.2 - php: 7.3 - env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" + - php: 7.4 - php: 8.0snapshot + env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" # Force some major versions of Symfony - php: 7.3 @@ -36,7 +35,7 @@ matrix: env: SYMFONY_REQUIRE="5" # Latest commit to master - - php: 7.3 + - php: 8.0snapshot env: STABILITY="dev" allow_failures: From f1a6e3ffef58d95d7866371cf4ba655068f82493 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:25:22 +0100 Subject: [PATCH 5/8] Narrow PHP version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3f0e388..07c4ba8 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": ">=7.1", + "php": "^7.3 || ^8.0", "symfony/stopwatch": "^3.4 || ^4.0 || ^5.0", "php-http/client-common": "^1.9 || ^2.0" }, From 36161e444cb37016858a2b983a941cfce9aa6261 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:29:05 +0100 Subject: [PATCH 6/8] Remove custom dependency --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cf8f6a..9d8175f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - php: 7.3 - php: 7.4 - php: 8.0snapshot - env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" + env: COVERAGE=true TEST_COMMAND="composer test-ci" # Force some major versions of Symfony - php: 7.3 From 1e7190896b92432c53adcf38d418ba8c3ba8aa58 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:48:38 +0100 Subject: [PATCH 7/8] Run coverage on 7.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d8175f..4486c82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ matrix: # Test the latest stable release - php: 7.3 - php: 7.4 - - php: 8.0snapshot env: COVERAGE=true TEST_COMMAND="composer test-ci" + - php: 8.0snapshot # Force some major versions of Symfony - php: 7.3 From 1713cf222569ff8c8c503a27692deebe9c651fa2 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 30 Nov 2020 12:56:46 +0100 Subject: [PATCH 8/8] Remove code coverage monitoring "CodeCoverage should not be used with spec testing in order to see how good your tests are." https://github.com/henrikbjorn/PhpSpecCodeCoverageExtension --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4486c82..b1b988d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ matrix: # Test the latest stable release - php: 7.3 - php: 7.4 - env: COVERAGE=true TEST_COMMAND="composer test-ci" - php: 8.0snapshot # Force some major versions of Symfony