API Replace getCMSValidator with getCMSCompositeValidator (#223)

silverstripe · Jan 9, 2025 · 8e46c34 · 8e46c34
1 parent 50d9c6b
commit 8e46c34
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php
@@ -34,6 +34,7 @@
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\HTMLReadonlyField;
 use SilverStripe\Core\Validation\ValidationResult;
+use SilverStripe\Forms\Validation\CompositeValidator;
 
 class BasicFieldsTestPage extends TestPage
 {
@@ -398,9 +399,11 @@ public function getCMSFields()
         return $fields;
     }
 
-    public function getCMSValidator()
+    public function getCMSCompositeValidator(): CompositeValidator
     {
-        return new RequiredFieldsValidator('Required');
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(new RequiredFieldsValidator('Required'));
+        return $validator;
     }
 
     public function validate(): ValidationResult

diff --git a/code/Company.php b/code/Company.php
@@ -13,6 +13,7 @@
 use SilverStripe\Versioned\Versioned;
 use RelationFieldsTestPage;
 use GridFieldTestPage;
+use SilverStripe\Forms\Validation\CompositeValidator;
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 
 /**
@@ -101,11 +102,11 @@ public function getCMSFields()
         return $fields;
     }
 
-    public function getCMSValidator()
+    public function getCMSCompositeValidator(): CompositeValidator
     {
-        return new RequiredFieldsValidator(
-            ['Name']
-        );
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(new RequiredFieldsValidator(['Name']));
+        return $validator;
     }
 
     public function DynamicProperty()

diff --git a/code/Employee.php b/code/Employee.php
@@ -7,6 +7,7 @@
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\Validation\CompositeValidator;
 use SilverStripe\ORM\Connect\MySQLSchemaManager;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
@@ -142,11 +143,11 @@ public function requireDefaultRecords()
         srand();
     }
 
-    public function getCMSValidator()
+    public function getCMSCompositeValidator(): CompositeValidator
     {
-        return new RequiredFieldsValidator(
-            ['Name']
-        );
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(new RequiredFieldsValidator(['Name']));
+        return $validator;
     }
 
     /**

diff --git a/code/multitab-validation/MultiTabPage.php b/code/multitab-validation/MultiTabPage.php
@@ -7,6 +7,7 @@
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Core\Validation\ValidationResult;
+use SilverStripe\Forms\Validation\CompositeValidator;
 
 if (!class_exists(Page::class)) {
     return;
@@ -50,14 +51,16 @@ public function getSettingsFields()
         return $fields;
     }
 
-    public function getCMSValidator()
+    public function getCMSCompositeValidator(): CompositeValidator
     {
-        return new RequiredFieldsValidator([
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(new RequiredFieldsValidator([
             'ThirdTabFirstField',
             'FourthTabFirstField',
             // This is only validated if you are actually on the settings tab when clicking save
             'SettingsTabFirstField'
-        ]);
+        ]));
+        return $validator;
     }
 
     public function validate(): ValidationResult

diff --git a/code/multitab-validation/SingleTabPage.php b/code/multitab-validation/SingleTabPage.php
@@ -5,6 +5,7 @@
 use Page;
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\Tab;
+use SilverStripe\Forms\Validation\CompositeValidator;
 
 if (!class_exists(Page::class)) {
     return;
@@ -17,11 +18,11 @@ class SingleTabPage extends Page
 {
     private static $table_name = 'SingleTabPage';
 
-    public function getCMSValidator()
+    public function getCMSCompositeValidator(): CompositeValidator
     {
-        return new RequiredFieldsValidator([
-            'Content'
-        ]);
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(new RequiredFieldsValidator(['Content']));
+        return $validator;
     }
 
     public function getCMSFields()