Remove trailing slash on uri...

na2axl · na2axl · commit 546164fd82fc · 2018-06-11T03:05:37.000+01:00
diff --git a/src/WaterPipe/HTTP/Request/RequestUri.php b/src/WaterPipe/HTTP/Request/RequestUri.php
@@ -79,7 +79,7 @@ public function setPattern(string $pattern): RequestUri
      */
     public function setUri(string $uri): RequestUri
     {
-        $this->_uri = $uri;
+        $this->_uri = "/" . trim($uri, "/");
         return $this;
     }
 
@@ -148,7 +148,7 @@ public function isBuilt(): bool
     public static function isMatch(string $pattern, string $uri): bool
     {
         $pattern = self::pattern2regex($pattern);
-        return preg_match("#^{$pattern}\$#", $uri) != false;
+        return preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) != false;
     }
 
     private static function _getUriParams(string $pattern): array

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function setPattern(string $pattern): RequestUri`
`79`	`79`	`*/`
`80`	`80`	`public function setUri(string $uri): RequestUri`
`81`	`81`	`{`
`82`		`- $this->_uri = $uri;`
	`82`	`+ $this->_uri = "/" . trim($uri, "/");`
`83`	`83`	`return $this;`
`84`	`84`	`}`
`85`	`85`
`@@ -148,7 +148,7 @@ public function isBuilt(): bool`
`148`	`148`	`public static function isMatch(string $pattern, string $uri): bool`
`149`	`149`	`{`
`150`	`150`	`$pattern = self::pattern2regex($pattern);`
`151`		`- return preg_match("#^{$pattern}\$#", $uri) != false;`
	`151`	`+ return preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) != false;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`private static function _getUriParams(string $pattern): array`