Skip to content

Commit 9cc1a06

Browse files
authored
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
2 parents 06202c8 + 67554d8 commit 9cc1a06

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ cache:
1010
env:
1111
global:
1212
- COMPOSER_ARGS="--no-interaction"
13-
- LATEST_DEPS="zendframework/zend-mvc-console"
1413
- LEGACY_DEPS="phpunit/phpunit"
1514

1615
matrix:
@@ -60,7 +59,7 @@ before_install:
6059
install:
6160
- if [[ $DEPS == 'dev' ]]; then travis_retry composer config minimum-stability dev ; fi
6261
- travis_retry composer install $COMPOSER_ARGS
63-
- if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
62+
- travis_retry composer require --dev --no-update $COMPOSER_ARGS zendframework/zend-mvc-console
6463
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
6564
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
6665
- composer show

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"require": {
4040
"php": "^7.1",
41-
"doctrine/doctrine-module": "^2.1",
41+
"doctrine/doctrine-module": "^2.1.3",
4242
"doctrine/orm": "^2.6.0",
4343
"doctrine/dbal": "^2.6.0",
4444
"symfony/console": "^2.3 || ^3.0 || ^4.0",

0 commit comments

Comments
 (0)