From 99ec82a34b5d83ac1dc3b91e77f190f7d29e7c90 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 27 Oct 2021 18:15:48 +1300 Subject: [PATCH] API phpunit 9 support --- composer.json | 5 +++-- phpunit.xml.dist | 8 +++++--- tests/TaxonomyTermTest.php | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 0515501..93beeb4 100644 --- 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 index c3b25ef..f7e5473 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,8 +1,10 @@ - - tests - + + + tests + + diff --git a/tests/TaxonomyTermTest.php b/tests/TaxonomyTermTest.php index c1106b5..aa6e35f 100644 --- 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