From 0bb704decf7504be854fd37c393d2fd31e38a1ab Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Thu, 14 Nov 2019 01:24:48 +0000
Subject: [PATCH 1/4] Remove obsolete branch-alias

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

diff --git a/composer.json b/composer.json
index 45af5b13..c0287b85 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,6 @@
         "phpunit/phpunit": "^5.7"
     },
     "extra": {
-        "branch-alias": {
-            "4.x-dev": "4.5.x-dev"
-        },
         "expose": [
             "javascript"
         ]
@@ -50,4 +47,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
\ No newline at end of file

From 8be36604092caf8e9919c076070f68fcd3ffe87e Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Mon, 18 Nov 2019 14:30:42 +1300
Subject: [PATCH 2/4] FIX Linting failure

---
 code/Report.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/Report.php b/code/Report.php
index 5eee3d0c..5449dfeb 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -350,7 +350,6 @@ class Report extends ViewableData
         $items = $this->sourceRecords($params, null, null);
 
         $gridFieldConfig = GridFieldConfig::create()->addComponents(
-
             new GridFieldButtonRow('before'),
             new GridFieldPrintButton('buttons-before-left'),
             new GridFieldExportButton('buttons-before-left'),

From 7436e11d4fb8c057b5fbe6cf482b35ac4a9443b8 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Tue, 11 Feb 2020 11:49:43 +1300
Subject: [PATCH 3/4] FIX Update core requirements to 4.5 series

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index c0287b85..7a78ccd2 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,12 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4.0@dev",
-        "silverstripe/admin": "^1.0@dev",
-        "silverstripe/versioned": "^1.0@dev",
+        "silverstripe/framework": "^4.5@dev",
+        "silverstripe/admin": "^1.5@dev",
+        "silverstripe/versioned": "^1.5@dev",
         "silverstripe/config": "^1.0@dev",
-        "silverstripe/assets": "^1.0@dev",
-        "silverstripe/vendor-plugin": "^1.0"
+        "silverstripe/assets": "^1.5@dev",
+        "silverstripe/vendor-plugin": "^1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7"
@@ -47,4 +47,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
\ No newline at end of file
+}

From f2deee8fa06a6116bbf274c107bb3b1991e04ee8 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Wed, 26 Feb 2020 13:32:02 +1300
Subject: [PATCH 4/4] Update Travis config to include PHP 7.4 build, upgrade to
 Xenial

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f291b124..42c330de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 language: php
 
-dist: trusty
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+  - xvfb
 
 cache:
   directories:
@@ -20,6 +25,8 @@ matrix:
       env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.3
       env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
+    - php: 7.4
+      env: DB=MYSQL PHPUNIT_TEST=1
 
 before_script:
 # Init PHP