MNT Fix tests

Author: GuySartorelli

src/Validators/AjaxCompositeValidator.php

@@ -139,7 +139,7 @@ protected function getRequest(): ?HTTPRequest
      * normally called from validate() which has been overridden and no longer
      * calls this.
      *
-     * @see \SilverStripe\Forms\Validator::php()
+     * @see \SilverStripe\Forms\Validation\Validator::php()
      */
     public function php($data)
     {

tests/php/TestOnlyClasses/TestMultiFieldValidator.php

@@ -5,7 +5,7 @@
 use Signify\ComposableValidators\Traits\ValidatesMultipleFields;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Forms\FormField;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 
 class TestMultiFieldValidator extends Validator implements TestOnly
 {

tests/php/TestOnlyClasses/TestMultiFieldWithConfigValidator.php

@@ -5,7 +5,7 @@
 use Signify\ComposableValidators\Traits\ValidatesMultipleFieldsWithConfig;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Forms\FormField;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 
 class TestMultiFieldWithConfigValidator extends Validator implements TestOnly
 {

tests/php/TestOnlyClasses/TestValidator.php

@@ -3,7 +3,7 @@
 namespace Signify\ComposableValidators\Tests;
 
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 
 /**
  * Simple validator that always fails in the same way.

tests/php/ValidatorTests/AjaxCompositeValidatorTest.php

@@ -88,13 +88,13 @@ public function testGetOrAddValidatorByType(): void
         // Confirm validator starts empty.
         $this->assertCount(0, $compositeValidator->getValidators());
         // One validator should be created and added.
-        $simpleFieldsValidator1 = $compositeValidator->getOrAddValidatorByType(SimpleFieldsValidator::class); // @TODO replace with another
+        $validator1 = $compositeValidator->getOrAddValidatorByType(WarningFieldsValidator::class);
         $this->assertCount(1, $compositeValidator->getValidators());
         // The validator previously created should be fetched, rather than instantiating a new one.
-        $simpleFieldsValidator2 = $compositeValidator->getOrAddValidatorByType(SimpleFieldsValidator::class); // @TODO replace with another
+        $validator2 = $compositeValidator->getOrAddValidatorByType(WarningFieldsValidator::class);
         $this->assertCount(1, $compositeValidator->getValidators());
         // Confirm both simple fields validators are the exact same instance.
-        $this->assertTrue($simpleFieldsValidator1 === $simpleFieldsValidator2);
+        $this->assertTrue($validator1 === $validator2);
     }
 
     /**

tests/php/ValidatorTests/ConstraintsValidatorTest.php

@@ -2,14 +2,15 @@
 
 namespace Signify\ComposableValidators\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Signify\ComposableValidators\Validators\ConstraintsValidator;
 use SilverStripe\Dev\SapphireTest;
 use Symfony\Component\Validator\Constraints\Ip;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class ConstraintsValidatorTest extends SapphireTest
 {
-    public function provideValidation(): array
+    public static function provideValidation(): array
     {
         return [
             [
@@ -25,9 +26,7 @@ public function provideValidation(): array
         ];
     }
 
-    /**
-     * @dataProvider provideValidation
-     */
+    #[DataProvider('provideValidation')]
     public function testValidation(array $fields, array $constraints, bool $isValid): void
     {
         $form = TestFormGenerator::getForm($fields, new ConstraintsValidator($constraints));