Fix Issue #81

src/FormHydrator.php

@@ -52,15 +52,11 @@
      */
     public function populate(
         FormModelInterface $model,
-        mixed $data,
+        array $data,
         ?array $map = null,
         ?bool $strict = null,
         ?string $scope = null
     ): bool {
-        if (!is_array($data)) {
-            return false;
-        }
-
         $scope ??= $model->getFormName();
         if ($scope === '') {
             $hydrateData = $data;
@@ -68,13 +64,13 @@
             if (!isset($data[$scope]) || !is_array($data[$scope])) {
                 return false;
             }
             $hydrateData = $data[$scope];
         }
 
         $this->hydrator->hydrate(
             $model,
             new ArrayData(
                 $hydrateData,
                 $this->createMap($model, $map, $strict),
                 $strict ?? true
             )
@@ -152,7 +148,13 @@
             return false;
         }
 
-        return $this->populate($model, $request->getParsedBody(), $map, $strict, $scope);
+        return $this->populate(
+            $model,
+            array_merge($request->getParsedBody(), $request->getUploadedFiles()),
+            $map,
+            $strict,
+            $scope
+        );
     }
 
     /**
@@ -179,11 +181,11 @@
         ?bool $strict = null,
         ?string $scope = null
     ): bool {
-        if ($request->getMethod() !== 'POST') {
+        if (!$this->populateFromPost($model, $request, $map, $strict, $scope)) {
             return false;
         }
 
-        return $this->populateAndValidate($model, $request->getParsedBody(), $map, $strict, $scope);
+        return $this->validate($model)->isValid();
     }
 
     /**

tests/FormHydratorTest.php

@@ -5,11 +5,15 @@
 namespace Yiisoft\FormModel\Tests;
 
 use HttpSoft\Message\ServerRequestFactory;
+use HttpSoft\Message\StreamFactory;
+use HttpSoft\Message\UploadedFile;
+use HttpSoft\Message\UploadedFileFactory;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Yiisoft\FormModel\FormModel;
 use Yiisoft\FormModel\Tests\Support\Form\CarForm;
+use Yiisoft\FormModel\Tests\Support\Form\UploadedFileForm;
 use Yiisoft\FormModel\Tests\Support\TestHelper;
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Integer;
@@ -180,4 +184,25 @@ public function getRules(): iterable
         $this->assertSame('developer', $form->job);
         $this->assertSame('', $form->tip);
     }
+
+    public function testUploadedFile(): void
+    {
+        $stream = (new StreamFactory())
+            ->createStreamFromFile('./Support/Dto/Coordinates.php')
+        ;
+        $uploadedFile = (new UploadedFileFactory())
+            ->createUploadedFile($stream)
+        ;
+        $request = (new ServerRequestFactory())
+            ->createServerRequest('POST', '/')
+            ->withUploadedFiles([$uploadedFile])
+        ;
+
+        $form = new UploadedFileForm();
+
+        $result = TestHelper::createFormHydrator()->populateFromPostAndValidate($form, $request);
+
+        $this->assertTrue($result);
+        $this->assertInstanceOf(UploadedFile::class, $form->file);
+    }
 }

tests/Support/Form/UploadedFileForm.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\FormModel\Tests\Support\Form;
+
+use Yiisoft\FormModel\FormModel;
+use Yiisoft\Input\Http\Attribute\Parameter\UploadedFiles;
+use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\RulesProviderInterface;
+
+final class UploadedFileForm extends FormModel implements RulesProviderInterface
+{
+    #[UploadedFiles('UploadedFileForm.file')]
+    private ?UploadedFile $file = null;
+
+    public function getRules(): array
+    {
+        return [
+            'file' => [new Required()],
+        ];
+    }
+}