Reflecty 0.5.2

Author: nabeghe

README.md

@@ -14,7 +14,7 @@ Includes the following helpers:
 - [Levex](https://github.com/nabeghe/levex-php) <small>v1.0.1</small>
 - [Matcher](https://github.com/nabeghe/matcher-php)<small> v1.0.0</small>
 - [Mem](https://github.com/nabeghe/mem-php) <small>v1.2.0</small>
-- [Reflecty](https://github.com/nabeghe/reflecty-php) <small>v0.5.1</small>
+- [Reflecty](https://github.com/nabeghe/reflecty-php) <small>v0.5.2</small>
 - [Servery](https://github.com/nabeghe/servery-php) <small>v0.2.2</small>
 - [Shortnum](https://github.com/nabeghe/shortnum-php) <small>v1.0.0</small>
 - [SimpleCipher](https://github.com/nabeghe/simple-cipher-php) <small>v1.0.0</small>

src/Reflecty/Meta.php

@@ -127,7 +127,7 @@ public function set(string $path, $value)
     public function merge(array $_, bool $deep = false, bool $overwrite = true)
     {
         if ($deep) {
-            $this->_ = static::deepMege($this->_, $_, $overwrite);
+            $this->_ = static::deepMerge($this->_, $_, $overwrite);
         } else {
             if ($overwrite) {
                 $this->_ = array_merge($this->_, $_);
@@ -149,18 +149,22 @@ public function merge(array $_, bool $deep = false, bool $overwrite = true)
      * @param bool $overwrite Optional. Whether to overwrite existing keys in $a with values from $b. Default true.
      * @return array The merged array.
      */
-    protected static function deepMege(array &$a, array &$b, bool $overwrite = true): array
+    protected static function deepMerge(array $a, array $b, bool $overwrite = true): array
     {
-        $merged = $a;
+        foreach ($b as $key => $value) {
+            if (is_array($value) && isset($a[$key]) && is_array($a[$key])) {
+                if (array_keys($a[$key]) !== range(0, count($a[$key]) - 1) ||
+                    array_keys($value) !== range(0, count($value) - 1)) {
+                    $a[$key] = static::deepMerge($a[$key], $value, $overwrite);
+                    continue;
+                }
+            }
 
-        foreach ($b as $key => &$value) {
-            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
-                $merged[$key] = static::deepMege($merged[$key], $value);
-            } elseif ($overwrite || !isset($merged[$key])) {
-                $merged[$key] = $value;
+            if ($overwrite || !isset($a[$key])) {
+                $a[$key] = $value;
             }
         }
 
-        return $merged;
+        return $a;
     }
 }