From 7739eae8d2d52578839eb771d7200a75dd582396 Mon Sep 17 00:00:00 2001
From: filippo.bertilotti <filippobertilotti@gmail.com>
Date: Tue, 14 May 2024 11:56:28 +0200
Subject: [PATCH] rimuovendo le credenziali del database e inizializzazione costruttore (parte 87)
---
src/Framework/router.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Framework/router.php b/src/Framework/router.php
index 980acf7..63596c4 100644
--- a/src/Framework/router.php
+++ b/src/Framework/router.php
@@ -12,15 +12,14 @@
}
- 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) {
$pattern = $this->getPatternFromRoutePath($route["path"]);
-
- echo $pattern, "\n";
if(preg_match($pattern, $path, $matches)) {
$matches = array_filter($matches, "is_string", ARRAY_FILTER_USE_KEY);
@@ -42,11 +41,14 @@
$segments = array_map(function(string $segment) :string {
if(preg_match("#^\{([a-z][a-z0-9]*)\}$#", $segment, $matches)) {
- $segment = "(?<" . $matches[1] . ">[^/]*)";
+ 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