Add validation classes when used custom error (#299)

yiisoft · Dec 26, 2023 · 7beb9da · 7beb9da
1 parent b92c2f3
commit 7beb9da
Show file tree

Hide file tree

Showing 30 changed files with 499 additions and 32 deletions.
diff --git a/src/Field/Base/DateTimeInputField.php b/src/Field/Base/DateTimeInputField.php
@@ -170,11 +170,19 @@ abstract protected function getInputType(): string;
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Base/PartsField.php b/src/Field/Base/PartsField.php
@@ -446,6 +446,11 @@ final protected function generateEndContent(): string
         return $this->makeContent($this->templateEnd, $parts);
     }
 
+    final protected function hasCustomError(): bool
+    {
+        return isset($this->errorConfig['message()']);
+    }
+
     private function generateInputContainerBegin(): string
     {
         return $this->inputContainerTag === null

diff --git a/src/Field/Base/ValidationClass/ValidationClassTrait.php b/src/Field/Base/ValidationClass/ValidationClassTrait.php
@@ -57,21 +57,29 @@ public function inputValidClass(?string $class): self
         return $new;
     }
 
-    protected function addValidationClassToAttributes(array &$attributes, InputDataInterface $inputData): void
-    {
+    protected function addValidationClassToAttributes(
+        array &$attributes,
+        InputDataInterface $inputData,
+        ?bool $hasCustomError = null,
+    ): void {
         $this->addClassesToAttributes(
             $attributes,
             $inputData,
+            $hasCustomError,
             $this->invalidClass,
             $this->validClass,
         );
     }
 
-    protected function addInputValidationClassToAttributes(array &$attributes, InputDataInterface $inputData): void
-    {
+    protected function addInputValidationClassToAttributes(
+        array &$attributes,
+        InputDataInterface $inputData,
+        ?bool $hasCustomError = null,
+    ): void {
         $this->addClassesToAttributes(
             $attributes,
             $inputData,
+            $hasCustomError,
             $this->inputInvalidClass,
             $this->inputValidClass,
         );
@@ -80,14 +88,15 @@ protected function addInputValidationClassToAttributes(array &$attributes, Input
     private function addClassesToAttributes(
         array &$attributes,
         InputDataInterface $inputData,
+        ?bool $hasCustomError,
         ?string $invalidClass,
         ?string $validClass,
     ): void {
-        if (!$inputData->isValidated()) {
+        if (!$inputData->isValidated() && $hasCustomError === null) {
             return;
         }
 
-        $hasErrors = !empty($inputData->getValidationErrors());
+        $hasErrors = $hasCustomError || !empty($inputData->getValidationErrors());
 
         if ($hasErrors && $invalidClass !== null) {
             Html::addCssClass($attributes, $invalidClass);

diff --git a/src/Field/Checkbox.php b/src/Field/Checkbox.php
@@ -275,11 +275,19 @@ private function prepareValue(mixed $value): ?string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/CheckboxList.php b/src/Field/CheckboxList.php
@@ -159,9 +159,17 @@ protected function generateInput(): string
         }
         /** @psalm-var iterable<int, Stringable|scalar> $value */
 
+        $checkboxAttributes = [];
+        $this->addInputValidationClassToAttributes(
+            $checkboxAttributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
+
         return $this->widget
             ->name($name)
             ->values($value)
+            ->addCheckboxAttributes($checkboxAttributes)
             ->render();
     }
 
@@ -189,6 +197,10 @@ protected function renderError(Error $error): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Email.php b/src/Field/Email.php
@@ -224,12 +224,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/File.php b/src/Field/File.php
@@ -179,11 +179,19 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Number.php b/src/Field/Number.php
@@ -185,12 +185,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Password.php b/src/Field/Password.php
@@ -215,12 +215,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/RadioList.php b/src/Field/RadioList.php
@@ -161,9 +161,17 @@ protected function generateInput(): string
         }
         /** @psalm-var Stringable|scalar $value */
 
+        $radioAttributes = [];
+        $this->addInputValidationClassToAttributes(
+            $radioAttributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
+
         return $this->widget
             ->name($name)
             ->value($value)
+            ->addRadioAttributes($radioAttributes)
             ->render();
     }
 
@@ -191,6 +199,10 @@ protected function renderError(Error $error): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Range.php b/src/Field/Range.php
@@ -221,11 +221,19 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Select.php b/src/Field/Select.php
@@ -287,11 +287,19 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Telephone.php b/src/Field/Telephone.php
@@ -210,12 +210,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Text.php b/src/Field/Text.php
@@ -226,12 +226,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Textarea.php b/src/Field/Textarea.php
@@ -241,12 +241,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }
diff --git a/src/Field/Url.php b/src/Field/Url.php
@@ -210,12 +210,20 @@ protected function generateInput(): string
 
     protected function prepareContainerAttributes(array &$attributes): void
     {
-        $this->addValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 
     protected function prepareInputAttributes(array &$attributes): void
     {
         $this->preparePlaceholderInInputAttributes($attributes);
-        $this->addInputValidationClassToAttributes($attributes, $this->getInputData());
+        $this->addInputValidationClassToAttributes(
+            $attributes,
+            $this->getInputData(),
+            $this->hasCustomError() ? true : null,
+        );
     }
 }