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

…nine API phpunit 9 support
silverstripe · Nov 1, 2021 · 4ba94b6 · 4ba94b6
2 parents 83a736b + 99ec82a
commit 4ba94b6
Show file tree

Hide file tree

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

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/TaxonomyTermTest.php b/tests/TaxonomyTermTest.php
@@ -12,7 +12,7 @@ class TaxonomyTermTest extends SapphireTest
 {
     protected static $fixture_file = 'TaxonomyTermTest.yml';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Type inheritance needs to be disabled while we generate our objects from our fixtures. Otherwise, all of
         // the Types will be written to our child Terms, and this will completely invalidate some of our test