Merge pull request #37 from creative-commoners/pulls/4/sapphire-test-…

…nine API phpunit 9 support
silverstripe · Nov 15, 2021 · e4e8aca · e4e8aca
2 parents 1644805 + 137618b
commit e4e8aca
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -10,12 +10,13 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": "^7.3 || ^8.0",
         "silverstripe/admin": "^1.0"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^3.0"
+        "phpunit/phpunit": "^9.5",
+        "silverstripe/framework": "^4.10",
+        "squizlabs/php_codesniffer": "^3"
     },
     "autoload": {
         "psr-4": {

diff --git 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/php/Control/SudoModeControllerTest.php b/tests/php/Control/SudoModeControllerTest.php
@@ -23,7 +23,7 @@ class SudoModeControllerTest extends FunctionalTest
      */
     private $securityTokenEnabled;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -37,7 +37,7 @@ protected function setUp()
         $member->changePassword('0p3nS3samE!');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->securityTokenEnabled) {
             SecurityToken::enable();

diff --git a/tests/php/Extension/SudoModeOnLoginExtensionTest.php b/tests/php/Extension/SudoModeOnLoginExtensionTest.php
@@ -19,7 +19,7 @@ class SudoModeOnLoginExtensionTest extends FunctionalTest
         ],
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/php/Service/SudoModeServiceTest.php b/tests/php/Service/SudoModeServiceTest.php
@@ -21,7 +21,7 @@ class SudoModeServiceTest extends SapphireTest
      */
     private $service;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ class SudoModeOnLoginExtensionTest extends FunctionalTest @@
             ],
         ];
-        protected function setUp()
+        protected function setUp(): void
         {
             parent::setUp();
@@ Expand Down @@