From eba689745b1ef88cf20d62b62b75a37fbde689bf Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 3 May 2018 14:16:23 -0500
Subject: [PATCH] Require PHP 7.2 builds to pass

Updates travis configuration to require PHP 7.2 builds, as well as to
use php-coveralls/php-coveralls, and to assign LEGACY_DEPS per
environment.

Removes upload-coverage script.

Bumps zend-mvc version to one known to work with PHP 7.2.
---
 .travis.yml   | 12 +++++-------
 composer.json |  3 +--
 composer.lock |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd968f5..9ca5a87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
@@ -21,6 +20,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - TEST_COVERAGE=true
     - php: 5.6
       env:
@@ -31,6 +31,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - CS_CHECK=true
     - php: 7
       env:
@@ -53,16 +54,13 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.2
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
 
 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
+  - 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 $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
@@ -73,7 +71,7 @@ script:
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls ; fi
 
 notifications:
   email: false
diff --git a/composer.json b/composer.json
index 2810e2e..3dd8baf 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "zendframework/zend-filter": "^2.7.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-hydrator": "^1.1 || ^2.2.1",
-        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.15 || ^3.0.2",
         "zendframework/zend-paginator": "^2.7",
         "zendframework/zend-uri": "^2.5.2",
         "zendframework/zend-view": "^2.8.1",
@@ -61,7 +61,6 @@
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit",
diff --git a/composer.lock b/composer.lock
index 81c96ee..7c41595 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "066355b85149e7e2f5cb564a87ac3445",
+    "content-hash": "4347c4e5265477a824aed4fb79ba55ec",
     "packages": [
         {
             "name": "container-interop/container-interop",