iut/silex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Utilise le chemin de base plus tard dans le routeur

Browse Source
This commit is contained in:
Clément Fréville
2022-11-22 09:50:47 +01:00
parent cd27eea76e
commit 45eabf2503
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Silex/Router/Router.php
View File

@@ -27,9 +27,6 @@ class Router
public function setBasePath(string $basePath) public function setBasePath(string $basePath)
{ {
if (PathHelper::startsWith($this->url, $basePath)) {
$this->url = trim(substr($this->url, strlen($basePath)), '/');
}
$this->basePath = $basePath; $this->basePath = $basePath;
} }
@@ -67,11 +64,17 @@ class Router
if (!isset($this->routes[$_SERVER['REQUEST_METHOD']])) { if (!isset($this->routes[$_SERVER['REQUEST_METHOD']])) {
throw new RouteNotFoundException('Unknown HTTP method'); throw new RouteNotFoundException('Unknown HTTP method');
} }
if ($this->basePath === '' || PathHelper::startsWith($this->url, $this->basePath)) { $url = $this->url;
foreach ($this->routes[$_SERVER['REQUEST_METHOD']] as $route) { if ($this->basePath !== '') {
if ($route->matches($this->url)) { if (PathHelper::startsWith($url, $this->basePath)) {
return $route->call($di); $url = trim(substr($url, strlen($this->basePath)), '/');
} } else {
throw new RouteNotFoundException('No matching routes');
}
}
foreach ($this->routes[$_SERVER['REQUEST_METHOD']] as $route) {
if ($route->matches($url)) {
return $route->call($di);
} }
} }
throw new RouteNotFoundException('No matching routes'); throw new RouteNotFoundException('No matching routes');