MNT Fix unit tests

silverstripe · Feb 20, 2025 · 0606be4 · 0606be4
1 parent 1a6cea4
commit 0606be4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/tests/php/Control/Middleware/AllowedHostsMiddlewareTest.php b/tests/php/Control/Middleware/AllowedHostsMiddlewareTest.php
@@ -9,12 +9,13 @@
 use SilverStripe\Core\Environment;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Control\Middleware\AllowedHostsMiddleware;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class AllowedHostsMiddlewareTest extends SapphireTest
 {
     protected $usesDatabase = false;
 
-    public function provideProcess(): array
+    public static function provideProcess(): array
     {
         return [
             'cli allow all' => [
@@ -75,9 +76,7 @@ public function provideProcess(): array
         ];
     }
 
-    /**
-     * @dataProvider provideProcess
-     */
+    #[DataProvider('provideProcess')]
     public function testProcess(string|array $allowedHosts, bool $isCli, bool $allowed): void
     {
         $reflectionEnvironment = new ReflectionClass(Environment::class);

diff --git a/tests/php/Core/KernelTest.php b/tests/php/Core/KernelTest.php
@@ -20,6 +20,7 @@
 use SilverStripe\ORM\DB;
 use ReflectionObject;
 use SilverStripe\Core\Tests\KernelTest\TestFlushable;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class KernelTest extends SapphireTest
 {
@@ -131,7 +132,7 @@ public function testImplementorsAreCalled()
         $kernel->boot();
     }
 
-    public function provideAllowedHostsWarning(): array
+    public static function provideAllowedHostsWarning(): array
     {
         $scenarios = [
             [
@@ -158,9 +159,7 @@ public function provideAllowedHostsWarning(): array
         return $scenarios;
     }
 
-    /**
-     * @dataProvider provideAllowedHostsWarning
-     */
+    #[DataProvider('provideAllowedHostsWarning')]
     public function testAllowedHostsWarning(array $config, bool $isCli, bool $shouldLog): void
     {
         // Prepare mock to check if a warning is logged or not

diff --git a/tests/php/Forms/FormFieldTest.php b/tests/php/Forms/FormFieldTest.php
@@ -96,6 +96,7 @@
 use SilverStripe\Forms\SegmentField;
 use SilverStripe\Core\Validation\FieldValidation\TimeFieldValidator;
 use SilverStripe\Core\Validation\FieldValidation\DatetimeFieldValidator;
+use SilverStripe\Forms\SudoModePasswordField;
 
 class FormFieldTest extends SapphireTest
 {
@@ -936,6 +937,9 @@ public function testFieldValidatorConfig(): void
                 CompositeFieldValidator::class,
             ],
             SingleLookupField::class => [],
+            SudoModePasswordField::class => [
+                StringFieldValidator::class,
+            ],
             Tab::class => [
                 CompositeFieldValidator::class,
             ],