fix set_path

Author: brenoroosevelt

src/DotNotation.php

@@ -12,53 +12,82 @@
  */
 function set_path(array &$haystack, string $path, $value, string $separator = '.'): void
 {
-    $key = trim($path, $separator);
-    $keys = explode($separator, $key);
-    if (empty($keys)) {
-        return;
-    }
-
-    $target = &$haystack;
-    foreach ($keys as $innerKey) {
-        if (! is_array($target)) {
-            break;
-        }
+    $path = explode($separator, $path);
+    $temp =& $haystack;
 
-        if (! array_key_exists($innerKey, $target)) {
-            $target[$innerKey] = [];
+    foreach ($path as $key) {
+        if (!is_array($temp)) {
+            $temp = [];
         }
 
-        $target = &$target[$innerKey];
+        $temp =& $temp[$key];
     }
 
-    $target = $value;
+    $temp = $value;
+//
+//    $key = trim($path, $separator);
+//    $keys = explode($separator, $key);
+//    if (empty($keys)) {
+//        return;
+//    }
+//
+//    $target = &$haystack;
+//    foreach ($keys as $innerKey) {
+//        if (! is_array($target)) {
+//            break;
+//        }
+//
+//        if (! array_key_exists($innerKey, $target)) {
+//            $target[$innerKey] = [];
+//        }
+//
+//        $target = &$target[$innerKey];
+//    }
+//
+//    $target = $value;
 }
 
 /**
  * @param array $haystack
  * @param string $path
  * @param $default
  * @param string $separator
- * @return array|mixed|null
+ * @return mixed
  */
 function get_path(array $haystack, string $path, $default = null, string $separator = '.')
 {
-    $key = trim($path, $separator);
-    $keys = explode($separator, $key);
-    if (empty($keys)) {
-        return $default;
-    }
-
-    $target = $haystack;
-    foreach ($keys as $innerKey) {
-        if (! is_array($target) || ! array_key_exists($innerKey, $target)) {
-            return $default;
-        }
-
-        $target = $target[$innerKey];
-    }
-
-    return $target;
+    return
+        array_reduce(
+            explode($separator, $path),
+            fn ($arr, $p) => is_array($arr) && array_key_exists($p, $arr) ? $arr[$p] : $default,
+            $haystack
+        );
+
+//    $path = explode($separator, $path); //if needed
+//    $temp =& $haystack;
+//
+//    foreach($path as $key) {
+//        $temp =& $temp[$key];
+//    }
+//
+//    return $temp;
+//
+//    $key = trim($path, $separator);
+//    $keys = explode($separator, $key);
+//    if (empty($keys)) {
+//        return $default;
+//    }
+//
+//    $target = $haystack;
+//    foreach ($keys as $innerKey) {
+//        if (! is_array($target) || ! array_key_exists($innerKey, $target)) {
+//            return $default;
+//        }
+//
+//        $target = $target[$innerKey];
+//    }
+//
+//    return $target;
 }
 
 /**

tests/DotNotationTest.php

@@ -40,11 +40,11 @@ public function setPathProvider(): array
                 ['a' => [9, 1]]
             ],
             'case_5' => [
-                ['a' => [0, 1, 'b' => ['c' => 9]]],
-                'a.b.c.2',
+                ['a' => [0, 1, 'b' => ['c' => 1]]],
+                'a.b.c.d',
                 9,
                 '.',
-                ['a' => [0, 1, 'b' => ['c' => [2 => 9]]]],
+                ['a' => [0, 1, 'b' => ['c' => ['d' => 9]]]],
             ]
         ];
     }