Make addDefaultValidators() protected and pass validator chain

The chain is now passed to save calls to `getValidators()` and is now protected as it is not intended to be called outside of the class.
Icinga · Nov 9, 2022 · c3293ce · c3293ce
1 parent 312e36f
commit c3293ce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/FormElement/BaseFormElement.php b/src/FormElement/BaseFormElement.php
@@ -180,20 +180,14 @@ public function hasBeenValidatedAndIsNotValid()
     public function getValidators()
     {
         if ($this->validators === null) {
-            $this->validators = new ValidatorChain();
-            $this->addDefaultValidators();
+            $chain = new ValidatorChain();
+            $this->addDefaultValidators($chain);
+            $this->validators = $chain;
         }
 
         return $this->validators;
     }
 
-    /**
-     * Add default validators
-     */
-    public function addDefaultValidators()
-    {
-    }
-
     /**
      * Set the validators
      *
@@ -317,6 +311,13 @@ public function getValueAttribute()
         return $this->getValue();
     }
 
+    /**
+     * Add default validators
+     */
+    protected function addDefaultValidators(ValidatorChain $chain): void
+    {
+    }
+
     protected function registerValueCallback(Attributes $attributes)
     {
         $attributes->registerAttributeCallback(

diff --git a/src/FormElement/ColorElement.php b/src/FormElement/ColorElement.php
@@ -3,13 +3,14 @@
 namespace ipl\Html\FormElement;
 
 use ipl\Validator\HexColorValidator;
+use ipl\Validator\ValidatorChain;
 
 class ColorElement extends InputElement
 {
     protected $type = 'color';
 
-    public function addDefaultValidators(): void
+    protected function addDefaultValidators(ValidatorChain $chain): void
     {
-        $this->getValidators()->add(new HexColorValidator());
+        $chain->add(new HexColorValidator());
     }
 }
diff --git a/src/FormElement/LocalDateTimeElement.php b/src/FormElement/LocalDateTimeElement.php
@@ -4,6 +4,7 @@
 
 use DateTime;
 use ipl\Validator\DateTimeValidator;
+use ipl\Validator\ValidatorChain;
 
 class LocalDateTimeElement extends InputElement
 {
@@ -45,8 +46,8 @@ public function getValueAttribute()
         return $this->value->format(static::FORMAT);
     }
 
-    public function addDefaultValidators()
+    protected function addDefaultValidators(ValidatorChain $chain): void
     {
-        $this->getValidators()->add(new DateTimeValidator());
+        $chain->add(new DateTimeValidator());
     }
 }