DEP Use PHPUnit 11

silverstripe · Sep 6, 2024 · 673826e · 673826e
1 parent 3792144
commit 673826e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "silverstripe/mimevalidator": "^4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^11.3",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/documentation-lint": "^1",
         "silverstripe/standards": "^1",

diff --git a/tests/php/Control/UserDefinedFormControllerTest.php b/tests/php/Control/UserDefinedFormControllerTest.php
@@ -525,7 +525,7 @@ public function testEmailAttachmentMaximumSizeCanBeConfigured()
         $this->assertSame(5 * 1024 * 1024, $udfController->getMaximumAllowedEmailAttachmentSize());
     }
 
-    public function getParseByteSizeStringTestValues()
+    public static function getParseByteSizeStringTestValues()
     {
         return [
             ['9846', 9846],
@@ -558,7 +558,7 @@ public function testParseByteSizeString($input, $expectedOutput)
         $this->assertSame($expectedOutput, $controller->convertSizeStringToBytes($input));
     }
 
-    public function getParseByteSizeStringTestBadValues()
+    public static function getParseByteSizeStringTestBadValues()
     {
         return [
             ['1234b'],
@@ -582,7 +582,7 @@ public function testParseByteSizeStringBadValuesThrowException($input)
         $controller->convertSizeStringToBytes($input);
     }
 
-    public function provideValidEmailsToArray()
+    public static function provideValidEmailsToArray()
     {
         return [
             [[], [null]],

diff --git a/tests/php/Form/UserFormsRequiredFieldsTest.php b/tests/php/Form/UserFormsRequiredFieldsTest.php
@@ -29,7 +29,7 @@ public function testUsesUserFormsRequiredFieldsValidator()
         $this->assertInstanceOf(UserFormsRequiredFields::class, $validator, 'Uses UserFormsRequiredFields validator');
     }
 
-    public function dataProviderValidationOfConditionalRequiredFields()
+    public static function dataProviderValidationOfConditionalRequiredFields()
     {
         return [
             'Passes when non-conditional required field has a value' => [
@@ -78,7 +78,7 @@ public function testValidationOfConditionalRequiredFields($data, $expected)
         $this->assertEquals($expected, $validator->php($data));
     }
 
-    public function dataProviderValidationOfNestedConditionalRequiredFields()
+    public static function dataProviderValidationOfNestedConditionalRequiredFields()
     {
         return [
             'Fails when non-conditional required field is empty' => [[], false],

diff --git a/tests/php/Model/EditableCustomRuleTest.php b/tests/php/Model/EditableCustomRuleTest.php
@@ -61,7 +61,7 @@ public function testToggleDisplayEvent()
         $this->assertSame('userform.field.hide', $rule1->toggleDisplayEvent('hide', true));
     }
 
-    public function dataProviderValidateAgainstFormData()
+    public static function dataProviderValidateAgainstFormData()
     {
         return [
             'IsNotBlank with blank value' =>

diff --git a/tests/php/Model/EditableFormFieldTest.php b/tests/php/Model/EditableFormFieldTest.php
@@ -257,7 +257,7 @@ public function testGetIcon()
         $this->assertStringContainsString('/images/editabletextfield.png', $field->getIcon());
     }
 
-    public function displayedProvider()
+    public static function displayedProvider()
     {
         $one = ['basic_text_name' => 'foobar'];
         $two = array_merge($one, ['basic_text_name_2' => 'foobar']);