[bugfix] ArrDots::search could not handle searches ending in a wildcard

pdscopes · Aug 30, 2017 · 9f423f0 · 9f423f0
1 parent 7cf0f0c
commit 9f423f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ArrDots.php b/src/ArrDots.php
@@ -155,9 +155,9 @@ public static function search($array, $key, $wildcard = null)
             // If this segment is a wildcard
             if ($segment === $wildcard) {
                 $values = [];
-                $subKey = implode('.', $segments);
                 foreach (array_keys($array) as $attr) {
-                    foreach (static::search($array, $attr.'.'.$subKey, $wildcard) as $attrKey => $value) {
+                    $subKey = implode('.', array_merge([$attr], $segments));
+                    foreach (static::search($array, $subKey, $wildcard) as $attrKey => $value) {
                         $values[$pattern . $attrKey] = $value;
                     }
                 }

diff --git a/tests/Unit/ArrDotsTest.php b/tests/Unit/ArrDotsTest.php
@@ -103,7 +103,7 @@ public function testSearch()
             'array3' => [
                 ['sub-array1' => [['item1' => 'item2-value'], ['item1' => 'item3-value']]],
                 ['sub-array1' => [['item1' => 'item4-value']]],
-            ]
+            ],
         ];
 
         $this->assertEquals([
@@ -112,6 +112,12 @@ public function testSearch()
         $this->assertEquals([
             'array0' => [1, 2, 3, 4]
         ], ArrDots::search($data, 'array0'));
+        $this->assertEquals([
+            'array0.0' => 1,
+            'array0.1' => 2,
+            'array0.2' => 3,
+            'array0.3' => 4,
+        ], ArrDots::search($data, 'array0.*', '*'));
         $this->assertEquals([
             'array2.0.sub-array0' => [1, 2, 3, 4],
             'array2.1.sub-array0' => [1, 2, 3, 4],