ENH Use FieldValidator for FormFields

silverstripe · Oct 31, 2024 · a748820 · a748820
1 parent ea084d0
commit a748820
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/code/Form/UserFormsRequiredFields.php b/code/Form/UserFormsRequiredFields.php
@@ -36,7 +36,7 @@ public function php($data)
         $fields = $this->form->Fields();
 
         foreach ($fields as $field) {
-            $valid = ($field->validate($this) && $valid);
+            $valid = $field->validate()->isValid() && $valid;
         }
 
         if (empty($this->required)) {

diff --git a/code/FormField/UserFormsCheckboxSetField.php b/code/FormField/UserFormsCheckboxSetField.php
@@ -2,8 +2,8 @@
 
 namespace SilverStripe\UserForms\FormField;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\CheckboxSetField;
-use SilverStripe\UserForms\Model\EditableFormField;
 
 /**
  * @package userforms
@@ -45,14 +45,7 @@ public function getOptions()
         return $options;
     }
 
-    /**
-     * @inheritdoc
-     *
-     * @param Validator $validator
-     *
-     * @return bool
-     */
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
         // get the previous values (could contain comma-delimited list)
 
@@ -66,12 +59,12 @@ public function validate($validator)
 
         $this->setValue($value);
 
-        $validated = parent::validate($validator);
+        $result = parent::validate();
 
         // restore previous value after validation
 
         $this->setValue($previous);
 
-        return $validated;
+        return $result;
     }
 }