Merge pull request #102 from antoine-pous/master

Antoine Pous · web-flow · commit 10f65909fd20 · 2017-03-09T22:24:03.000+01:00
Hotfix, test required
diff --git a/src/Router.php b/src/Router.php
@@ -114,7 +114,7 @@ public function match($requestUrl, $requestMethod = RequestMethodInterface::METH
             }
 
             $route = rtrim($routes->getRegex(), '/');
-            $pattern = '@^' . preg_quote($this->basePath) . preg_quote($route). '/?$@i';
+            $pattern = '@^' . preg_quote($this->basePath) . $route . '/?$@i';
             if (!preg_match($pattern, $requestUrl, $matches)) {
                 continue;
             }
@@ -127,7 +127,7 @@ public function match($requestUrl, $requestMethod = RequestMethodInterface::METH
 
                 // check arguments number
 
-                if(count($argument_keys) !== count($matches)) {
+                if(count($argument_keys) !== (count($matches) -1)) {
                     continue;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function match($requestUrl, $requestMethod = RequestMethodInterface::METH`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`$route = rtrim($routes->getRegex(), '/');`
`117`		`- $pattern = '@^' . preg_quote($this->basePath) . preg_quote($route). '/?$@i';`
	`117`	`+ $pattern = '@^' . preg_quote($this->basePath) . $route . '/?$@i';`
`118`	`118`	`if (!preg_match($pattern, $requestUrl, $matches)) {`
`119`	`119`	`continue;`
`120`	`120`	`}`
`@@ -127,7 +127,7 @@ public function match($requestUrl, $requestMethod = RequestMethodInterface::METH`
`127`	`127`
`128`	`128`	`// check arguments number`
`129`	`129`
`130`		`- if(count($argument_keys) !== count($matches)) {`
	`130`	`+ if(count($argument_keys) !== (count($matches) -1)) {`
`131`	`131`	`continue;`
`132`	`132`	`}`
`133`	`133`