Fix route regex detection

Signed-off-by: Igor Ilic <[email protected]>
gigili · Mar 31, 2021 · 0dd303a · 0dd303a
1 parent 5764c59
commit 0dd303a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Routes.php b/Routes.php
@@ -47,7 +47,7 @@ public function add(string $url = "", callable|string|null $callback = NULL, arr
 				}
 
 				$nUrl = NULL;
-				if (strpos($url, ":") !== false) {
+				if (str_contains($url, ":")) {
 					$nUrl = preg_replace("/(:[\w\-_]+)/", "([\w\-\_\:]+)", $url);
 					$nUrl = str_replace("/", "\/", $nUrl);
 				}
@@ -88,7 +88,7 @@ public function route(): bool {
 
 			foreach ($this->routes as $route) {
 				if (is_null($route["regex"]) === FALSE) {
-					if (preg_match("/^{$route["regex"]}-{$_SERVER['REQUEST_METHOD']}/", $url) === 1) {
+					if (preg_match("/^{$route["regex"]}/", $url) === 1) {
 						$urlIndex = $route["url"];
 
 						preg_match_all("/^{$route["regex"]}-{$_SERVER['REQUEST_METHOD']}/", $url, $tmpParams);