From 54a8b8ce8fc62f3d478caf435cc49970a39a96d8 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Thu, 4 Nov 2021 11:13:45 +1300
Subject: [PATCH] API phpunit 9 support

---
 .travis.yml      | 12 +++++------
 composer.json    |  5 ++---
 phpunit.xml.dist | 52 +++++++++++++++++++++++++-----------------------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 049117b..9d34aec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,14 +14,14 @@ matrix:
   fast_finish: true
   include:
     # Core php tests
-    - php: 7.1
+    - php: 7.3
       env:
         - DB=MYSQL
         - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="core"
         - PDO=1
         - COMPOSER_INSTALL_ARG="--prefer-lowest"
-    - php: 7.2
+    - php: 7.3
       env:
         - DB=MYSQL
         - PHPUNIT_TEST=1
@@ -43,14 +43,14 @@ matrix:
         - PHPUNIT_SUITE="core"
         - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
     # admin php tests
-    - php: 7.1
+    - php: 7.3
       env:
         - DB=MYSQL
         - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="admin"
         - PDO=1
         - COMPOSER_INSTALL_ARG="--prefer-lowest"
-    - php: 7.2
+    - php: 7.3
       env:
         - DB=PGSQL
         - PHPUNIT_TEST=1
@@ -67,12 +67,12 @@ matrix:
         - PHPUNIT_SUITE="admin"
         - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
     # behat tests
-    - php: 7.1
+    - php: 7.3
       env:
         - DB=MYSQL
         - BEHAT_TEST=1
         - BEHAT_SUITE="admin"
-    - php: 7.2
+    - php: 7.3
       env:
         - DB=MYSQL
         - BEHAT_TEST=1
diff --git a/composer.json b/composer.json
index 951b794..2f9c785 100644
--- a/composer.json
+++ b/composer.json
@@ -3,15 +3,14 @@
     "type": "silverstripe-recipe",
     "description": "The SilverStripe Framework Installer",
     "require": {
-        "php": "^7.1 || ^8",
+        "php": "^7.3 || ^8.0",
         "silverstripe/recipe-plugin": "^1.2",
         "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
         "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
-        "sminnee/phpunit-mock-objects": "^3.4.5"
+        "phpunit/phpunit": "^9.5"
     },
     "extra": {
         "project-files": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 52895a4..9bcd119 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <!--
 	PHPUnit configuration for SilverStripe
 
-	Requires PHPUnit 5+
+	Requires PHPUnit 9+
 
 	Usage:
 	 - "vendor/bin/phpunit": Runs all tests in all folders
@@ -18,31 +18,33 @@
 	It is safe to remove this file for normal website operation.
 -->
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-    <testsuite name="Default">
-        <directory>app/tests</directory>
-        <directory>vendor/silverstripe/cms/tests/php</directory>
-        <directory>vendor/silverstripe/framework/tests/php</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="Default">
+            <directory>app/tests</directory>
+            <directory>vendor/silverstripe/cms/tests/php</directory>
+            <directory>vendor/silverstripe/framework/tests/php</directory>
+        </testsuite>
 
-    <!-- framework only -->
-    <testsuite name="framework">
-        <directory>vendor/silverstripe/framework/tests/php/</directory>
-    </testsuite>
+        <!-- framework only -->
+        <testsuite name="framework">
+            <directory>vendor/silverstripe/framework/tests/php/</directory>
+        </testsuite>
 
-    <!-- other core components -->
-    <testsuite name="core">
-        <directory>vendor/silverstripe/assets/tests/php/</directory>
-        <directory>vendor/silverstripe/versioned/tests/php/</directory>
-    </testsuite>
+        <!-- other core components -->
+        <testsuite name="core">
+            <directory>vendor/silverstripe/assets/tests/php/</directory>
+            <directory>vendor/silverstripe/versioned/tests/php/</directory>
+        </testsuite>
 
-    <!-- admin components -->
-    <testsuite name="admin">
-        <directory>vendor/silverstripe/admin/tests/php/</directory>
-        <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
-        <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
-        <directory>vendor/silverstripe/cms/tests/</directory>
-        <directory>vendor/silverstripe/graphql/tests/</directory>
-        <directory>vendor/silverstripe/reports/tests/</directory>
-        <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
-    </testsuite>
+        <!-- admin components -->
+        <testsuite name="admin">
+            <directory>vendor/silverstripe/admin/tests/php/</directory>
+            <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
+            <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
+            <directory>vendor/silverstripe/cms/tests/</directory>
+            <directory>vendor/silverstripe/graphql/tests/</directory>
+            <directory>vendor/silverstripe/reports/tests/</directory>
+            <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>