Provide PHP 7.2 support for zend-mvc 2.7 series

.travis.yml

@@ -10,37 +10,21 @@ branches:
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
-    - SITE_URL: https://zendframework.github.io/zend-mvc
-    - GH_USER_NAME: "Matthew Weier O'Phinney"
-    - GH_USER_EMAIL: matthew@weierophinney.net
-    - GH_REF: github.com/zendframework/zend-mvc.git
-    - secure: "naVln9sqGUKWRbe3qlbtcw9Ink0qXmP6iU8A0IAScpuYOeGkDF9ripkCWytjJb+sZFOpjbwwV5spoaWRied1A10P6f8GRMAPJ1xEa0Pm7JE5iCoijUdiC2FJlv0Xd79ir5xAKb4mvyAGxRDgCYXVGYnszGLQYyfaTJ9hVlRQw6N3hcWWUADXxV4Z7Akp5XN6mo52ZRwAXJNmJliyDC4INC1AE2Y8hMbD4SjIetsO7VYBBiOYJhd/9ir7ETlbvt7npEil7KKZP0Y8lanTU2coKESut4b0vE9Vxq6znoK6jrV3xULuZOU6xe3Di8roIAFaR/neeX/blfuvgYCP4lM/ed+CaSD56aFIGizyP0gLB7xrNooBttFh0JV69/8Iu5G7dbZ3nw6gc0cXDvnl9aHpsInAlGbJShlJR9JY1OqxhewgNVA9cWTs2IekdY5Zz/be+elXjYIWkM+3ig6Lw41uaE4AwKp+MdQeyhp4snUIJZeXpdRYsmPDbYI3xTPFDc3bbYgypasox+jLQB0QXY5HKUrlaKdZiY6s1rMHTRnFLLybUlxbPIM1J/rMHPjs0YRgABtVPUsXpNKkY08pkk0cfvxAKTMGP7SmN3P/cSUeWvNNInCUjCnYWSqcqcp25QoIy9BTF4gKjwoCRPfIgzj3jd0qOoRkYx2HuWZVA5+q8SM="
+    - COMPOSER_ARGS="--no-interaction"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=locked
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
         - TEST_COVERAGE=true
     - php: 5.6
       env:
@@ -51,10 +35,29 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
         - CHECK_CS=true
     - php: 7
       env:
         - DEPS=latest
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
     - php: hhvm
       env:
         - DEPS=lowest
@@ -67,32 +70,24 @@ matrix:
   allow_failures:
     - php: hhvm
 
-env:
-  global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
-
 notifications:
-  irc: "irc.freenode.org#zftalk.dev"
   email: false
 
 before_install:
-  - travis_retry composer self-update
   - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
 
 install:
+  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_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 travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS php-coveralls/php-coveralls:^1.0 ; fi
   - travis_retry composer install $COMPOSER_ARGS
-  - composer show --installed
+  - 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 [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then travis_retry curl -sSL https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh | bash ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
-
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

composer.json

@@ -8,40 +8,44 @@
     ],
     "homepage": "https://github.com/zendframework/zend-mvc",
     "autoload": {
+        "files": [
+            "src/autoload.php"
+        ],
         "psr-4": {
             "Zend\\Mvc\\": "src/"
         }
     },
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-hydrator": "^1.1 || ^2.1",
-        "zendframework/zend-form": "^2.8.2",
+        "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
+        "zendframework/zend-hydrator": "^1.1 || ^2.4",
+        "zendframework/zend-form": "^2.11",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
-        "zendframework/zend-authentication": "^2.5.3",
-        "zendframework/zend-cache": "^2.6.1",
-        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-authentication": "^2.6",
+        "zendframework/zend-cache": "^2.8",
+        "zendframework/zend-console": "^2.7",
         "zendframework/zend-di": "^2.6",
-        "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-http": "^2.5.4",
-        "zendframework/zend-i18n": "^2.6",
-        "zendframework/zend-inputfilter": "^2.6",
+        "zendframework/zend-filter": "^2.8",
+        "zendframework/zend-http": "^2.8",
+        "zendframework/zend-i18n": "^2.8",
+        "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-json": "^2.6.1",
-        "zendframework/zend-log": "^2.7.1",
-        "zendframework/zend-modulemanager": "^2.7.1",
-        "zendframework/zend-session": "^2.6.2",
-        "zendframework/zend-serializer": "^2.6.1",
-        "zendframework/zend-text": "^2.6",
-        "zendframework/zend-uri": "^2.5",
-        "zendframework/zend-validator": "^2.6",
-        "zendframework/zend-view": "^2.6.3",
+        "zendframework/zend-log": "^2.9.3",
+        "zendframework/zend-modulemanager": "^2.8",
+        "zendframework/zend-session": "^2.8.1",
+        "zendframework/zend-serializer": "^2.8",
+        "zendframework/zend-text": "^2.7",
+        "zendframework/zend-uri": "^2.6",
+        "zendframework/zend-validator": "^2.10",
+        "zendframework/zend-view": "^2.9",
         "friendsofphp/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "^4.5",
+        "phpunit/phpunit": "^4.8.36",
+        "sebastian/comparator": "^1.2.4",
         "sebastian/version": "^1.0.4"
     },
     "replace": {