Merge branch 'hotfix/378' into develop

Forward port #378

Conflicts:
	CHANGELOG.md

.travis.yml

@@ -8,11 +8,11 @@ services:
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
+    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   fast_finish: true
@@ -53,24 +53,23 @@ matrix:
     - php: hhvm
 
 notifications:
-  irc: "irc.freenode.org#apigility-dev"
   email: false
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - 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
-  - travis_retry composer self-update
 
 install:
-  - if [[ $EXT_MONGODB == 'true' ]]; then composer require --dev $COMPOSER_ARGS alcaeus/mongo-php-adapter ; fi
+  - 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 update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $EXT_MONGODB == 'true' ]]; then composer require --dev $COMPOSER_ARGS alcaeus/mongo-php-adapter ; fi
   - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php -m ; fi
-  - composer show
+  - stty cols 120 && composer show
 
 script:
   - composer test

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
@@ -20,6 +24,31 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 1.5.11 - 2017-11-14
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#378](https://github.com/zfcampus/zf-apigility-admin/pull/378) modifies the
+  package requirements to exclude zf-configuration v1.3.1, as that version has a
+  backwards-incompatible change that prevents creation of services via the
+  admin.
+
 ## 1.5.10 - 2017-08-14
 
 ### Added

composer.json

@@ -43,7 +43,7 @@
         "zfcampus/zf-apigility-admin-ui": "^1.3.7",
         "zfcampus/zf-apigility-provider": "^1.2",
         "zfcampus/zf-api-problem": "^1.2.1",
-        "zfcampus/zf-configuration": "^1.2.1",
+        "zfcampus/zf-configuration": "1.2.1 - 1.3.0 || >1.3.1 <2.0",
         "zfcampus/zf-content-negotiation": "^1.2.2",
         "zfcampus/zf-content-validation": "^1.3.4",
         "zfcampus/zf-hal": "^1.4.2",