From 99dc8aa2a911e375ca14f986abac3eae5098c253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Sat, 20 May 2017 17:59:23 +0200
Subject: [PATCH 1/3] Drop HHVM support

---
 .scrutinizer.yml |  4 ----
 .travis.yml      | 34 ----------------------------------
 2 files changed, 38 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 361b21e38..bebd35350 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -27,8 +27,4 @@ tools:
         enabled: true
         filter:
             paths: ["lib/*", "tests/*"]
-    php_hhvm:
-        enabled: true
-        filter:
-            paths: ["lib/*", "tests/*"]
     sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
index fab92a629..78c05ab05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 7.0
   - 7.1
   - nightly
-  - hhvm
 
 env:
   - DB=mysql
@@ -43,42 +42,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:

From e123f16ec99260f6bdc9fa146ca3b255673c5fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Mon, 19 Jun 2017 11:17:25 +0200
Subject: [PATCH 2/3] Require PHP 7.1

---
 .scrutinizer.yml |  5 +++++
 .travis.yml      | 11 +++--------
 composer.json    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index bebd35350..0f7195985 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,3 +1,8 @@
+build:
+    environment:
+        php:
+            version: 7.1
+
 before_commands:
     - "composer install --no-dev --prefer-source"
 
diff --git a/.travis.yml b/.travis.yml
index 78c05ab05..bd9d8b32c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: false
 language: php
 
 php:
-  - 7.0
   - 7.1
   - nightly
 
@@ -12,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
@@ -24,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 [[ $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 wget https://scrutinizer-ci.com/ocular.phar; 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:
diff --git a/composer.json b/composer.json
index 5c89e8f97..e76eae85e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "ext-pdo": "*",
         "doctrine/collections": "^1.4",
         "doctrine/dbal": ">=2.5-dev,<2.7-dev",

From 9fa456b9f0205419ddf86fb92bc475b7f937ca54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Mon, 19 Jun 2017 11:17:44 +0200
Subject: [PATCH 3/3] Bump versions of some dependencies

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index e76eae85e..a4b43de3b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,12 @@
         "doctrine/dbal": ">=2.5-dev,<2.7-dev",
         "doctrine/instantiator": "~1.0.1",
         "doctrine/common": "^2.7.1",
-        "doctrine/cache": "~1.5",
-        "doctrine/annotations": "~1.2",
-        "symfony/console": "~2.5|~3.0|~4.0"
+        "doctrine/cache": "~1.6",
+        "doctrine/annotations": "~1.4",
+        "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": {