From 6f11131d4f1b7e76252400a861b461c32599bf4a Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 18 Jan 2018 16:31:14 +1300
Subject: [PATCH 1/3] Update dependencies to PHP 7.1 and PHPUnit 7

---
 .travis.yml   | 9 +++------
 composer.json | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a7914b..62a2165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,6 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-php:
-  - 5.6
-
 env:
   global:
     - DB="PGSQL"
@@ -16,10 +13,10 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.1
       env:
         - PHPUNIT_TEST=framework
-    - php: 5.6
+    - php: 7.2
       env:
         - PHPUNIT_TEST=postgresql
         - PHPCS_TEST=1
@@ -33,7 +30,7 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:1.0.x-dev
+  - composer require --no-update silverstripe/recipe-cms:2.x-dev
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
   - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
 
diff --git a/composer.json b/composer.json
index d618b65..35f8645 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "silverstripe/vendor-plugin": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^7@dev"
     },
     "extra": {
         "branch-alias": {

From 892798c6fd263a135d80d6ae37f842a3eddbe3e2 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 18 Jan 2018 17:51:51 +1300
Subject: [PATCH 2/3] FIX Prefer source for framework so we can run tests for
 it

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 62a2165..5482c1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ before_script:
   - composer validate
   - composer require --no-update silverstripe/recipe-cms:2.x-dev
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - composer require --prefer-source silverstripe/framework 5.x-dev
   - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
 
 script:

From 48992633c24c49d1a905438ba09eed8552fc74f9 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 23 Jan 2018 14:32:45 +1300
Subject: [PATCH 3/3] Prefer source for Travis build installations

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5482c1a..641160b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,7 @@ before_script:
 # Install composer dependencies
   - composer validate
   - composer require --no-update silverstripe/recipe-cms:2.x-dev
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-  - composer require --prefer-source silverstripe/framework 5.x-dev
+  - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
   - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
 
 script: