Merge pull request #49 from creative-commoners/pulls/3/sapphire-test-…

…nine API phpunit 9 support
silverstripe · Nov 1, 2021 · accdc69 · accdc69
2 parents 4d7cae7 + cb8d0a7
commit accdc69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -8,10 +8,11 @@
         "reports"
     ],
     "require": {
+        "php": "^7.3 || ^8.0",
         "silverstripe/cms": "^4.0"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "authors": [

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">
             <directory suffix=".php">src/</directory>

diff --git a/tests/SitewideContentReportTest.php b/tests/SitewideContentReportTest.php
@@ -23,7 +23,7 @@ class SitewideContentReportTest extends SapphireTest
      */
     protected static $fixture_file = 'SitewideContentReportTest.yml';
 
-    public function setUp()
+    protected function setUp(): void
     {
         // Stop default page creation from occuring - just use fixtures
         Config::modify()->set(SiteTree::class, 'create_default_pages', false);