Merge pull request #32 from nutgram/fix-arraytypes-of-abstract

Fix hydration for array of abstract types

Author: sergix44

.github/workflows/php.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-versions: [ "8.0", "8.1", "8.2" ]
+        php-versions: [  "8.1", "8.2", "8.3" ]
 
     steps:
       - uses: actions/checkout@v2

src/Annotation/Alias.php

@@ -6,9 +6,7 @@
 
 /**
  * @Annotation
- *
  * @Target({"PROPERTY"})
- *
  * @NamedArgumentConstructor
  *
  * @Attributes({

src/Annotation/ArrayType.php

@@ -7,9 +7,7 @@
 
 /**
  * @Annotation
- *
  * @Target({"PROPERTY"})
- *
  * @NamedArgumentConstructor
  *
  * @Attributes({

src/Annotation/ConcreteResolver.php

@@ -6,7 +6,6 @@
 
 /**
  * @Annotation
- *
  * @Target({"CLASS"})
  */
 #[Attribute(Attribute::TARGET_CLASS)]

src/Annotation/Mutate.php

@@ -8,7 +8,6 @@
 
 /**
  * @Annotation
- *
  * @Target({"PROPERTY"})
  */
 #[Attribute(Attribute::TARGET_PROPERTY)]

src/Annotation/SkipConstructor.php

@@ -6,7 +6,6 @@
 
 /**
  * @Annotation
- *
  * @Target({"CLASS"})
  */
 #[Attribute(Attribute::TARGET_CLASS)]

src/Annotation/UnionResolver.php

@@ -8,7 +8,6 @@
 
 /**
  * @Annotation
- *
  * @Target({"PROPERTY"})
  */
 #[Attribute(Attribute::TARGET_PROPERTY)]

src/Hydrator.php

@@ -90,8 +90,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 +240,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 +615,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);

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;
+}

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);