filter empty and replace with defaults

lucidphp · Apr 5, 2016 · cc01859 · cc01859
1 parent b20b69a
commit cc01859
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/Matcher/MatcherTrait.php b/src/Matcher/MatcherTrait.php
@@ -93,13 +93,13 @@ private function getMatchedVars(RouteInterface $route, array $matches)
         $vars = $route->getContext()->getVars();
         $params = array_merge(
             $route->getDefaults(),
-            array_map(
+            array_filter(array_map(
                 [$this, 'getValue'],
                 array_intersect_key(
                     $matches,
                     $t = array_combine($vars, array_pad([], count($vars), null))
                 )
-            )
+            ))
         );
 
         return array_intersect_key($params, $t);

diff --git a/tests/Matcher/RequestMatcherTest.php b/tests/Matcher/RequestMatcherTest.php
@@ -92,6 +92,29 @@ public function itShouldReturnCorrectMissmatchReason()
         $this->assertTrue($result->isSchemeMissmatch(), 'Reason should be scheme missmatch.');
     }
 
+    /** @test */
+    public function itShouldMapDefaultValues()
+    {
+        $matcher = new Matcher;
+        $routes = new Routes;
+
+        $routes->add(
+            'user',
+            new Route('/user/{id?}', 'getUserAction', ['GET'], null, ['id' => 12])
+        );
+
+        $request = $this->mockRequest();
+        $request->method('getMethod')->willReturn('GET');
+        $request->method('getPath')->willReturn('/user');
+        $request->method('getScheme')->willReturn('http');
+
+        $result = $matcher->matchRequest($request, $routes);
+
+        $vars = $result->getVars();
+        $this->assertArrayHasKey('id', $vars);
+        $this->assertSame(12, $vars['id']);
+    }
+
     private function mockRoute()
     {
         return $this->getMockbuilder('Lucid\Mux\Route')