Merge branch 'hotfix/phpunit-upgrade' into develop

Close #114

Author: weierophinney

.travis.yml

@@ -15,7 +15,9 @@ cache:
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
     - LATEST_DEPS="zendframework/zend-mvc-plugin-flashmessenger zendframework/zend-mvc-i18n zendframework/zend-mvc-console"
     - SITE_URL=https://zendframework.github.io/zend-view
     - GH_USER_NAME="Matthew Weier O'Phinney"
@@ -25,16 +27,6 @@ env:
 
 matrix:
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - CS_CHECK=true
-        - DEPS=locked
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
@@ -77,11 +69,12 @@ before_install:
   - composer self-update
 
 install:
-  - travis_retry composer install $COMPOSER_ARGS
+  - 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
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
   - 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 composer require --dev --no-update satooshi/php-coveralls ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - composer show --installed
 
 script:

CHANGELOG.md

@@ -14,7 +14,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#114](https://github.com/zendframework/zend-view/pull/114) removes support
+  for PHP 5.5.
 
 ### Fixed
 

composer.json

@@ -13,14 +13,16 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^5.7.15 || ^6.0.8",
         "zendframework/zend-authentication": "^2.5",
         "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-escaper": "^2.5",
@@ -39,9 +41,7 @@
         "zendframework/zend-serializer": "^2.6.1",
         "zendframework/zend-session": "^2.6.2",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-uri": "^2.5",
-        "phpunit/phpunit": "^4.6",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "zendframework/zend-uri": "^2.5"
     },
     "suggest": {
         "zendframework/zend-authentication": "Zend\\Authentication component",
@@ -60,6 +60,9 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "config": {
+        "sort-packages": "true"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.8-dev",