Skip to content

Commit

Permalink
Merge pull request #360 from Einenlum/fix/tests-doctrine-common
Browse files Browse the repository at this point in the history
Fix doctrine dependency and drop PHP < 7
  • Loading branch information
Albin Kerouanton authored Sep 19, 2017
2 parents 0300595 + 143834a commit 6b99da7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
language: php
sudo: false
php:
- 5.5
- 5.6
- 7.0
- 7.1

matrix:
fast_finish: true
exclude:
- php: 5.5
- php: 7.0
env: DOCTRINE_COMMON_VERSION="dev-master" DB=mysql DB_USER=root PREFER=latest
- php: 5.5
- php: 7.0
env: DOCTRINE_COMMON_VERSION="dev-master" DB=pgsql PREFER=latest
- php: 5.5
- php: 7.0
env: DOCTRINE_COMMON_VERSION="dev-master" DB=mysql DB_USER=root PREFER=lowest
- php: 5.5
- php: 7.0
env: DOCTRINE_COMMON_VERSION="dev-master" DB=pgsql PREFER=lowest

env:
Expand Down Expand Up @@ -43,7 +42,6 @@ cache:

before_script:
- composer self-update
- composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH

- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database orm_behaviors_test' -U postgres; fi"
- sh -c "if [ '$DB' = 'pgsql' ]; then psql orm_behaviors_test -c 'create extension cube' -U postgres; fi"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ext-pdo_sqlite": "*",
"ext-pdo_mysql": "*",
"ext-pdo_pgsql": "*",
"doctrine/orm": ">=2.2",
"doctrine/orm": ">=2.4.5",
"phpunit/phpunit": "~4.8",
"jakub-onderka/php-parallel-lint": "~0.8",
"hexmedia/yaml-linter": "~0.1"
Expand Down

0 comments on commit 6b99da7

Please sign in to comment.