Let the request uri detection be more permissive

na2axl · na2axl · commit e67f3fc06121 · 2019-07-30T11:43:57.000+02:00
diff --git a/src/WaterPipe/HTTP/Request/RequestUri.php b/src/WaterPipe/HTTP/Request/RequestUri.php
@@ -193,7 +193,12 @@ public function isBuilt(): bool
     public static function isMatch(string $pattern, string $uri): bool
     {
         $pattern = self::pattern2regex($pattern);
-        return preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) != false;
+        return (
+            preg_match("#^{$pattern}\$#", "/" . trim($uri, "/") . "/") ||
+            preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) ||
+            preg_match("#^{$pattern}\$#", trim($uri, "/")) ||
+            preg_match("#^{$pattern}\$#", $uri)
+        ) != false;
     }
 
     private static function _getUriParams(string $pattern): array

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,12 @@ public function isBuilt(): bool`
`193`	`193`	`public static function isMatch(string $pattern, string $uri): bool`
`194`	`194`	`{`
`195`	`195`	`$pattern = self::pattern2regex($pattern);`
`196`		`- return preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) != false;`
	`196`	`+ return (`
	`197`	`+ preg_match("#^{$pattern}\$#", "/" . trim($uri, "/") . "/") \|\|`
	`198`	`+ preg_match("#^{$pattern}\$#", "/" . trim($uri, "/")) \|\|`
	`199`	`+ preg_match("#^{$pattern}\$#", trim($uri, "/")) \|\|`
	`200`	`+ preg_match("#^{$pattern}\$#", $uri)`
	`201`	`+ ) != false;`
`197`	`202`	`}`
`198`	`203`
`199`	`204`	`private static function _getUriParams(string $pattern): array`