Required aria attribute

src/FormModel.php

@@ -7,6 +7,7 @@
 use Closure;
 use InvalidArgumentException;
 use ReflectionClass;
+use Yiisoft\Form\HtmlOptions\HtmlOptionsProvider;
 use Yiisoft\Strings\Inflector;
 use Yiisoft\Strings\StringHelper;
 use Yiisoft\Validator\Rule\Required;
@@ -45,6 +46,9 @@ public function isAttributeRequired(string $attribute): bool
             if ($validator instanceof Required) {
                 return true;
             }
+            if ($validator instanceof HtmlOptionsProvider && (bool)($validator->getHtmlOptions()['required'] ?? false)) {
+                return true;
+            }
         }
 
         return false;
@@ -235,39 +239,7 @@ public function addError(string $attribute, string $error): void
         $this->attributesErrors[$attribute][] = $error;
     }
 
-    /**
-     * Returns the validation rules for attributes.
-     *
-     * Validation rules are used by {@see \Yiisoft\Validator\Validator} to check if attribute values are valid.
-     * Child classes may override this method to declare different validation rules.
-     *
-     * Each rule is an array with the following structure:
-     *
-     * ```php
-     * public function rules(): array
-     * {
-     *     return [
-     *         'login' => $this->loginRules()
-     *     ];
-     * }
-     *
-     * private function loginRules(): array
-     * {
-     *   return [
-     *       new \Yiisoft\Validator\Rule\Required(),
-     *       (new \Yiisoft\Validator\Rule\HasLength())
-     *       ->min(4)
-     *       ->max(40)
-     *       ->tooShortMessage('Is too short.')
-     *       ->tooLongMessage('Is too long.'),
-     *       new \Yiisoft\Validator\Rule\Email()
-     *   ];
-     * }
-     * ```
-     *
-     * @return array validation rules
-     */
-    protected function rules(): array
+    public function rules(): array
     {
         return [];
     }

src/FormModelInterface.php

@@ -209,6 +209,40 @@ public function formName(): string;
      */
     public function load(array $data, ?string $formName = null): bool;
 
+    /**
+     * Returns the validation rules for attributes.
+     *
+     * Validation rules are used by {@see \Yiisoft\Validator\Validator} to check if attribute values are valid.
+     * Child classes may override this method to declare different validation rules.
+     *
+     * Each rule is an array with the following structure:
+     *
+     * ```php
+     * public function rules(): array
+     * {
+     *     return [
+     *         'login' => $this->loginRules()
+     *     ];
+     * }
+     *
+     * private function loginRules(): array
+     * {
+     *   return [
+     *       new \Yiisoft\Validator\Rule\Required(),
+     *       (new \Yiisoft\Validator\Rule\HasLength())
+     *       ->min(4)
+     *       ->max(40)
+     *       ->tooShortMessage('Is too short.')
+     *       ->tooLongMessage('Is too long.'),
+     *       new \Yiisoft\Validator\Rule\Email()
+     *   ];
+     * }
+     * ```
+     *
+     * @return array Validation rules.
+     */
+    public function rules(): array;
+
     /**
      * Performs the data validation.
      *

src/HtmlOptions/EmailHtmlOptions.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Validator\Rule\Email;
+use Yiisoft\Validator\RuleInterface;
+
+final class EmailHtmlOptions implements HtmlOptionsProvider, RuleInterface
+{
+    use RuleAwareTrait;
+
+    public function __construct(Email $rule)
+    {
+        $this->rule = $rule;
+    }
+
+    public function getHtmlOptions(): array
+    {
+        return [
+            'type' => 'email',
+        ];
+    }
+}

src/HtmlOptions/HasLengthHtmlOptions.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Validator\Rule\HasLength;
+use Yiisoft\Validator\RuleInterface;
+
+final class HasLengthHtmlOptions implements HtmlOptionsProvider, RuleInterface
+{
+    use RuleAwareTrait;
+
+    public function __construct(HasLength $rule)
+    {
+        $this->rule = $rule;
+    }
+
+    public function getHtmlOptions(): array
+    {
+        $options = $this->rule->getOptions();
+        return [
+            'minlength' => $options['min'],
+            'maxlength' => $options['max'],
+        ];
+    }
+}

src/HtmlOptions/HtmlOptionsProvider.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+/**
+ * Provides options for HTML input tags.
+ */
+interface HtmlOptionsProvider
+{
+    /**
+     * @return array Options for HTML input tags in `['optionName' => 'optionValue']` format.
+     */
+    public function getHtmlOptions(): array;
+}

src/HtmlOptions/MatchRegularExpressionHtmlOptions.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Html\Html;
+use Yiisoft\Validator\Rule\MatchRegularExpression;
+use Yiisoft\Validator\RuleInterface;
+
+final class MatchRegularExpressionHtmlOptions implements HtmlOptionsProvider, RuleInterface
+{
+    use RuleAwareTrait;
+
+    public function __construct(MatchRegularExpression $rule)
+    {
+        $this->rule = $rule;
+    }
+
+    public function getHtmlOptions(): array
+    {
+        $options = $this->rule->getOptions();
+        return [
+            'pattern' => Html::normalizeRegexpPattern($options['pattern']),
+        ];
+    }
+}

src/HtmlOptions/NumberHtmlOptions.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Validator\Rule\Number;
+use Yiisoft\Validator\RuleInterface;
+
+final class NumberHtmlOptions implements HtmlOptionsProvider, RuleInterface
+{
+    use RuleAwareTrait;
+
+    public function __construct(Number $rule)
+    {
+        $this->rule = $rule;
+    }
+
+    public function getHtmlOptions(): array
+    {
+        $options = $this->rule->getOptions();
+        return [
+            'type' => 'number',
+            'min' => $options['min'],
+            'max' => $options['max'],
+        ];
+    }
+}

src/HtmlOptions/RequiredHtmlOptions.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\RuleInterface;
+
+final class RequiredHtmlOptions implements HtmlOptionsProvider, RuleInterface
+{
+    use RuleAwareTrait;
+
+    private bool $ariaAttribute = false;
+
+    public function __construct(Required $rule)
+    {
+        $this->rule = $rule;
+    }
+
+    public function withAriaAttribute(bool $value): self
+    {
+        $new = clone $this;
+        $new->ariaAttribute = $value;
+        return $new;
+    }
+
+    public function getHtmlOptions(): array
+    {
+        return [
+            'required' => true,
+            'aria-required' => $this->ariaAttribute ? 'true' : false,
+        ];
+    }
+}

src/HtmlOptions/RuleAwareTrait.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form\HtmlOptions;
+
+use Yiisoft\Validator\DataSetInterface;
+use Yiisoft\Validator\ParametrizedRuleInterface;
+use Yiisoft\Validator\Result;
+
+trait RuleAwareTrait
+{
+    protected ParametrizedRuleInterface $rule;
+
+    public function validate($value, DataSetInterface $dataSet = null, bool $previousRulesErrored = false): Result
+    {
+        return $this->rule->validate($value, $dataSet, $previousRulesErrored);
+    }
+}

src/Widget/Field.php

@@ -11,7 +11,6 @@
 use Yiisoft\Form\Helper\HtmlForm;
 use Yiisoft\Html\Html;
 use Yiisoft\Widget\Widget;
-
 use function array_merge;
 use function strtr;
 
@@ -284,7 +283,7 @@ public function input(string $type, array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = Input::widget()
             ->type($type)
@@ -323,7 +322,7 @@ public function textInput(array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = TextInput::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -359,7 +358,7 @@ public function hiddenInput(array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{label}'] = '';
         $this->parts['{hint}'] = '';
@@ -398,7 +397,7 @@ public function passwordInput(array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = PasswordInput::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -436,7 +435,7 @@ public function fileInput(array $options = [], bool $withoutHiddenInput = false)
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = FileInput::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -472,7 +471,7 @@ public function textArea(array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = TextArea::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -622,7 +621,7 @@ public function dropDownList(array $items, array $options = []): self
 
         unset($options['class']);
 
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = DropDownList::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -663,7 +662,7 @@ public function listBox(array $items, array $options = []): self
 
         $new->setForInLabel($options);
         $new->setAriaAttributes($options);
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
 
         $this->parts['{input}'] = ListBox::widget()
             ->config($new->data, $new->attribute, $new->inputOptions)
@@ -697,7 +696,7 @@ public function checkboxList(array $items, array $options = []): self
 
         $new->setForInLabel($options);
         $new->setAriaAttributes($options);
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
         $new->skipForInLabel = true;
 
         $this->parts['{input}'] = CheckBoxList::widget()
@@ -735,7 +734,7 @@ public function radioList(array $items, array $options = []): self
         $new->addErrorCssClassToInput();
         $new->addSuccessCssClassToInput();
         $new->setInputRole($options);
-        $new->inputOptions = array_merge($options, $new->inputOptions);
+        $new->inputOptions = array_merge($new->inputOptions, $options);
         $new->skipForInLabel = true;
 
         $this->parts['{input}'] = RadioList::widget()
@@ -971,10 +970,6 @@ private function setForInLabel(array $options = []): void
     private function setAriaAttributes(array $options = []): void
     {
         if ($this->ariaAttribute) {
-            if (!isset($options['aria-required']) && $this->data->isAttributeRequired($this->attribute)) {
-                $this->inputOptions['aria-required'] = 'true';
-            }
-
             if (!isset($options['aria-invalid']) && $this->data->hasErrors($this->attribute)) {
                 $this->inputOptions['aria-invalid'] = 'true';
             }