allow default values to be overridden

Author: michael-rubel

src/Traits/HelpsLoopFunctions.php

@@ -14,6 +14,7 @@ trait HelpsLoopFunctions
      * @param mixed|null $rescue
      *
      * @return void
+     * @throws \ReflectionException
      */
     private function assignValue(int|string $key, mixed $value, mixed $rescue = null): void
     {
@@ -38,9 +39,36 @@ private function ignoredPropertyNames(): array
      * @param int|string $key
      *
      * @return bool
+     * @throws \ReflectionException
      */
     private function canAssignValue(int|string $key): bool
     {
-        return is_string($key) && property_exists($this, $key);
+        return is_string($key)
+            && property_exists($this, $key)
+            && (empty($this->{$key}) || $this->hasDefaultValue($key));
+    }
+
+    /**
+     * @param int|string $key
+     *
+     * @return bool
+     * @throws \ReflectionException
+     */
+    private function hasDefaultValue(int|string $key): bool
+    {
+        $default = (new \ReflectionProperty($this, $key))
+            ->getDefaultValue();
+
+        return ! empty($default);
+    }
+
+    /**
+     * @param mixed      $value
+     *
+     * @return bool
+     */
+    private function canWalkRecursively(mixed $value): bool
+    {
+        return is_array($value) || $value instanceof \ArrayAccess;
     }
 }

src/Traits/LoopFunctions.php

@@ -13,17 +13,17 @@ trait LoopFunctions
     /**
      * Choose proper strategy to loop over the data.
      *
-     * @param Model|array|null $data
-     * @param mixed|null       $rescue
+     * @param Model|\ArrayAccess|array|null $data
+     * @param mixed|null                    $rescue
      *
      * @return void
      */
-    public function propertiesFrom(Model|array|null $data = null, mixed $rescue = null): void
+    public function propertiesFrom(Model|\ArrayAccess|array|null $data = null, mixed $rescue = null): void
     {
         if ($data) {
             match (true) {
-                is_array($data)        => $this->arrayToProperties($data, $rescue),
                 $data instanceof Model => $this->attributesToProperties($data, $rescue),
+                default                => $this->arrayToProperties($data, $rescue),
             };
         }
     }
@@ -52,15 +52,21 @@ public function attributesToProperties(?Model $model = null, mixed $rescue = nul
     /**
      * Map array data to class properties.
      *
-     * @param array|null $data
-     * @param mixed|null $rescue
+     * @param array|\ArrayAccess|null $data
+     * @param mixed|null              $rescue
      *
      * @return void
      */
-    public function arrayToProperties(?array $data, mixed $rescue = null): void
+    public function arrayToProperties(array|\ArrayAccess|null $data, mixed $rescue = null): void
     {
         collect($data ?? [])
             ->except($this->ignoredPropertyNames())
-            ->each(fn ($value, $key) => $this->assignValue($key, $value, $rescue));
+            ->each(function ($value, $key) use ($rescue) {
+                if ($this->canWalkRecursively($value)) {
+                    $this->propertiesFrom($value, $rescue);
+                }
+
+                $this->assignValue($key, $value, $rescue);
+            });
     }
 }