API phpunit9 support

silverstripe · Oct 19, 2021 · b7be469 · b7be469
1 parent 095e2c4
commit b7be469
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -22,12 +22,12 @@
     ],
     "require": {
         "silverstripe/admin": "^1.5",
-        "silverstripe/framework": "^4.5",
+        "silverstripe/framework": "^4.10",
         "silverstripe/versioned": "^1.5",
         "silverstripe/vendor-plugin": "^1.0"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/asset-admin": "^1.5",
         "silverstripe/cms": "^4.5"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,9 @@
-<!--
-Standard module phpunit configuration.
-Requires PHPUnit ^5.7
--->
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-	<testsuite name="Default">
-		<directory>tests/php</directory>
-    </testsuite>
-
+    <testsuites>
+        <testsuite name="Default">
+            <directory>tests/php</directory>
+        </testsuite>
+    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>

diff --git a/tests/php/AddToCampaignValidatorTest.php b/tests/php/AddToCampaignValidatorTest.php
@@ -20,7 +20,7 @@ class AddToCampaignValidatorTest extends SapphireTest
      */
     protected $validator = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->logInWithPermission('ADMIN');

diff --git a/tests/php/CampaignAdminTest.php b/tests/php/CampaignAdminTest.php
@@ -17,7 +17,7 @@ class CampaignAdminTest extends SapphireTest
 
     protected static $fixture_file = 'CampaignAdminTest.yml';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         DBDatetime::set_mock_now('2011-09-24 11:11:00');