Merge branch 'hotfix/php-7.1-and-7.2-support'

Close #383
zfcampus · Dec 14, 2017 · 255689f · 255689f
2 parents ae3d254 + a594115
commit 255689f
Show file tree

Hide file tree

Showing 87 changed files with 1,131 additions and 647 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,63 +12,94 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   fast_finish: true
   include:
     - php: 5.6
       env:
         - DEPS=lowest
+        - ENABLE_EXT_MONGO=true
     - php: 5.6
       env:
         - DEPS=locked
+        - ENABLE_EXT_MONGO=true
+        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code"
     - php: 5.6
       env:
         - DEPS=latest
+        - ENABLE_EXT_MONGO=true
     - php: 7
       env:
         - DEPS=lowest
-        - EXT_MONGODB=true
+        - ENABLE_EXT_MONGODB=true
     - php: 7
       env:
         - DEPS=locked
-        - EXT_MONGODB=true
+        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code"
+        - ENABLE_EXT_MONGODB=true
         - CS_CHECK=true
     - php: 7
       env:
         - DEPS=latest
-        - EXT_MONGODB=true
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.1
+      env:
+        - DEPS=lowest
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.1
+      env:
+        - DEPS=latest
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.2
+      env:
+        - DEPS=lowest
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.2
+      env:
+        - DEPS=locked
+        - ENABLE_EXT_MONGODB=true
+    - php: 7.2
+      env:
+        - DEPS=latest
+        - ENABLE_EXT_MONGODB=true
     - php: hhvm
       env:
         - DEPS=lowest
+        - ENABLE_HHVM_MONGO=true
     - php: hhvm
       env:
         - DEPS=locked
+        - ENABLE_HHVM_MONGO=true
     - php: hhvm
       env:
         - DEPS=latest
-        - EXT_MONGODB=true
+        - ENABLE_HHVM_MONGODB=true
   allow_failures:
     - php: hhvm
 
 notifications:
   email: false
 
 before_install:
+  - echo "TRAVIS_PHP_VERSION is '$TRAVIS_PHP_VERSION'"
   - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - if [[ $EXT_MONGODB == 'true' && $TRAVIS_PHP_VERSION == '7' ]]; then echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
-  - if [[ $EXT_MONGODB == 'true' && $TRAVIS_PHP_VERSION == 'hhvm' ]]; then echo "extension = mongodb.so" >> /etc/hhvm/php.ini ; fi
-  - if [[ $EXT_MONGODB != 'true' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
-  - if [[ $EXT_MONGODB != 'true' && $TRAVIS_PHP_VERSION == 'hhvm' ]]; then echo "extension = mongo.so" >> /etc/hhvm/php.ini ; fi
+  - if [[ $ENABLE_EXT_MONGO == 'true' ]]; then echo "Enabling mongo extension"; echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
+  - if [[ $ENABLE_EXT_MONGODB == 'true' ]]; then echo "Enabling mongodb extension"; echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
+  - if [[ $ENABLE_HHVM_MONGO == 'true' ]]; then echo "Enabling mongo extension"; echo "extension = mongo.so" >> /etc/hhvm/php.ini ; fi
+  - if [[ $ENABLE_HHVM_MONGODB == 'true' ]]; then echo "Enabling mongodb extension"; echo "extension = mongodb.so" >> /etc/hhvm/php.ini ; fi
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php -m ; 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
+  - if [[ $ALTERNATE_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $ALTERNATE_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 [[ $EXT_MONGODB == 'true' ]]; then composer require --dev $COMPOSER_ARGS alcaeus/mongo-php-adapter ; fi
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php -m ; fi
   - stty cols 120 && composer show
 
 script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#383](https://github.com/zfcampus/zf-apigility-admin/pull/383) adds official
+  support for PHP 7.1 and 7.2 by ensuring we test against both versions during
+  continuous integration. Tests passed with no additional code changes.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "zendframework/zend-hydrator": "^1.1 || ^2.2.1",
         "zendframework/zend-inputfilter": "^2.7.2",
         "zendframework/zend-modulemanager": "^2.7.2",
-        "zendframework/zend-mvc": "^2.7.10 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.13 || ^3.0.2",
         "zendframework/zend-servicemanager": "^2.7.6 || ^3.1.1",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
         "zendframework/zend-validator": "^2.8.1",
@@ -54,7 +54,7 @@
         "zfcampus/zf-versioning": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^5.7.25 || ^6.5.4",
         "squizlabs/php_codesniffer": "^2.6.2",
         "zendframework/zend-config": "^2.6",
         "zendframework/zend-loader": "^2.5.1",