geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-15 18:23:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed for PHP7

Browse Source
This commit is contained in:
sessingo
2023-03-25 02:24:19 +01:00
parent 74c52931e9
commit 4a7360909c
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Pecee/SimpleRouter/Route/Route.php
View File

@@ -163,16 +163,6 @@ abstract class Route implements IRoute
}
// Get name of last param
/*$lastParam = null;
$start = strrpos($route, '{');
if($start > -1) {
$param = substr($route, $start, strrpos($route, '}') + 1 - $start);
if(str_ends_with($route, $param . '/')) {
$lastParam = $param;
}
}*/
if (trim($urlRegex) === '' || (bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
return null;
}
@@ -195,8 +185,9 @@ abstract class Route implements IRoute
continue;
}
// If last parameter, use slash according to original path (non sanitized version)
if ($this->slashParameterEnabled && ($i === count($parameters[1]) - 1) && str_ends_with($route, $this->paramModifiers[0] . $name . $this->paramModifiers[1] . '/') && $originalPath[strlen($originalPath) - 1] === '/') {
// If last parameter and slash parameter is enabled, use slash according to original path (non sanitized version)
$lastParameter = $this->paramModifiers[0] . $name . $this->paramModifiers[1] . '/';
if ($this->slashParameterEnabled && ($i === count($parameters[1]) - 1) && (substr_compare($route, $lastParameter, -strlen($lastParameter)) === 0) && $originalPath[strlen($originalPath) - 1] === '/') {
$matches[$name] .= '/';
}