refactoring

Author: michael-rubel

src/Traits/HelpsLoopFunctions.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MichaelRubel\LoopFunctions\Traits;
+
+trait HelpsLoopFunctions
+{
+    /**
+     * Assign the value to the property or rescue.
+     *
+     * @param int|string $key
+     * @param mixed      $value
+     * @param mixed|null $rescue
+     *
+     * @return void
+     */
+    private function assignValue(int|string $key, mixed $value, mixed $rescue = null): void
+    {
+        if ($this->canAssignValue($key)) {
+            rescue(
+                fn () => ! empty($this->{$key}) ?: $this->{$key} = $value,
+                $rescue,
+                config('loop-functions.log') ?? false
+            );
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function ignoreKeys(): array
+    {
+        $defaults = ['id', 'password'];
+
+        $ignores = config('loop-functions.ignore_keys', $defaults);
+
+        return is_array($ignores)
+            ? $ignores
+            : $defaults;
+    }
+
+    /**
+     * Check if the function can walk recursively over an array.
+     *
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    private function canWalkRecursively(mixed $value): bool
+    {
+        return is_array($value);
+    }
+
+    /**
+     * @param int|string $key
+     *
+     * @return bool
+     */
+    private function canAssignValue(int|string $key): bool
+    {
+        return is_string($key) && property_exists($this, $key);
+    }
+}

src/Traits/LoopFunctions.php

@@ -8,6 +8,8 @@
 
 trait LoopFunctions
 {
+    use HelpsLoopFunctions;
+
     /**
      * Maps your model attributes to local class properties.
      *
@@ -46,52 +48,11 @@ public function arrayToProperties(?array $data, mixed $rescue = null): void
         collect($data ?? [])
             ->except($this->ignoreKeys())
             ->each(function ($value, $key) use ($rescue) {
-                $propertyType = rescue(
-                    callback: fn () => (
-                        new \ReflectionProperty($this, $key)
-                    )->getType()->getName(),
-                    report: false
-                );
-
-                if (is_array($value) && $propertyType !== 'array') {
+                if ($this->canWalkRecursively($value)) {
                     $this->arrayToProperties($value, $rescue);
                 }
 
                 $this->assignValue($key, $value, $rescue);
             });
     }
-
-    /**
-     * Assign the value to the property or rescue.
-     *
-     * @param int|string $key
-     * @param mixed      $value
-     * @param mixed|null $rescue
-     *
-     * @return void
-     */
-    private function assignValue(int|string $key, mixed $value, mixed $rescue = null): void
-    {
-        if (is_string($key) && property_exists($this, $key)) {
-            rescue(
-                fn () => ! empty($this->{$key}) ?: $this->{$key} = $value,
-                $rescue,
-                config('loop-functions.log') ?? false
-            );
-        }
-    }
-
-    /**
-     * @return array
-     */
-    private function ignoreKeys(): array
-    {
-        $defaults = ['id', 'password'];
-
-        $ignores = config('loop-functions.ignore_keys', $defaults);
-
-        return is_array($ignores)
-            ? $ignores
-            : $defaults;
-    }
 }

tests/ArrayMappingTest.php

@@ -2,6 +2,8 @@
 
 namespace MichaelRubel\LoopFunctions\Tests;
 
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Collection;
 use MichaelRubel\LoopFunctions\Traits\LoopFunctions;
 
 class ArrayMappingTest extends TestCase
@@ -13,6 +15,8 @@ class ArrayMappingTest extends TestCase
     public ?string $password = null;
     public string $next;
     public array $array = [];
+    public ?Collection $supportCollection = null;
+    public ?EloquentCollection $eloquentCollection = null;
 
     /** @test */
     public function testCanMapAnArrayToProperties()
@@ -81,4 +85,20 @@ public function testArrayIsAssignedAsIs()
         $this->assertArrayHasKey('test', $this->array);
         $this->assertTrue($this->array['test']);
     }
+
+    /** @test */
+    public function testCollectionAssignmentIsOk()
+    {
+        $array = [
+            'supportCollection' => collect([
+                'test' => true,
+            ]),
+            'eloquentCollection' => new EloquentCollection(),
+        ];
+
+        $this->arrayToProperties($array);
+
+        $this->assertArrayHasKey('test', $this->supportCollection->toArray());
+        $this->assertTrue($this->supportCollection->toArray()['test']);
+    }
 }