ENH Use FieldValidator for FormFields

creative-commoners · Oct 31, 2024 · d11a116 · d11a116
1 parent 3939401
commit d11a116
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/Forms/WildcardDomainField.php b/src/Forms/WildcardDomainField.php
@@ -2,6 +2,7 @@
 namespace SilverStripe\Subsites\Forms;
 
 use SilverStripe\Forms\TextField;
+use SilverStripe\Core\Validation\ValidationResult;
 
 /**
  * A text field that accepts only valid domain names, but allows the wildcard (*) character
@@ -10,22 +11,21 @@ class WildcardDomainField extends TextField
 {
     /**
      * Validate this field as a valid hostname
-     *
-     * @param Validator $validator
-     * @return bool
      */
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        if ($this->checkHostname($this->Value())) {
-            return $this->extendValidationResult(true, $validator);
-        }
-
-        $validator->validationError(
-            $this->getName(),
-            _t('DomainNameField.INVALID_DOMAIN', 'Invalid domain name'),
-            'validation'
-        );
-        return $this->extendValidationResult(false, $validator);
+        $result = ValidationResult::create();
+        $this->beforeExtending('updateValidate', function() use ($result) {
+            if ($this->checkHostname($this->Value())) {
+                return;
+            }
+            $result->addFieldError(
+                $this->getName(),
+                _t('DomainNameField.INVALID_DOMAIN', 'Invalid domain name'),
+                'validation'
+            );
+        });
+        return $result->combineAnd(parent::validate());
     }
 
     /**