Changes to meta files and support for PHPUnit 9 (#161)

* Only support PHPUnit 8.5 and 9.4 * Updated meta files * Make sure we support PHP 7.1 * MIgrate config * Cleanup .travis.yml and cure my OCD =)
Nyholm · Nov 14, 2020 · ef9492e · ef9492e
1 parent d0cddd6
commit ef9492e
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 58 deletions.
diff --git 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
@@ -1,4 +1,6 @@
-/composer.lock
-/phpstan.neon
-/phpunit.xml
-/vendor/
+composer.lock
+phpstan.neon
+phpunit.xml
+vendor
+.php_cs.cache
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -13,27 +13,21 @@ php:
 
 env:
     global:
-        - TEST_COMMAND="composer test"
+        - TEST_COMMAND="./vendor/bin/phpunit"
 
 branches:
     except:
         - /^patch-.*$/
 
 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
@@ -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",
@@ -21,7 +21,7 @@
         "psr/http-factory": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || 8.5",
+        "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"
@@ -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"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Unit tests">
-            <directory>tests/</directory>
-        </testsuite>
-
-        <testsuite name="Integration tests">
-            <directory>./vendor/http-interop/http-factory-tests/test</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-
-    <php>
-        <const name="REQUEST_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-        <const name="RESPONSE_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-        <const name="SERVER_REQUEST_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-        <const name="UPLOADED_FILE_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-        <const name="URI_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-        <const name="STREAM_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit tests">
+      <directory>tests/</directory>
+    </testsuite>
+    <testsuite name="Integration tests">
+      <directory>./vendor/http-interop/http-factory-tests/test</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <const name="REQUEST_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+    <const name="RESPONSE_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+    <const name="SERVER_REQUEST_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+    <const name="UPLOADED_FILE_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+    <const name="URI_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+    <const name="STREAM_FACTORY" value="Nyholm\Psr7\Factory\Psr17Factory"/>
+  </php>
 </phpunit>