Merge pull request #6377 from Sam-Burns/minimum-dependencies

Minimum dependencies
doctrine · Mar 31, 2017 · 904f4d5 · 904f4d5
2 parents 1aa02f9 + 7aab261
commit 904f4d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,8 @@ before_script:
   - if [[ $TRAVIS_PHP_VERSION -lt '7.0' && $TRAVIS_PHP_VERSION != 'hhv*' ]]; then phpenv config-rm xdebug.ini; fi
   - composer self-update
   - composer install --prefer-source
+  - if [ "$DEPENDENCIES" != "low" ]; then composer update; fi;
+  - if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest; fi;
 
 script:
   - ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml $PHPUNIT_FLAGS
@@ -37,6 +39,10 @@ matrix:
       env: DB=mariadb
       addons:
         mariadb: 10.1
+    - php: 7.1
+      env:
+        - DB=sqlite
+        - DEPENDENCIES='low'
     - php: hhvm
       sudo: true
       dist: trusty

diff --git a/composer.json b/composer.json
@@ -16,16 +16,17 @@
     "require": {
         "php": "^7.0",
         "ext-pdo": "*",
-        "doctrine/collections": "~1.2",
+        "doctrine/collections": "~1.3",
         "doctrine/dbal": ">=2.5-dev,<2.7-dev",
         "doctrine/instantiator": "~1.0.1",
         "doctrine/common": "^2.7.1",
-        "doctrine/cache": "~1.4",
+        "doctrine/cache": "~1.5",
+        "doctrine/annotations": "~1.2",
         "symfony/console": "~2.5|~3.0"
     },
     "require-dev": {
         "symfony/yaml": "~2.3|~3.0",
-        "phpunit/phpunit": "^5.4"
+        "phpunit/phpunit": "^5.7"
     },
     "suggest": {
         "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"