From 18be254955738d3ab39bca77584b0b73ea634789 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 14 Nov 2020 13:10:17 +0100 Subject: [PATCH 1/5] Only support PHPUnit 8.5 and 9.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3468db5..80217f7 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/http-factory": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^7.5 || 8.5", + "phpunit/phpunit": "^8.5 || 9.4", "php-http/psr7-integration-tests": "^1.0", "http-interop/http-factory-tests": "^0.8", "symfony/error-handler": "^4.4" From 604417169af679a986e129c5d445c35cb2be4b1d Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 14 Nov 2020 13:16:25 +0100 Subject: [PATCH 2/5] Updated meta files --- .gitattributes | 21 +++++++++++---------- .gitignore | 10 ++++++---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8266b04..fa51164 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,11 @@ -.github/ export-ignore -tests/ export-ignore -.editorconfig export-ignore -.gitattributes export-ignore -.gitignore export-ignore -.php_cs export-ignore -.scrutinizer.yml export-ignore -.travis.yml export-ignore -phpstan.neon.dist export-ignore -phpunit.xml.dist export-ignore +.github/ export-ignore +tests/ export-ignore +.editorconfig export-ignore +.gitattributes export-ignore +.gitignore export-ignore +.php_cs export-ignore +.scrutinizer.yml export-ignore +.travis.yml export-ignore +phpstan.neon.dist export-ignore +phpstan.baseline.dist export-ignore +phpunit.xml.dist export-ignore diff --git a/.gitignore b/.gitignore index ed486bb..8cf0c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -/composer.lock -/phpstan.neon -/phpunit.xml -/vendor/ +composer.lock +phpstan.neon +phpunit.xml +vendor +.php_cs.cache +.phpunit.result.cache From c80c5085c918b2e01c13faaa4c9d3f04c7157fb6 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 14 Nov 2020 13:16:35 +0100 Subject: [PATCH 3/5] Make sure we support PHP 7.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 80217f7..9110a88 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/http-factory": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || 9.4", + "phpunit/phpunit": "^7.5 || 8.5 || 9.4", "php-http/psr7-integration-tests": "^1.0", "http-interop/http-factory-tests": "^0.8", "symfony/error-handler": "^4.4" From a3a4ee9d8b6f2d401cc4e14e61f1a0c8afa92ac4 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 14 Nov 2020 13:16:42 +0100 Subject: [PATCH 4/5] MIgrate config --- phpunit.xml.dist | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 100a46c..1e5ba2a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,24 @@ - - - - tests/ - - - - ./vendor/http-interop/http-factory-tests/test - - - - - - src/ - - - - - - - - - - - + + + + src/ + + + + + tests/ + + + ./vendor/http-interop/http-factory-tests/test + + + + + + + + + + From 3003c86101096c5ee66a88312ecaf82f9d84a183 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 14 Nov 2020 13:16:55 +0100 Subject: [PATCH 5/5] Cleanup .travis.yml and cure my OCD =) --- .travis.yml | 20 +++++++------------- composer.json | 6 +----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2902a35..908de13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ php: env: global: - - TEST_COMMAND="composer test" + - TEST_COMMAND="./vendor/bin/phpunit" branches: except: @@ -21,19 +21,13 @@ branches: matrix: fast_finish: true - allow_failures: - - php: nightly - env: COMPOSER_FLAGS="--ignore-platform-reqs" include: - - php: 7.2 - name: Lowest version of dependencies - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" - - php: nightly - name: PHP 8.0 - env: COMPOSER_FLAGS="--ignore-platform-reqs" - -before_install: - - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; + - name: "PHP: 8.0" + php: nightly + + - name: "Lowest version of dependencies" + php: 7.2 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="./vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" install: - composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction diff --git a/composer.json b/composer.json index 9110a88..a5b9dc0 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "A fast PHP7 implementation of PSR-7", "license": "MIT", "keywords": ["psr-7", "psr-17"], - "homepage": "http://tnyholm.se", + "homepage": "https://tnyholm.se", "authors": [ { "name": "Tobias Nyholm", @@ -40,10 +40,6 @@ "Tests\\Nyholm\\Psr7\\": "tests/" } }, - "scripts": { - "test": "vendor/bin/phpunit", - "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" - }, "extra": { "branch-alias": { "dev-master": "1.0-dev"