From 1aa18e7ceda2f90db90ab69c3ad3a41fd51e208b Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 15 Jun 2020 14:53:33 +1200
Subject: [PATCH 1/3] Update for 2.2

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

diff --git a/.travis.yml b/.travis.yml
index 47d3b69..6cfac10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,17 +8,17 @@ services:
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="2.0.x-dev"
+    - COMPOSER_ROOT_VERSION="2.2.x-dev"
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.2
+      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1
+    - php: 7.3
+      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
+    - php: 7.4
       env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
diff --git a/composer.json b/composer.json
index 7e565a4..93b8f31 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2.x-dev"
+            "dev-master": "3.x-dev"
         }
     },
     "autoload": {

From 23104b77aa23b20d070b4c7923cbbe80ad2bf106 Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Mon, 15 Jun 2020 15:48:00 +1200
Subject: [PATCH 2/3] Add PHP 7.4 test

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 93b8f31..cfb308e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.0",
+	"sminnee/phpunit-mock-objects": "^3.4.5"
     },
     "extra": {
         "branch-alias": {

From dfd9c15d5628bc16675bac105330dce013405700 Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Mon, 15 Jun 2020 15:52:29 +1200
Subject: [PATCH 3/3] Add PHP 7.4 test

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cfb308e..83a4bd3 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0",
-	"sminnee/phpunit-mock-objects": "^3.4.5"
+        "sminnee/phpunit-mock-objects": "^3.4.5"
     },
     "extra": {
         "branch-alias": {