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

Refactor $callback to $action

Browse Source
This commit is contained in:
Skylear 2021-07-15 12:01:41 -05:00
parent cbc4269e19
commit a5cd607129
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.DS_Store
._*
/vendor/
/src/Splashsky/test.php

24
src/Splashsky/Router.php
View File

@ -8,23 +8,23 @@ class Router
private static $pathNotFound;
private static $methodNotAllowed;
public static function add(string $route, callable $callback, string $method = 'get')
public static function add(string $route, callable $action, string $method = 'get')
{
self::$routes[] = [
'route' => $route,
'callback' => $callback,
'action' => $action,
'method' => $method
];
}
public static function get(string $route, callable $callback)
public static function get(string $route, callable $action)
{
self::add($route, $callback, 'get');
self::add($route, $action, 'get');
}
public static function post(string $route, callable $callback)
public static function post(string $route, callable $action)
{
self::add($route, $callback, 'post');
self::add($route, $action, 'post');
}
public static function getAllRoutes()
@ -32,14 +32,14 @@ class Router
return self::$routes;
}
public static function pathNotFound(callable $callback)
public static function pathNotFound(callable $action)
{
self::$pathNotFound = $callback;
self::$pathNotFound = $action;
}
public static function methodNotAllowed(callable $callback)
public static function methodNotAllowed(callable $action)
{
self::$methodNotAllowed = $callback;
self::$methodNotAllowed = $action;
}
public static function run(string $basePath = '', bool $caseMatters = false, bool $trailingSlashMatters = false, bool $multimatch = false)
@ -74,6 +74,8 @@ class Router
// Add string start and end automatically
$route['route'] = '^'.$route['route'].'$';
die('#'.$route['route'].'#'.($caseMatters ? '' : 'i').'u');
// Check path match
if (preg_match('#'.$route['route'].'#'.($caseMatters ? '' : 'i').'u', $path, $matches)) {
$pathMatchFound = true;
@ -88,7 +90,7 @@ class Router
array_shift($matches); // Remove basepath
}
if ($return = call_user_func_array($route['callback'], $matches)) {
if ($return = call_user_func_array($route['action'], $matches)) {
echo $return;
}