Merge pull request #1519 from creative-commoners/pulls/3/valid

API Rename validator classes
silverstripe · Dec 10, 2024 · 743a10f · 743a10f
2 parents 41fbeb8 + 14c8221
commit 743a10f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/code/Forms/AssetFormFactory.php b/code/Forms/AssetFormFactory.php
@@ -21,7 +21,7 @@
 use SilverStripe\Forms\OptionsetField;
 use SilverStripe\Forms\PopoverField;
 use SilverStripe\Forms\ReadonlyField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextField;
@@ -108,11 +108,11 @@ public function getForm(?RequestHandler $controller = null, $name = FormFactory:
      * @param RequestHandler $controller
      * @param $formName
      * @param $context
-     * @return RequiredFields
+     * @return RequiredFieldsValidator
      */
     protected function getValidator(?RequestHandler $controller, $formName, $context = [])
     {
-        $validator = new RequiredFields('Name');
+        $validator = new RequiredFieldsValidator('Name');
 
         return $validator;
     }

diff --git a/code/Forms/FileFormFactory.php b/code/Forms/FileFormFactory.php
@@ -13,7 +13,7 @@
 use SilverStripe\Forms\HeaderField;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\LiteralField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextField;
@@ -503,7 +503,7 @@ public function getRequiredContext()
      * @param RequestHandler $controller
      * @param $formName
      * @param $context
-     * @return RequiredFields
+     * @return RequiredFieldsValidator
      */
     protected function getValidator(?RequestHandler $controller, $formName, $context = [])
     {

diff --git a/code/Forms/RemoteFileFormFactory.php b/code/Forms/RemoteFileFormFactory.php
@@ -18,7 +18,7 @@
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\OptionsetField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
 use SilverStripe\View\Embed\Embeddable;
 
@@ -109,7 +109,7 @@ public function getForm(?RequestHandler $controller = null, $name = RemoteFileFo
         $fields = $this->getFormFields($controller, $name, $context);
         $actions = $this->getFormActions($controller, $name, $context);
 
-        $validator = new RequiredFields();
+        $validator = new RequiredFieldsValidator();
         $form = Form::create($controller, $name, $fields, $actions, $validator);
         $form->addExtraClass('form--fill-height');
         $form->addExtraClass('form--no-dividers');

diff --git a/code/Forms/UploadField.php b/code/Forms/UploadField.php
@@ -11,7 +11,7 @@
 use SilverStripe\Forms\FileHandleField;
 use SilverStripe\Forms\FileUploadReceiver;
 use SilverStripe\Forms\FormField;
-use SilverStripe\Forms\Validator;
+use SilverStripe\Forms\Validation\Validator;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Model\List\SS_List;