Merge pull request #64 from creative-commoners/pulls/2/sapphire-test-…

…nine API phpunit 9 support
silverstripe · Nov 1, 2021 · 7853fb2 · 7853fb2
2 parents 8ab99f7 + ffa4706
commit 7853fb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -15,10 +15,11 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4"
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0",
         "silverstripe/versioned": "^1"
     },

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/AbstractTest.php b/tests/AbstractTest.php
@@ -12,7 +12,7 @@ abstract class AbstractTest extends SapphireTest
 {
     protected $usesDatabase = true;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -26,7 +26,7 @@ protected function setUp()
         DBDatetime::set_mock_now('2010-03-15 12:00:00');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         DBDatetime::clear_mock_now();
 

diff --git a/tests/DatabaseStoreTest.php b/tests/DatabaseStoreTest.php
@@ -9,7 +9,7 @@
 
 class DatabaseStoreTest extends AbstractTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/HybridSessionTest.php b/tests/HybridSessionTest.php
@@ -19,7 +19,7 @@ class HybridSessionTest extends SapphireTest
      */
     protected $instance;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();