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

…nine API phpunit 9 support
silverstripe · Nov 1, 2021 · bb53e47 · bb53e47
2 parents 08fb151 + e536810
commit bb53e47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -24,11 +24,11 @@
     ],
     "require": {
         "dragonmantank/cron-expression": "^3",
-        "silverstripe/framework": "^4",
-        "php": "^7.1 || ^8"
+        "silverstripe/framework": "^4.10",
+        "php": "^7.3 || ^8"
     },
     "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/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/CronTaskControllerTest.php b/tests/CronTaskControllerTest.php
@@ -24,7 +24,7 @@ class CronTaskControllerTest extends FunctionalTest
     /**
      * {@inheritDoc}
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         CronTaskTest\TestCron::$times_run = 0;