Optional route arguments will return null instead of empty string

moon-php · Aug 4, 2017 · dab03cc · dab03cc
1 parent a801608
commit dab03cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Matchable/MatchableRequest.php b/src/Matchable/MatchableRequest.php
@@ -110,11 +110,12 @@ private function matchByRegex(string $pattern, string $path): array
         }
 
         foreach ($matches as $k => $match) {
-            if (is_int($k)) {
+            $match = array_shift($match);
+            if (is_int($k) || empty($match)) {
                 unset($matches[$k]);
                 continue;
             }
-            $matches[$k] = array_shift($match);
+            $matches[$k] = $match;
         }
 
         return [$isPatternMatched, $matches];

diff --git a/tests/Unit/Matchable/RequestMatchableTest.php b/tests/Unit/Matchable/RequestMatchableTest.php
@@ -52,11 +52,11 @@ public function matchDataProvider()
             ['/users/{id::\d+}', ['POST', 'GET'], 'DELETE', '/users/string', false, false, []],
             ['/users/{id::\d+}', ['DELETE'], 'DELETE', '/users/1', true, true, ['id' => 1]],
             ['/string[/{id::\d+}]', ['PUT'], 'PUT', '/string/11111111111', true, true, ['id' => '11111111111']],
-            ['/string[/[{id::\d+}]]', ['PUT'], 'PUT', '/string/', true, true, ['id' => '']],
+            ['/string[/[{id::\d+}]]', ['PUT'], 'PUT', '/string/', true, true, []],
             ['/string[/{id::\d+}]', ['PUT'], 'PUT', '/string/q', false, false, []],
             ['::/users/(?<attribute>\d+)', ['PUT'], 'PUT', '/users/1221', true, true, ['attribute' => '1221']],
-            ['/sub/[{a}/[{b}/[{c}]]]', ['GET'], 'GET', '/sub/1/', true, true, ['a' => 1, 'b' => '', 'c' => '']],
-            ['/sub/[{a}/[{b}/[{c}]]]', ['GET'], 'GET', '/sub/1/2/', true, true, ['a' => 1, 'b' => 2, 'c' => '']],
+            ['/sub/[{a}/[{b}/[{c}]]]', ['GET'], 'GET', '/sub/1/', true, true, ['a' => 1]],
+            ['/sub/[{a}/[{b}/[{c}]]]', ['GET'], 'GET', '/sub/1/2/', true, true, ['a' => 1, 'b' => 2]],
             ['/sub/[{a}/[{b}/[{c}]]]', ['GET'], 'GET', '/sub/1/2/3', true, true, ['a' => 1, 'b' => 2, 'c' => 3]],
         ];
     }