From 143834a78a0209316320d4a33cb1de445e9bea05 Mon Sep 17 00:00:00 2001 From: Einenlum Date: Mon, 18 Sep 2017 17:44:30 +0200 Subject: [PATCH] Fix doctrine dependency and drop PHP < 7 --- .travis.yml | 12 +++++------- composer.json | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53689730..d6c28165 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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" diff --git a/composer.json b/composer.json index 322a9d14..31cce2ff 100644 --- a/composer.json +++ b/composer.json @@ -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"