Merge pull request #6507 from lcobucci/upgrade-dependencies

Upgrade dependencies

.scrutinizer.yml

@@ -1,3 +1,8 @@
+build:
+    environment:
+        php:
+            version: 7.1
+
 before_commands:
     - "composer install --no-dev --prefer-source"
 
@@ -27,8 +32,4 @@ tools:
         enabled: true
         filter:
             paths: ["lib/*", "tests/*"]
-    php_hhvm:
-        enabled: true
-        filter:
-            paths: ["lib/*", "tests/*"]
     sensiolabs_security_checker: true

.travis.yml

@@ -2,10 +2,8 @@ sudo: false
 language: php
 
 php:
-  - 7.0
   - 7.1
   - nightly
-  - hhvm
 
 env:
   - DB=mysql
@@ -13,7 +11,7 @@ env:
   - DB=sqlite
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi
+  - if [[ $TRAVIS_PHP_VERSION = '7.1' && $DB = 'sqlite' && "$DEPENDENCIES" != "low" ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi
   - if [[ "$PHPUNIT_FLAGS" == "" ]]; then phpenv config-rm xdebug.ini; fi
   - composer self-update
   - composer install --prefer-source
@@ -25,16 +23,12 @@ script:
   - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional
 
 after_script:
-  - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [[ "$PHPUNIT_FLAGS" != "" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+  - if [[ "$PHPUNIT_FLAGS" != "" ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: DB=mariadb
-      addons:
-        mariadb: 10.1
     - php: 7.1
       env: DB=mariadb
       addons:
@@ -43,42 +37,9 @@ matrix:
       env:
         - DB=sqlite
         - DEPENDENCIES='low'
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next Trusty update
-      addons:
-        mariadb: 10.1
-      env: DB=mariadb
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next update
-      addons:
-        apt:
-          packages:
-            - mysql-server-5.6
-            - mysql-client-core-5.6
-            - mysql-client-5.6
-      services:
-        - mysql
-      env: DB=mysql
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next update
-      services:
-        - postgresql
-      env: DB=pgsql
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next update
-      env: DB=sqlite
 
   allow_failures:
     - php: nightly
-    - php: hhvm
 
 cache:
   directories:

composer.json

@@ -14,18 +14,18 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "ext-pdo": "*",
         "doctrine/collections": "^1.4",
         "doctrine/dbal": ">=2.5-dev,<2.7-dev",
         "doctrine/instantiator": "~1.0.1",
         "doctrine/common": "^2.7.1",
-        "doctrine/cache": "~1.5",
+        "doctrine/cache": "~1.6",
-        "doctrine/annotations": "~1.2",
+        "doctrine/annotations": "~1.4",
-        "symfony/console": "~2.5|~3.0|~4.0"
+        "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "symfony/yaml": "~2.3|~3.0|~4.0",
+        "symfony/yaml": "~3.0|~4.0",
         "phpunit/phpunit": "^6.0"
     },
     "suggest": {