Merge remote-tracking branch 'origin/master' into new-widgets

.editorconfig

@@ -18,4 +18,4 @@ ij_php_space_after_type_cast = true
 trim_trailing_whitespace = false
 
 [*.yml]
-indent_size = 2
+indent_size = 2

.styleci.yml

@@ -56,7 +56,6 @@ enabled:
   - phpdoc_order
   - phpdoc_property
   - phpdoc_scalar
-  - phpdoc_separation
   - phpdoc_singular_inheritdoc
   - phpdoc_trim
   - phpdoc_trim_consecutive_blank_line_separation

composer.json

@@ -24,14 +24,16 @@
         "yiisoft/friendly-exception": "^1.0",
         "yiisoft/html": "^3.0",
         "yiisoft/http": "^1.2",
+        "yiisoft/hydrator": "dev-master",
+        "yiisoft/hydrator-validator": "dev-master",
         "yiisoft/strings": "^2.0",
         "yiisoft/validator": "^1.0",
         "yiisoft/widget": "^2.0"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.15.7",
+        "rector/rector": "^0.18.3",
         "roave/infection-static-analysis-plugin": "^1.18",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.6",
@@ -56,7 +58,8 @@
         },
         "config-plugin": {
             "params": "params.php",
-            "bootstrap": "bootstrap.php"
+            "bootstrap": "bootstrap.php",
+            "di": "di.php"
         }
     },
     "config": {

config/di.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Definitions\Reference;
+use Yiisoft\Form\FormHydrator;
+use Yiisoft\Hydrator\Validator\ValidatingHydrator;
+
+return [
+    FormHydrator::class => [
+        '__construct()' => [
+            'hydrator' => Reference::to(ValidatingHydrator::class),
+        ],
+    ],
+];

psalm.xml

@@ -13,4 +13,7 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

src/Field/Base/FormAttributeTrait.php

@@ -92,7 +92,7 @@ final protected function getFirstError(): ?string
     {
         return $this
             ->getFormModel()
-            ->getFormErrors()
-            ->getFirstError($this->getFormAttributeName());
+            ->getValidationResult()
+            ?->getAttributeErrorMessages($this->getFormAttributeName())[0] ?? null;
     }
 }

src/Field/Base/ValidationClass/ValidationClassTrait.php

@@ -92,13 +92,12 @@ private function addClassesToAttributes(
         ?string $invalidClass,
         ?string $validClass,
     ): void {
-        if (!$formModel->isValidated()) {
+        $validationResult = $formModel->getValidationResult();
+        if ($validationResult === null) {
             return;
         }
 
-        $hasErrors = $formModel
-            ->getFormErrors()
-            ->hasErrors($attributeName);
+        $hasErrors = !$validationResult->isAttributeValid($attributeName);
 
         if ($hasErrors && $invalidClass !== null) {
             Html::addCssClass($attributes, $invalidClass);

src/Field/Email.php

@@ -227,7 +227,7 @@ protected function beforeRender(): void
                 }
 
                 if ($rule instanceof Regex) {
-                    if (!($rule->isNot())) {
+                    if (!$rule->isNot()) {
                         $this->inputAttributes['pattern'] = Html::normalizeRegexpPattern(
                             $rule->getPattern()
                         );

src/Field/ErrorSummary.php

@@ -25,6 +25,7 @@ final class ErrorSummary extends BaseField
     private array $footerAttributes = [];
     private string $header = 'Please fix the following errors:';
     private array $headerAttributes = [];
+    private array $listAttributes = [];
 
     public function formModel(FormModelInterface $formModel): self
     {
@@ -65,6 +66,16 @@ public function onlyAttributes(string ...$names): self
         return $new;
     }
 
+    /**
+     * Use only common errors when rendering the error summary.
+     */
+    public function onlyCommonErrors(): self
+    {
+        $new = clone $this;
+        $new->onlyAttributes = [''];
+        return $new;
+    }
+
     /**
      * Set the footer text for the error summary
      */
@@ -80,7 +91,7 @@ public function footer(string $value): self
      *
      * @param array $values Attribute values indexed by attribute names.
      *
-     * See {@see \Yiisoft\Html\Html::renderTagAttributes()} for details on how attributes are being rendered.
+     * See {@see Html::renderTagAttributes} for details on how attributes are being rendered.
      */
     public function footerAttributes(array $values): self
     {
@@ -104,7 +115,7 @@ public function header(string $value): self
      *
      * @param array $values Attribute values indexed by attribute names.
      *
-     * See {@see \Yiisoft\Html\Html::renderTagAttributes()} for details on how attributes are being rendered.
+     * See {@see Html::renderTagAttributes} for details on how attributes are being rendered.
      */
     public function headerAttributes(array $values): self
     {
@@ -113,6 +124,20 @@ public function headerAttributes(array $values): self
         return $new;
     }
 
+    /**
+     * Set errors list container attributes.
+     *
+     * @param array $attributes Attribute values indexed by attribute names.
+     *
+     * See {@see Html::renderTagAttributes} for details on how attributes are being rendered.
+     */
+    public function listAttributes(array $attributes): self
+    {
+        $new = clone $this;
+        $new->listAttributes = $attributes;
+        return $new;
+    }
+
     protected function generateContent(): ?string
     {
         $messages = $this->collectErrors();
@@ -127,6 +152,7 @@ protected function generateContent(): ?string
         }
 
         $content[] = Html::ul()
+            ->attributes($this->listAttributes)
             ->strings($messages, [], $this->encode)
             ->render();
 

src/Field/Password.php

@@ -218,7 +218,7 @@ protected function beforeRender(): void
                 }
 
                 if ($rule instanceof Regex) {
-                    if (!($rule->isNot())) {
+                    if (!$rule->isNot()) {
                         $this->inputAttributes['pattern'] = Html::normalizeRegexpPattern(
                             $rule->getPattern()
                         );

src/Field/Telephone.php

@@ -213,7 +213,7 @@ protected function beforeRender(): void
                 }
 
                 if ($rule instanceof Regex) {
-                    if (!($rule->isNot())) {
+                    if (!$rule->isNot()) {
                         $this->inputAttributes['pattern'] = Html::normalizeRegexpPattern(
                             $rule->getPattern()
                         );

src/Field/Text.php

@@ -229,7 +229,7 @@ protected function beforeRender(): void
                 }
 
                 if ($rule instanceof Regex) {
-                    if (!($rule->isNot())) {
+                    if (!$rule->isNot()) {
                         $this->inputAttributes['pattern'] = Html::normalizeRegexpPattern(
                             $rule->getPattern()
                         );

src/Field/Url.php

@@ -217,7 +217,7 @@ protected function beforeRender(): void
                 if ($rule instanceof UrlRule) {
                     $pattern = $rule->getPattern();
                 } elseif ($rule instanceof Regex) {
-                    if (!($rule->isNot())) {
+                    if (!$rule->isNot()) {
                         $pattern = $rule->getPattern();
                     }
                 }