Merge branch 'hotfix/23' into develop

Forward port #24

Author: weierophinney

.gitignore

@@ -9,7 +9,6 @@ nbproject
 tmp/
 
 clover.xml
-composer.lock
 coveralls-upload.json
 phpunit.xml
 vendor

.travis.yml

@@ -13,31 +13,49 @@ cache:
 
 env:
   global:
-    - SERVICE_MANAGER_VERSION="^3.0.3"
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
 
 matrix:
   fast_finish: true
   include:
+    - php: 5.5
+      env:
+        - DEPS=lowest
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
+        - DEPS=locked
     - php: 5.5
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=latest
+    - php: 5.6
+      env:
+        - DEPS=lowest
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+        - DEPS=locked
     - php: 5.6
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=lastest
+    - php: 7
+      env:
+        - DEPS=lowest
     - php: 7
+      env:
+        - DEPS=locked
     - php: 7
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=latest
     - php: hhvm 
+      env:
+        - DEPS=lowest
+    - php: hhvm 
+      env:
+        - DEPS=locked
     - php: hhvm 
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=latest
   allow_failures:
     - php: hhvm
 
@@ -49,10 +67,12 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
-  - composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION"
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs
+  - 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
+  - composer show --installed
 
 script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi

composer.json

@@ -28,7 +28,7 @@
         "zendframework/zend-uri": "^2.5",
         "zendframework/zend-view": "^2.6.3",
         "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "phpunit/phpunit": "^4.5"
     },
     "suggest": {
         "zendframework/zend-config": "Zend\\Config component",