From d6bcc27fb583e4022f0044973ee15928a21a07f0 Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Thu, 28 May 2020 17:11:08 +1200
Subject: [PATCH 1/2] Prep installer 4.6 branch. (#279)

API Bump requirements for recipe-cms to 4.6.x, require frameworktest for asset-admin behat test
---
 .travis.yml   | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95c5c0d..8166639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,6 +101,7 @@ before_script:
   - composer validate
   - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
   - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
+  - if [[ $BEHAT_TEST == "@asset-admin" ]]; then composer require --no-update silverstripe/frameworktest:^0.1.0; fi;
   - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;
   - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;
   - if [[ $HEALTH_TEST ]]; then composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile --no-dev; fi;
diff --git a/composer.json b/composer.json
index f94d192..1e3e8ed 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.1.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "4.x-dev",
+        "silverstripe/recipe-cms": "4.6.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
         "silverstripe/login-forms": "^4.0"
     },

From 5877d0eccea69f55d63492822f8b8a39cc0f94c7 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 23 Jun 2020 14:45:55 +1200
Subject: [PATCH 2/2] Update travis

---
 .travis.yml | 58 +++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8166639..e6e0f7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,7 @@ addons:
 
 env:
   global:
-    - TRAVIS_NODE_VERSION="6"
-    - COMPOSER_ROOT_VERSION="4.x-dev"
+    - COMPOSER_ROOT_VERSION="4.6.x-dev"
     - SS_BASE_URL="http://localhost:8080/"
     - SS_ENVIRONMENT_TYPE="dev"
 
@@ -30,58 +29,31 @@ matrix:
   include:
     # Core php tests
     - php: 7.1
-      env:
-        - PHPUNIT_TEST=core
-        - DB=MYSQL
-        - PDO=1
+      env: DB=MYSQL PHPUNIT_TEST=core PDO=1
     - php: 7.2
-      env:
-        - PHPUNIT_TEST=framework
-        - DB=MYSQL
+      env: DB=MYSQL PHPUNIT_TEST=framework
     - php: 7.3
-      env:
-        - PHPUNIT_TEST=core
-        - DB=PGSQL
+      env: DB=PGSQL PHPUNIT_TEST=core
     - php: 7.4
-      env:
-        - PHPUNIT_TEST=core
-        - DB=MYSQL
+      env: DB=MYSQL PHPUNIT_TEST=core
     # admin php tests
     - php: 7.1
-      env:
-        - PHPUNIT_TEST=admin
-        - DB=PGSQL
+      env: DB=MYSQL PHPUNIT_TEST=admin PDO=1
     - php: 7.2
-      env:
-        - PHPUNIT_TEST=admin
-        - DB=MYSQL
-        - PDO=1
+      env: DB=PGSQL PHPUNIT_TEST=admin
     - php: 7.4
-      env:
-        - PHPUNIT_TEST=admin
-        - DB=MYSQL
+      env: DB=MYSQL PHPUNIT_TEST=admin
     # behat tests
     - php: 7.1
-      env:
-        - BEHAT_TEST="@framework"
-        - DB=MYSQL
+      env: DB=MYSQL BEHAT_TEST="@framework"
     - php: 7.2
-      env:
-        - BEHAT_TEST="@cms"
-        - DB=MYSQL
+      env: DB=MYSQL BEHAT_TEST="@cms"
     - php: 7.3
-      env:
-        - BEHAT_TEST="@asset-admin"
-        - DB=MYSQL
+      env: DB=MYSQL BEHAT_TEST="@asset-admin"
     - php: 7.3
-      env:
-        - HEALTH_TEST=1
-        - DB=PGSQL
+      env: DB=PGSQL HEALTH_TEST=1
     - php: 7.4
-      env:
-        - HEALTH_TEST=1
-        - DB=MYSQL
-        - PDO=1
+      env: DB=MYSQL HEALTH_TEST=1 PDO=1
 
 before_script:
 # Extra $PATH
@@ -99,7 +71,9 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
+  # Fix for running phpunit 5 on php 7.4+
+  - composer require --no-update sminnee/phpunit-mock-objects:^3
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
   - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
   - if [[ $BEHAT_TEST == "@asset-admin" ]]; then composer require --no-update silverstripe/frameworktest:^0.1.0; fi;
   - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;