handle arrays as is

Author: michael-rubel

src/Traits/LoopFunctions.php

@@ -45,11 +45,20 @@ public function arrayToProperties(?array $data, mixed $rescue = null): void
     {
         collect($data ?? [])
             ->except($this->ignoreKeys())
-            ->each(
-                fn ($value, $key) => is_array($value)
-                    ? $this->arrayToProperties($value, $rescue)
-                    : $this->assignValue($key, $value, $rescue)
-            );
+            ->each(function ($value, $key) use ($rescue) {
+                $propertyType = rescue(
+                    callback: fn () => (
+                        new \ReflectionProperty($this, $key)
+                    )->getType()->getName(),
+                    report: false
+                );
+
+                if (is_array($value) && $propertyType !== 'array') {
+                    $this->arrayToProperties($value, $rescue);
+                }
+
+                $this->assignValue($key, $value, $rescue);
+            });
     }
 
     /**
@@ -65,7 +74,7 @@ private function assignValue(string $key, mixed $value, mixed $rescue = null): v
     {
         if (property_exists($this, $key)) {
             rescue(
-                fn () => isset($this->{$key}) ?: $this->{$key} = $value,
+                fn () => ! empty($this->{$key}) ?: $this->{$key} = $value,
                 $rescue,
                 config('loop-functions.log') ?? false
             );

tests/ArrayMappingTest.php

@@ -12,6 +12,7 @@ class ArrayMappingTest extends TestCase
     public string $name;
     public ?string $password = null;
     public string $next;
+    public array $array = [];
 
     /** @test */
     public function testCanMapAnArrayToProperties()
@@ -63,4 +64,21 @@ public function testAlreadyInitializedPropertiesArentOverridesByNestedArrays()
 
         $this->assertStringContainsString('Michael', $this->name);
     }
+
+    /** @test */
+    public function testArrayIsAssignedAsIs()
+    {
+        $array = [
+            'name' => 'Michael Rubel',
+            'array' => [
+                'test' => true,
+            ],
+        ];
+
+        $this->arrayToProperties($array);
+
+        $this->assertStringContainsString('Michael', $this->name);
+        $this->assertArrayHasKey('test', $this->array);
+        $this->assertTrue($this->array['test']);
+    }
 }