Skip to content

Commit

Permalink
Merge pull request #1896 from phansys/lower_dependencies
Browse files Browse the repository at this point in the history
[bugfix] Fix lower dependencies
  • Loading branch information
l3pp4rd authored Apr 13, 2018
2 parents 88c9fb8 + cff3503 commit f61d144
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ sudo: false
matrix:
include:
- php: 5.4
env: phpunit_exclude_groups=datetimeinterface
env: phpunit_exclude_groups=datetimeinterface dependencies=lowest
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.1
env: dependencies=lowest
- php: 7.2
env: dependencies=lowest

cache:
directories:
Expand All @@ -24,15 +27,18 @@ before_install:
- if [[ "$TRAVIS_PHP_VERSION" != 5.* ]]; then cp composer7.json composer.json; fi

install:
- composer install --prefer-dist
- |
if [[ "$dependencies" = "lowest" ]]; then
composer update --prefer-lowest --prefer-stable -n
else
composer install --prefer-dist
fi
script:
- |
if [[ ! $phpunit_exclude_groups ]]; then
echo "Debug: 'bin/phpunit -c tests/'"
bin/phpunit -c tests/
else
echo "Debug: 'bin/phpunit -c tests/ --exclude-group $phpunit_exclude_groups'"
bin/phpunit -c tests/ --exclude-group $phpunit_exclude_groups
fi
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
"doctrine/orm": ">=2.5.0",
"doctrine/common": ">=2.5.0",
"symfony/yaml": "~2.6|~3.0|~4.0",
"phpunit/phpunit": "^4.8|^5.7|^6.5"
"phpunit/phpunit": "^4.8.35|^5.7|^6.5"
},
"conflict": {
"doctrine/annotations": "<1.2"
},
"suggest": {
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
Expand Down
9 changes: 7 additions & 2 deletions composer7.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"behat/transliterator": "~1.2",
"doctrine/common": "~2.4"
},
"replace": {
"provide": {
"ext-mongo": "1.6.12"
},
"require-dev": {
Expand All @@ -51,7 +51,12 @@
"doctrine/orm": ">=2.5.0",
"doctrine/common": ">=2.5.0",
"symfony/yaml": "~2.6|~3.0|~4.0",
"phpunit/phpunit": "^4.8|^5.7|^6.5"
"phpunit/phpunit": "^5.7|^6.5"
},
"conflict": {
"doctrine/annotations": "<1.2",
"doctrine/mongodb": "<1.3",
"sebastian/comparator": "<2.0"
},
"suggest": {
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
Expand Down

0 comments on commit f61d144

Please sign in to comment.