API Rename validator classes

src/Forms/FieldsValidator.php

@@ -3,6 +3,7 @@
 namespace SilverStripe\Forms;
 
 use SilverStripe\Dev\Deprecation;
+use SilverStripe\Forms\Validation\Validator;
 
 /**
  * Validates the internal state of all fields in the form.

src/Forms/FileField.php

@@ -33,7 +33,7 @@
  *      $actions = new FieldList(
  *          new FormAction('doUpload', 'Upload file')
  *      );
- *      $validator = new RequiredFields(['MyName', 'MyFile']);
+ *      $validator = new RequiredFieldsValidator(['MyName', 'MyFile']);
  *
  *      return new Form($this, 'Form', $fields, $actions, $validator);
  *  }

src/Forms/Form.php

@@ -20,6 +20,8 @@
 use SilverStripe\View\AttributesHTML;
 use SilverStripe\View\SSViewer;
 use SilverStripe\Model\ModelData;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
+use SilverStripe\Forms\Validation\Validator;
 
 /**
  * Base class for all forms.
@@ -297,7 +299,7 @@ public function __construct(
         $this->setName($name);
 
         // Form validation
-        $this->validator = ($validator) ? $validator : new RequiredFields();
+        $this->validator = ($validator) ? $validator : new RequiredFieldsValidator();
         $this->validator->setForm($this);
 
         // Form error controls

src/Forms/GridField/GridFieldDetailForm.php

@@ -15,7 +15,7 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\FieldsValidator;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Model\ModelData;

src/Forms/HasOneRelationFieldInterface.php

@@ -4,7 +4,7 @@
 
 /**
  * Added to form fields whose values are the ID of a has_one relation
- * This is used in RequiredFields validation to check if the value is set
+ * This is used in RequiredFieldsValidator validation to check if the value is set
  */
 interface HasOneRelationFieldInterface
 {

src/Forms/CompositeValidator.php → src/Forms/Validation/CompositeValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms;
+namespace SilverStripe\Forms\Validation;
 
 use InvalidArgumentException;
 use SilverStripe\Core\Validation\ValidationResult;
@@ -20,7 +20,7 @@
  * {
  *   $compositeValidator = parent::getCMSCompositeValidator();
  *
- *   $compositeValidator->addValidator(RequiredFields::create(['MyRequiredField']));
+ *   $compositeValidator->addValidator(RequiredFieldsValidator::create(['MyRequiredField']));
  *
  *   return $compositeValidator
  * }
@@ -29,7 +29,7 @@
  *
  * protected function updateCMSCompositeValidator(CompositeValidator $compositeValidator): void
  * {
- *   $compositeValidator->addValidator(RequiredFields::create(['AdditionalContent']));
+ *   $compositeValidator->addValidator(RequiredFieldsValidator::create(['AdditionalContent']));
  * }
  * @deprecated 5.4.0 Will be renamed to SilverStripe\Forms\Validation\CompositeValidator
  */
@@ -106,7 +106,7 @@ public function validate()
     }
 
     /**
-     * Note: The existing implementations for the php() method (@see RequiredFields) does not check whether the
+     * Note: The existing implementations for the php() method (@see RequiredFieldsValidator) does not check whether the
      * Validator is enabled or not, and it also does not reset the validation result - so, neither does this.
      *
      * @param array $data
@@ -156,7 +156,7 @@ public function getValidators(): array
     }
 
     /**
-     * Return all Validators that match a certain class name. EG: RequiredFields::class
+     * Return all Validators that match a certain class name. EG: RequiredFieldsValidator::class
      *
      * The keys for the return array match the keys in the unfiltered array. You cannot assume the keys will be
      * sequential or that the first key will be ZERO.
@@ -181,7 +181,7 @@ public function getValidatorsByType(string $className): array
     }
 
     /**
-     * Remove all Validators that match a certain class name. EG: RequiredFields::class
+     * Remove all Validators that match a certain class name. EG: RequiredFieldsValidator::class
      *
      * @param string $className
      * @return CompositeValidator

src/Forms/RequiredFields.php → src/Forms/Validation/RequiredFieldsValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms;
+namespace SilverStripe\Forms\Validation;
 
 use SilverStripe\Core\ArrayLib;
 use SilverStripe\Dev\Deprecation;
@@ -15,7 +15,7 @@
  *
  * @deprecated 5.4.0 Will be renamed to SilverStripe\Forms\Validation\RequiredFieldsValidator
  */
-class RequiredFields extends Validator
+class RequiredFieldsValidator extends Validator
 {
     /**
      * Whether to globally allow whitespace only as a valid value for a required field
@@ -232,7 +232,7 @@ public function removeRequiredField($field)
     /**
      * Add {@link RequiredField} objects together
      *
-     * @param RequiredFields $requiredFields
+     * @param RequiredFieldsValidator $requiredFields
      * @return $this
      */
     public function appendRequiredFields($requiredFields)

src/Forms/Validator.php → src/Forms/Validation/Validator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms;
+namespace SilverStripe\Forms\Validation;
 
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Extensible;
@@ -179,7 +179,7 @@ public function removeValidation()
     /**
      * When Validators are set on the form, it can affect whether or not the form cannot be cached.
      *
-     * @see RequiredFields for an example of when you might be able to cache your form.
+     * @see RequiredFieldsValidator for an example of when you might be able to cache your form.
      *
      * @return bool
      */

src/ORM/DataObject.php

@@ -18,7 +18,7 @@
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\FormScaffolder;
-use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\Validation\CompositeValidator;
 use SilverStripe\Forms\FieldsValidator;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor;

src/Security/Group.php

@@ -4,7 +4,7 @@
 
 use SilverStripe\Admin\SecurityAdmin;
 use SilverStripe\Core\Convert;
-use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\Validation\CompositeValidator;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
@@ -23,7 +23,7 @@
 use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig;
 use SilverStripe\Forms\ListboxField;
 use SilverStripe\Forms\LiteralField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextareaField;
@@ -559,7 +559,7 @@ public function getCMSCompositeValidator(): CompositeValidator
     {
         $validator = parent::getCMSCompositeValidator();
 
-        $validator->addValidator(RequiredFields::create([
+        $validator->addValidator(RequiredFieldsValidator::create([
             'Title'
         ]));
 

src/Security/LogoutForm.php

@@ -9,7 +9,7 @@
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\HiddenField;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 
 /**
  * Log out form to display to users who arrive at 'Security/logout' without a

src/Security/Member.php

@@ -15,7 +15,7 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\TestMailer;
 use SilverStripe\Forms\CheckboxField;
-use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\Validation\CompositeValidator;
 use SilverStripe\Forms\ConfirmedPasswordField;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
@@ -682,7 +682,7 @@ public function getMemberPasswordField()
 
 
     /**
-     * Returns the {@link RequiredFields} instance for the Member object. This
+     * Returns the {@link RequiredFieldsValidator} instance for the Member object. This
      * Validator is used when saving a {@link CMSProfileController} or added to
      * any form responsible for saving a users data.
      *

src/Security/MemberAuthenticator/MemberLoginForm.php

@@ -10,7 +10,7 @@
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\PasswordField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\LoginForm as BaseLoginForm;
@@ -111,7 +111,7 @@ public function __construct(
         if (isset($logoutAction)) {
             $this->setFormAction($logoutAction);
         }
-        $this->setValidator(RequiredFields::create(static::config()->get('required_fields')));
+        $this->setValidator(RequiredFieldsValidator::create(static::config()->get('required_fields')));
     }
 
     /**

src/Security/Member_Validator.php

@@ -3,7 +3,7 @@
 namespace SilverStripe\Security;
 
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 
 /**
  * Member Validator
@@ -22,7 +22,7 @@
  *     - Surname
  * </code>
  */
-class Member_Validator extends RequiredFields
+class Member_Validator extends RequiredFieldsValidator
 {
     /**
      * Fields that are required by this validator

tests/php/Forms/CheckboxFieldTest.php

@@ -9,7 +9,7 @@
 use SilverStripe\ORM\DB;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\CheckboxField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 
 class CheckboxFieldTest extends SapphireTest
 {
@@ -200,7 +200,7 @@ public function testNoAriaRequired()
             "form",
             new FieldList($field),
             new FieldList(),
-            new RequiredFields(["RequiredField"])
+            new RequiredFieldsValidator(["RequiredField"])
         );
         $this->assertTrue($field->Required());
 

tests/php/Forms/CheckboxSetFieldTest.php

@@ -15,7 +15,7 @@
 use SilverStripe\Forms\CheckboxSetField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Model\ArrayData;
 
 class CheckboxSetFieldTest extends SapphireTest
@@ -355,7 +355,7 @@ public function testNoAriaRequired()
             "form",
             new FieldList($field),
             new FieldList(),
-            new RequiredFields(["RequiredField"])
+            new RequiredFieldsValidator(["RequiredField"])
         );
         $this->assertTrue($field->Required());
 

tests/php/Forms/CompositeFieldTest.php

@@ -7,7 +7,7 @@
 use SilverStripe\Forms\CompositeField;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
 
 class CompositeFieldTest extends SapphireTest

tests/php/Forms/CompositeValidatorTest.php

@@ -8,10 +8,10 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\Tests\ValidatorTest\TestValidator;
 use SilverStripe\Forms\TextField;
-use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\Validation\CompositeValidator;
 
 /**
  * @package framework
@@ -40,8 +40,8 @@ protected function getForm(array $fieldNames = []): Form
     public function testAddValidator(): void
     {
         $compositeValidator = new CompositeValidator();
-        $compositeValidator->addValidator(new RequiredFields());
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
 
         $this->assertCount(2, $compositeValidator->getValidators());
     }
@@ -76,38 +76,38 @@ public function testSetForm(): void
     public function testGetValidatorsByType(): void
     {
         $compositeValidator = new CompositeValidator();
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
         $compositeValidator->addValidator(new TestValidator());
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
         $compositeValidator->addValidator(new TestValidator());
 
         $this->assertCount(4, $compositeValidator->getValidators());
-        $this->assertCount(2, $compositeValidator->getValidatorsByType(RequiredFields::class));
+        $this->assertCount(2, $compositeValidator->getValidatorsByType(RequiredFieldsValidator::class));
     }
 
     public function testRemoveValidatorsByType(): void
     {
         $compositeValidator = new CompositeValidator();
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
         $compositeValidator->addValidator(new TestValidator());
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
         $compositeValidator->addValidator(new TestValidator());
 
         $this->assertCount(4, $compositeValidator->getValidators());
 
-        $compositeValidator->removeValidatorsByType(RequiredFields::class);
+        $compositeValidator->removeValidatorsByType(RequiredFieldsValidator::class);
         $this->assertCount(2, $compositeValidator->getValidators());
     }
 
     public function testCanBeCached(): void
     {
         $compositeValidator = new CompositeValidator();
-        $compositeValidator->addValidator(new RequiredFields());
+        $compositeValidator->addValidator(new RequiredFieldsValidator());
 
         $this->assertTrue($compositeValidator->canBeCached());
 
         $compositeValidator = new CompositeValidator();
-        $compositeValidator->addValidator(new RequiredFields(['Foor']));
+        $compositeValidator->addValidator(new RequiredFieldsValidator(['Foor']));
 
         $this->assertFalse($compositeValidator->canBeCached());
     }
@@ -121,12 +121,12 @@ public function testFieldIsRequired(): void
             'Content',
         ];
 
-        $requiredFieldsFirst = new RequiredFields(
+        $requiredFieldsFirst = new RequiredFieldsValidator(
             [
                 $fieldNames[0],
             ]
         );
-        $requiredFieldsSecond = new RequiredFields(
+        $requiredFieldsSecond = new RequiredFieldsValidator(
             [
                 $fieldNames[1],
             ]
@@ -147,8 +147,8 @@ public function testValidate(): void
     {
         $compositeValidator = new CompositeValidator();
         // Add two separate validators, each with one required field
-        $compositeValidator->addValidator(new RequiredFields(['Foo']));
-        $compositeValidator->addValidator(new RequiredFields(['Bar']));
+        $compositeValidator->addValidator(new RequiredFieldsValidator(['Foo']));
+        $compositeValidator->addValidator(new RequiredFieldsValidator(['Bar']));
 
         // Setup a form with the fields/data we're testing (a form is a dependency for validation right now)
         // We'll add three empty fields, but only two of them should be required