Merge branch '6.0' into 6

src/Forms/CompositeValidator.php

@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use SilverStripe\Core\Validation\ValidationResult;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * CompositeValidator can contain between 0 and many different types of Validators. Each Validator is itself still
@@ -30,6 +31,7 @@
  * {
  *   $compositeValidator->addValidator(RequiredFields::create(['AdditionalContent']));
  * }
+ * @deprecated 5.4.0 Will be renamed to SilverStripe\Forms\Validation\CompositeValidator
  */
 class CompositeValidator extends Validator
 {
@@ -45,8 +47,12 @@ class CompositeValidator extends Validator
      */
     public function __construct(array $validators = [])
     {
+        Deprecation::noticeWithNoReplacment(
+            '5.4.0',
+            'Will be renamed to SilverStripe\\Forms\\Validation\\CompositeValidator',
+            Deprecation::SCOPE_CLASS
+        );
         $this->validators = array_values($validators ?? []);
-
         parent::__construct();
     }
 

src/Forms/FieldsValidator.php

@@ -2,11 +2,25 @@
 
 namespace SilverStripe\Forms;
 
+use SilverStripe\Dev\Deprecation;
+
 /**
  * Validates the internal state of all fields in the form.
+ *
+ * @deprecated 5.4.0 Will be replaced with functionality inside SilverStripe\Forms\Form::validate()
  */
 class FieldsValidator extends Validator
 {
+    public function __construct()
+    {
+        Deprecation::noticeWithNoReplacment(
+            '5.4.0',
+            'Will be replaced with functionality inside SilverStripe\Forms\Form::validate()',
+            Deprecation::SCOPE_CLASS
+        );
+        parent::__construct();
+    }
+
     public function php($data): bool
     {
         $fields = $this->form->Fields();

src/Forms/RequiredFields.php

@@ -3,6 +3,7 @@
 namespace SilverStripe\Forms;
 
 use SilverStripe\Core\ArrayLib;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * Required Fields allows you to set which fields need to be present before
@@ -11,6 +12,8 @@
  *
  * Validation is performed on a field by field basis through
  * {@link FormField::validate}.
+ *
+ * @deprecated 5.4.0 Will be renamed to SilverStripe\Forms\Validation\RequiredFieldsValidator
  */
 class RequiredFields extends Validator
 {
@@ -39,6 +42,11 @@ class RequiredFields extends Validator
      */
     public function __construct()
     {
+        Deprecation::noticeWithNoReplacment(
+            '5.4.0',
+            'Will be renamed to SilverStripe\\Forms\\Validation\\RequiredFieldsValidator',
+            Deprecation::SCOPE_CLASS
+        );
         $required = func_get_args();
         if (isset($required[0]) && is_array($required[0])) {
             $required = $required[0];

src/Forms/Validator.php

@@ -6,11 +6,14 @@
 use SilverStripe\Core\Extensible;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Validation\ValidationResult;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * This validation class handles all form and custom form validation through the use of Required
  * fields. It relies on javascript for client-side validation, and marking fields after server-side
  * validation. It acts as a visitor to individual form fields.
+ *
+ * @deprecated 5.4.0 Will be renamed to SilverStripe\Forms\Validation\Validator
  */
 abstract class Validator
 {
@@ -20,6 +23,11 @@ abstract class Validator
 
     public function __construct()
     {
+        Deprecation::noticeWithNoReplacment(
+            '5.4.0',
+            'Will be renamed to SilverStripe\\Forms\\Validation\\Validator',
+            Deprecation::SCOPE_CLASS
+        );
         $this->resetResult();
     }