Use hydrator (#254)

composer.json

@@ -24,6 +24,8 @@
         "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"
@@ -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/FormHydrator.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Form;
+
+use Yiisoft\Hydrator\ArrayData;
+use Yiisoft\Hydrator\HydratorInterface;
+
+use function is_array;
+
+/**
+ * @psalm-import-type MapType from ArrayData
+ */
+final class FormHydrator
+{
+    public function __construct(
+        private HydratorInterface $hydrator,
+    ) {
+    }
+
+    /**
+     * @psalm-param MapType $map
+     */
+    public function populate(
+        FormModel $model,
+        mixed $data,
+        array $map = [],
+        bool $strict = false,
+        ?string $scope = null
+    ): bool {
+        if (!is_array($data)) {
+            return false;
+        }
+
+        $scope ??= $model->getFormName();
+        if ($scope === '') {
+            $hydrateData = $data;
+        } else {
+            if (!isset($data[$scope]) || !is_array($data[$scope])) {
+                return false;
+            }
+            $hydrateData = $data[$scope];
+        }
+
+        $this->hydrator->hydrate($model, new ArrayData($hydrateData, $map, $strict));
+
+        return true;
+    }
+}