Merge pull request #565 from TomHAnderson/hotfix/doctrine-module-version

For PHP 7.2 we need the minimum version of doctrine-module to be 2.1.3
doctrine · Apr 16, 2018 · 9cc1a06 · 9cc1a06
2 parents 06202c8 + 67554d8
commit 9cc1a06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - LATEST_DEPS="zendframework/zend-mvc-console"
     - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
@@ -60,7 +59,7 @@ before_install:
 install:
   - if [[ $DEPS == 'dev' ]]; then travis_retry composer config minimum-stability dev ; fi
   - travis_retry composer install $COMPOSER_ARGS
-  - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
+  - travis_retry composer require --dev --no-update $COMPOSER_ARGS zendframework/zend-mvc-console
   - 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
   - composer show

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     },
     "require":           {
         "php":                               "^7.1",
-        "doctrine/doctrine-module":          "^2.1",
+        "doctrine/doctrine-module":          "^2.1.3",
         "doctrine/orm":                      "^2.6.0",
         "doctrine/dbal":                     "^2.6.0",
         "symfony/console":                   "^2.3 || ^3.0 || ^4.0",