From e3d936b79bfe45c9dbe5ecdae467ac7ef8bf24b3 Mon Sep 17 00:00:00 2001 From: filippo.bertilotti <filippobertilotti@gmail.com> Date: Wed, 15 May 2024 10:53:47 +0200 Subject: [PATCH] aggiunta strict type per evitare errori sui tipi (parte 93) --- src/Framework/router.php | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Framework/router.php b/src/Framework/router.php index 19a88d4..63596c4 100644 --- a/src/Framework/router.php +++ b/src/Framework/router.php @@ -12,8 +12,9 @@ } - public function match (string $path,): array|bool { - + public function match (string $path): array|bool { + $path = urldecode($path); + $path = trim($path, "/"); foreach ($this->routes as $route) { @@ -40,11 +41,14 @@ $segments = array_map(function(string $segment) :string { if(preg_match("#^\{([a-z][a-z0-9]*)\}$#", $segment, $matches)) { - $segment = "(?<" . $matches[1] . ">[a-z]+)"; + return "(?<" . $matches[1] . ">[^/]*)"; + } + if(preg_match("#^\{([a-z][a-z0-9]*):(.+)\}$#", $segment, $matches)) { + return "(?<" . $matches[1] . ">". $matches[2] ."[^/]*)"; } return $segment; }, $segments); - return "#^" . implode("/", $segments) . "$#"; + return "#^" . implode("/", $segments) . "$#iu"; } } \ No newline at end of file -- Gitblit v1.8.0