From d831e7300d4211b2300c3c3ba7f6673a38570a7f Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Thu, 20 Feb 2020 13:51:46 +1300
Subject: [PATCH 1/2] Update Travis config to include PHP 7.4 build

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5647243..8de483ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,12 @@ matrix:
       env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.3
       env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.4
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.1
       env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 PHPCS_TEST=1
     - php: 7.2
       env: DB=MYSQL PHPUNIT_TEST=1 PDO=1
-    - php: 7.3
-      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.3
       env: DB=PGSQL PHPUNIT_TEST=1
 

From 96b0992c273e3fb30c97a3c069cff737e76d35c6 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Thu, 20 Feb 2020 14:22:54 +1300
Subject: [PATCH 2/2] Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat

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

diff --git a/composer.json b/composer.json
index e34c2cc3..2a96cda2 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
     },
     "require-dev": {
         "silverstripe/versioned": "^1@dev",
+        "sminnee/phpunit-mock-objects": "^3.4.5",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {