API phpunit 9 support

silverstripe · Oct 27, 2021 · 05dd7bc · 05dd7bc
1 parent f6e001b
commit 05dd7bc
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -20,12 +20,13 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4.0",
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10",
         "silverstripe/versioned": "^1.0",
         "guzzlehttp/guzzle": "^6.3.3"
     },
     "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
@@ -1,8 +1,10 @@
 <phpunit bootstrap="vendor/silverstripe/framework/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/Checks/DatabaseCheckTest.php b/tests/Checks/DatabaseCheckTest.php
@@ -10,8 +10,6 @@
 /**
  * Class DatabaseCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class DatabaseCheckTest extends SapphireTest

diff --git a/tests/Checks/ExternalURLCheckTest.php b/tests/Checks/ExternalURLCheckTest.php
@@ -9,8 +9,6 @@
 /**
  * Class ExternalURLCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class ExternalURLCheckTest extends SapphireTest

diff --git a/tests/Checks/FileWritableCheckTest.php b/tests/Checks/FileWritableCheckTest.php
@@ -9,8 +9,6 @@
 /**
  * Class FileWritableCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class FileWritableCheckTest extends SapphireTest

diff --git a/tests/Checks/HasClassCheckTest.php b/tests/Checks/HasClassCheckTest.php
@@ -9,8 +9,6 @@
 /**
  * Class HasClassCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class HasClassCheckTest extends SapphireTest

diff --git a/tests/Checks/HasFunctionCheckTest.php b/tests/Checks/HasFunctionCheckTest.php
@@ -9,8 +9,6 @@
 /**
  * Class HasFunctionCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class HasFunctionCheckTest extends SapphireTest

diff --git a/tests/Checks/SessionCheckTest.php b/tests/Checks/SessionCheckTest.php
@@ -25,7 +25,7 @@ class SessionCheckTest extends SapphireTest
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->sessionCheck = new SessionCheck('/');

diff --git a/tests/Checks/URLCheckTest.php b/tests/Checks/URLCheckTest.php
@@ -9,8 +9,6 @@
 /**
  * Class URLCheckTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class URLCheckTest extends SapphireTest

diff --git a/tests/Controllers/DevCheckControllerTest.php b/tests/Controllers/DevCheckControllerTest.php
@@ -10,8 +10,6 @@
 /**
  * Class DevCheckControllerTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class DevCheckControllerTest extends SapphireTest

diff --git a/tests/Controllers/DevHealthControllerTest.php b/tests/Controllers/DevHealthControllerTest.php
@@ -10,8 +10,6 @@
 /**
  * Class DevHealthControllerTest
  *
- * @mixin PHPUnit_Framework_TestCase
- *
  * @package environmentcheck
  */
 class DevHealthControllerTest extends SapphireTest

diff --git a/tests/EnvironmentCheckerTest.php b/tests/EnvironmentCheckerTest.php
@@ -20,7 +20,7 @@ class EnvironmentCheckerTest extends SapphireTest
 {
     protected $usesDatabase = true;
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         EnvironmentCheckSuite::reset();
         parent::tearDown();
@@ -61,8 +61,8 @@ public function testLogsWithWarnings()
         $logger->expects($this->once())
             ->method('log')
             ->withConsecutive(
-                $this->equalTo(LogLevel::WARNING),
-                $this->anything()
+                [$this->equalTo(LogLevel::WARNING)],
+                [$this->anything()]
             );
 
         Injector::inst()->registerService($logger, LoggerInterface::class);