Merge 8a50770 into 71599e6

.travis.yml

@@ -10,36 +10,17 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=locked
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - CHECK_CS=true
-        - TEST_COVERAGE=true
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -54,20 +35,18 @@ matrix:
         - DEPS=latest
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
-  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

composer.json

@@ -1,17 +1,19 @@
 {
   "name": "zendframework/zend-diactoros",
   "description": "PSR HTTP Message implementations",
-  "type": "library",
-  "license": "BSD-2-Clause",
+  "license": "BSD-3-Clause",
   "keywords": [
     "http",
     "psr",
     "psr-7"
   ],
-  "homepage": "https://github.com/zendframework/zend-diactoros",
   "support": {
+    "docs": "https://docs.zendframework.com/zend-diactoros/",
     "issues": "https://github.com/zendframework/zend-diactoros/issues",
-    "source": "https://github.com/zendframework/zend-diactoros"
+    "source": "https://github.com/zendframework/zend-diactoros",
+    "rss": "https://github.com/zendframework/zend-diactoros/releases.atom",
+    "slack": "https://zendframework-slack.herokuapp.com",
+    "forum": "https://discourse.zendframework.com/c/questions/exprssive"
   },
   "config": {
       "sort-packages": true
@@ -24,14 +26,14 @@
     }
   },
   "require": {
-    "php": "^5.6 || ^7.0",
+    "php": "^7.1",
     "psr/http-message": "^1.0"
   },
   "require-dev": {
     "ext-dom": "*",
     "ext-libxml": "*",
-    "phpunit/phpunit": "^5.7.16 || ^6.0.8",
-    "zendframework/zend-coding-standard": "~1.0"
+    "phpunit/phpunit": "^7.0.2",
+    "zendframework/zend-coding-standard": "~1.0.0"
   },
   "provide": {
     "psr/http-message-implementation": "1.0"
@@ -44,11 +46,7 @@
   "autoload-dev": {
     "psr-4": {
       "ZendTest\\Diactoros\\": "test/"
-    },
-    "files": [
-      "test/TestAsset/Functions.php",
-      "test/TestAsset/SapiResponse.php"
-    ]
+    }
   },
   "scripts": {
     "check": [