Fix hydration for array of abstract types

nutgram · Dec 30, 2023 · bc2a371 · bc2a371
1 parent 7ef4ef2
commit bc2a371
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 5 deletions.
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -22,7 +22,6 @@
 use SergiX44\Hydrator\Annotation\SkipConstructor;
 use SergiX44\Hydrator\Annotation\UnionResolver;
 use SergiX44\Hydrator\Exception\InvalidObjectException;
-
 use function array_key_exists;
 use function class_exists;
 use function ctype_digit;
@@ -38,7 +37,6 @@
 use function is_subclass_of;
 use function sprintf;
 use function strtotime;
-
 use const FILTER_NULL_ON_FAILURE;
 use const FILTER_VALIDATE_BOOLEAN;
 use const FILTER_VALIDATE_FLOAT;
@@ -90,8 +88,6 @@ public function hydrate(string|object $object, array|object $data): object
             if ($property->isStatic()) {
                 continue;
             }
-
-            $property->setAccessible(true);
             $propertyType = $property->getType();
 
             if ($propertyType === null) {
@@ -242,6 +238,10 @@ private function initializeObject(string|object $object, array|object $data): ob
                 ));
             }
 
+            if (is_object($data)) {
+                $data = get_object_vars($data);
+            }
+
             return $this->initializeObject($attribute->concreteFor($data), $data);
         }
 
@@ -613,7 +613,7 @@ private function hydrateObjectsInArray(array $array, ArrayType $arrayType, int $
                 return $arrayType->class::tryFrom($object);
             }
 
-            $newInstance = $this->initializeObject($arrayType->class, []);
+            $newInstance = $this->initializeObject($arrayType->class, $object);
 
             return $this->hydrate($newInstance, $object);
         }, $array);

diff --git a/tests/Fixtures/ObjectWithArrayOfAbstracts.php b/tests/Fixtures/ObjectWithArrayOfAbstracts.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace SergiX44\Hydrator\Tests\Fixtures;
+
+use SergiX44\Hydrator\Annotation\ArrayType;
+use SergiX44\Hydrator\Tests\Fixtures\Store\Apple;
+
+final class ObjectWithArrayOfAbstracts
+{
+    #[ArrayType(Apple::class)]
+    public array $value;
+}
diff --git a/tests/HydratorTest.php b/tests/HydratorTest.php
@@ -15,6 +15,7 @@
 use SergiX44\Hydrator\Tests\Fixtures\DI\Tree;
 use SergiX44\Hydrator\Tests\Fixtures\DI\Wood;
 use SergiX44\Hydrator\Tests\Fixtures\ObjectWithAbstract;
+use SergiX44\Hydrator\Tests\Fixtures\ObjectWithArrayOfAbstracts;
 use SergiX44\Hydrator\Tests\Fixtures\ObjectWithInvalidAbstract;
 use SergiX44\Hydrator\Tests\Fixtures\Resolver\AppleResolver;
 use SergiX44\Hydrator\Tests\Fixtures\Store\Apple;
@@ -751,6 +752,46 @@ public function testHydrateAbstractProperty(): void
         $this->assertSame('brandy', $o->value->category);
     }
 
+    public function testHydrateArrayAbstractProperty(): void
+    {
+        $o = (new Hydrator())->hydrate(new ObjectWithArrayOfAbstracts(), [
+            'value' => [[
+                'type'      => 'jack',
+                'sweetness' => null,
+                'category'  => 'brandy',
+            ]],
+        ]);
+
+        $this->assertInstanceOf(ObjectWithArrayOfAbstracts::class, $o);
+        $this->assertIsArray($o->value);
+
+        $value = $o->value[0];
+
+        $this->assertInstanceOf(AppleJack::class, $value);
+        $this->assertSame('jack', $value->type);
+        $this->assertSame('brandy', $value->category);
+    }
+
+    public function testHydrateArrayAbstractPropertyWithObject(): void
+    {
+        $o = (new Hydrator())->hydrate(new ObjectWithArrayOfAbstracts(), [
+            'value' => [(object)[
+                'type'      => 'jack',
+                'sweetness' => null,
+                'category'  => 'brandy',
+            ]],
+        ]);
+
+        $this->assertInstanceOf(ObjectWithArrayOfAbstracts::class, $o);
+        $this->assertIsArray($o->value);
+
+        $value = $o->value[0];
+
+        $this->assertInstanceOf(AppleJack::class, $value);
+        $this->assertSame('jack', $value->type);
+        $this->assertSame('brandy', $value->category);
+    }
+
     public function testHydrateInvalidAbstractObject(): void
     {
         $this->expectException(InvalidObjectException::class);