From a212c53dc537ce66800b8e987fb18b1aab994bb4 Mon Sep 17 00:00:00 2001
From: filippo.bertilotti <filippobertilotti@gmail.com>
Date: Fri, 17 May 2024 11:59:51 +0200
Subject: [PATCH] creazione file config apposito per i servizi vari (accesso a database per esempio) (parte 108)
---
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