From 1cd1d609695d305bb4588f0daae5a44fafb29987 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 27 Oct 2021 18:13:05 +1300
Subject: [PATCH] API phpunit 9 support

---
 composer.json                       |  5 +++--
 phpunit.xml.dist                    |  8 +++++---
 tests/MemberReportExtensionTest.php |  4 ++--
 tests/SubsitesReportTest.php        | 26 +++++++++++++-------------
 tests/UserSecurityReportTest.php    |  2 +-
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 4db8db0..d7a11b1 100644
--- a/composer.json
+++ b/composer.json
@@ -15,12 +15,13 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4",
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10",
         "silverstripe/cms": "^4",
         "silverstripe/reports": "^4"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": [],
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0226727..0282bda 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,9 @@
 <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
-    <testsuite name="Default">
-		<directory>tests/</directory>
-	</testsuite>
+	<testsuites>
+		<testsuite name="Default">
+			<directory>tests/</directory>
+		</testsuite>
+	</testsuites>
 
 	<filter>
 		<whitelist addUncoveredFilesFromWhitelist="true">
diff --git a/tests/MemberReportExtensionTest.php b/tests/MemberReportExtensionTest.php
index 4f332ce..6b9d951 100644
--- a/tests/MemberReportExtensionTest.php
+++ b/tests/MemberReportExtensionTest.php
@@ -17,7 +17,7 @@ class MemberReportExtensionTest extends SapphireTest
         ],
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         DBDatetime::set_mock_now('2018-05-03 00:00:00');
 
@@ -29,7 +29,7 @@ public function testGetLastLoggedIn()
         /** @var Member $member */
         $member = $this->objFromFixture(Member::class, 'has_logged_in');
         $result = $member->getLastLoggedIn();
-        $this->assertContains('2018-05-03', $result, 'Last logged in date is shown');
+        $this->assertStringContainsString('2018-05-03', $result, 'Last logged in date is shown');
     }
 
     public function testGetLastLoggedInReturnsNever()
diff --git a/tests/SubsitesReportTest.php b/tests/SubsitesReportTest.php
index f42f664..e3a9f99 100644
--- a/tests/SubsitesReportTest.php
+++ b/tests/SubsitesReportTest.php
@@ -29,7 +29,7 @@ class SubsitesReportTest extends SapphireTest
         ],
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!class_exists(Subsite::class)) {
             // Don't break the parent:setUp() when failing to create Subsite fixtures
@@ -56,29 +56,29 @@ public function testGetMemberGroups()
         // Admin
         $admin = $this->objFromFixture(Member::class, 'memberadmin');
         $subsites = $admin->SubsiteDescription;
-        $this->assertContains('TestMainSite', $subsites);
-        $this->assertContains('TestSubsite1', $subsites);
-        $this->assertContains('TestSubsite2', $subsites);
+        $this->assertStringContainsString('TestMainSite', $subsites);
+        $this->assertStringContainsString('TestSubsite1', $subsites);
+        $this->assertStringContainsString('TestSubsite2', $subsites);
 
         // Editor
         $membereditor = $this->objFromFixture(Member::class, 'membereditor');
         $subsites = $membereditor->SubsiteDescription;
-        $this->assertContains('TestMainSite', $subsites);
-        $this->assertContains('TestSubsite1', $subsites);
-        $this->assertContains('TestSubsite2', $subsites);
+        $this->assertStringContainsString('TestMainSite', $subsites);
+        $this->assertStringContainsString('TestSubsite1', $subsites);
+        $this->assertStringContainsString('TestSubsite2', $subsites);
 
         // First User
         $membersubsite1 = $this->objFromFixture(Member::class, 'membersubsite1');
         $subsites = $membersubsite1->SubsiteDescription;
-        $this->assertNotContains('TestMainSite', $subsites);
-        $this->assertContains('TestSubsite1', $subsites);
-        $this->assertNotContains('TestSubsite2', $subsites);
+        $this->assertStringNotContainsString('TestMainSite', $subsites);
+        $this->assertStringContainsString('TestSubsite1', $subsites);
+        $this->assertStringNotContainsString('TestSubsite2', $subsites);
 
         // Second user
         $memberallsubsites = $this->objFromFixture(Member::class, 'memberallsubsites');
         $subsites = $memberallsubsites->SubsiteDescription;
-        $this->assertNotContains('TestMainSite', $subsites);
-        $this->assertContains('TestSubsite1', $subsites);
-        $this->assertContains('TestSubsite2', $subsites);
+        $this->assertStringNotContainsString('TestMainSite', $subsites);
+        $this->assertStringContainsString('TestSubsite1', $subsites);
+        $this->assertStringContainsString('TestSubsite2', $subsites);
     }
 }
diff --git a/tests/UserSecurityReportTest.php b/tests/UserSecurityReportTest.php
index 335055a..c359df6 100644
--- a/tests/UserSecurityReportTest.php
+++ b/tests/UserSecurityReportTest.php
@@ -44,7 +44,7 @@ class UserSecurityReportTest extends SapphireTest
      * @return ArrayList
      * @todo pre-fill the report with fixture-defined users
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $reports = Report::get_reports();