Fix error in Route - accapt end with /

honzapospi · Oct 8, 2016 · 19596ae · 19596ae
1 parent 131883f
commit 19596ae
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 104 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -22,6 +22,7 @@ class Route extends \Nette\Object implements IRoute {
 	const SPLITTER = '_______';
 
 	public function __construct($pathPattern, $method, $className){
+		$pathPattern = rtrim($pathPattern, '/');
 		$this->pathPattern = $pathPattern;
 		preg_match_all('#\<[a-zA-Z0-9]+\>#', $pathPattern, $matches);
 		$vars = $matches[0];
@@ -40,6 +41,7 @@ public function __construct($pathPattern, $method, $className){
 	 * @return string ClassName is success, false otherwise.
 	 */
 	public function match($path, $method) {
+		$path = rtrim($path, '/');
 		if($this->method == self::ALL || $method == $this->method || $method == self::OPTIONS){
 			if($this->pathPattern == '*'){
 				if($method == self::OPTIONS)

diff --git a/tests/Mock/MockHttpRequest.php b/tests/Mock/MockHttpRequest.php
diff --git a/tests/TestRenderer.php b/tests/TestRenderer.php