PHP/SimpleRouter
PHP/SimpleRouter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove trailing slash matters, shorten run function

Browse Source
This commit is contained in:
Skylear 2021-07-15 12:21:22 -05:00
parent a5cd607129
commit 087ddabfff
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Splashsky/Router.php
View File

@ -8,7 +8,13 @@ class Router
private static $pathNotFound; private static $pathNotFound;
private static $methodNotAllowed; private static $methodNotAllowed;
public static function add(string $route, callable $action, string $method = 'get') /**
* A quick static function to register a route in the router. Used by the shorthand methods as well.
* @param string $route The path to be used as the route.
* @param callable|string $action Either a callable to be executed, or a string reference to a method.
* @param string $method The HTTP verb this route services.
*/
public static function add(string $route, callable|string $action, string $method = 'GET')
{ {
self::$routes[] = [ self::$routes[] = [
'route' => $route, 'route' => $route,
@ -19,12 +25,12 @@ class Router
public static function get(string $route, callable $action) public static function get(string $route, callable $action)
{ {
self::add($route, $action, 'get'); self::add($route, $action, 'GET');
} }
public static function post(string $route, callable $action) public static function post(string $route, callable $action)
{ {
self::add($route, $action, 'post'); self::add($route, $action, 'POST');
} }
public static function getAllRoutes() public static function getAllRoutes()
@ -42,25 +48,12 @@ class Router
self::$methodNotAllowed = $action; self::$methodNotAllowed = $action;
} }
public static function run(string $basePath = '', bool $caseMatters = false, bool $trailingSlashMatters = false, bool $multimatch = false) public static function run(string $basePath = '', bool $caseMatters = false, bool $multimatch = false)
{ {
$basePath = rtrim($basePath, '/'); $basePath = rtrim($basePath, '/');
$url = parse_url($_SERVER['REQUEST_URI']); $path = rtrim(parse_url($_SERVER['REQUEST_URI']), '/');
$path = '/';
$method = $_SERVER['REQUEST_METHOD']; $method = $_SERVER['REQUEST_METHOD'];
if (isset($url['path'])) {
if ($trailingSlashMatters) {
$path = $url['path'];
} else {
if($basePath.'/' != $url['path']) {
$path = rtrim($url['path'], '/');
} else {
$path = $url['path'];
}
}
}
$path = urldecode($path); $path = urldecode($path);
$pathMatchFound = false; $pathMatchFound = false;