Merge pull request #1360 from creative-commoners/pulls/7.0/validation…

…-interface API Update validate signature
silverstripe · Dec 17, 2024 · 2159249 · 2159249
2 parents 2efc5ea + 30738f0
commit 2159249
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/code/Model/EditableFormField/EditableFileField.php b/code/Model/EditableFormField/EditableFileField.php
@@ -179,10 +179,7 @@ public function getCMSFields()
         return parent::getCMSFields();
     }
 
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
+    public function validate(): ValidationResult
     {
         $result = parent::validate();
 

diff --git a/code/Model/EditableFormField/EditableNumericField.php b/code/Model/EditableFormField/EditableNumericField.php
@@ -7,6 +7,7 @@
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\NumericField;
 use SilverStripe\UserForms\Model\EditableFormField;
+use SilverStripe\Core\Validation\ValidationResult;
 
 /**
  * EditableNumericField
@@ -85,7 +86,7 @@ protected function updateFormField($field)
         }
     }
 
-    public function validate()
+    public function validate(): ValidationResult
     {
         $result = parent::validate();
         if ($this->MinValue > $this->MaxValue) {

diff --git a/code/Model/EditableFormField/EditableTextField.php b/code/Model/EditableFormField/EditableTextField.php
@@ -105,10 +105,7 @@ public function getCMSFields()
         return parent::getCMSFields();
     }
 
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
+    public function validate(): ValidationResult
     {
         $result = parent::validate();
 

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
@@ -603,10 +603,8 @@ public function getEmailTemplateDropdownValues()
 
     /**
      * Validate that valid email addresses are being used
-     *
-     * @return ValidationResult
      */
-    public function validate()
+    public function validate(): ValidationResult
     {
         $result = parent::validate();
         $checkEmail = [