Framework/routes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mudanças

Browse Source
This commit is contained in:
ahwelp
2022-04-05 20:05:58 +00:00
parent 47a08f5d49
commit 33f5b7462b
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Routes/Route.php
Executable → Regular
+7 -3
View File
@@ -144,6 +144,8 @@ class Route {
$before = explode('@', $before); $before = explode('@', $before);
$class = new $before[0](); $class = new $before[0]();
$class->{$before[1]}(); $class->{$before[1]}();
}else if(is_array($before)){
call_user_func($before['callback'], $before['params']);
}else{ }else{
call_user_func($before); call_user_func($before);
} }
@@ -195,8 +197,10 @@ class Route {
$this->_regex .= "\/[0-9]+"; $this->_regex .= "\/[0-9]+";
} else if (strpos($segment, 'h:') > -1) { } else if (strpos($segment, 'h:') > -1) {
$this->_regex .= "\/[A-z]+"; $this->_regex .= "\/[A-z]+";
} else if (strpos($segment, ':') > -1) { } else if (strpos($segment, 'd:') > -1) {
$this->_regex .= "\/[A-z0-9]+"; $this->_regex .= "\/[A-z0-9]+";
} else if (strpos($segment, 'r:') > -1) {
$this->_regex .= "\/[ -~]+";
} else { } else {
$this->_regex .= "\/" . $segment; $this->_regex .= "\/" . $segment;
} }
@@ -249,8 +253,8 @@ class Route {
return $this; return $this;
} }
function middlewareAdd($name = '') { function middlewareAdd($name = '', $params) {
$this->_before[$name] = $function; $this->_before[$name] = $params;
return $this; return $this;
} }
src/Routes/RouteCollection.php
Executable → Regular
+12 -5
View File
@@ -65,7 +65,8 @@ class RouteCollection {
foreach (new \RecursiveIteratorIterator($rdi) as $file) { foreach (new \RecursiveIteratorIterator($rdi) as $file) {
foreach ($filenames as $filename) { foreach ($filenames as $filename) {
if (strpos($file, $filename)) { // if (strpos($file, $filename) && $file[0] != '.') {
if (strpos($file, $filename) && !strpos($file, '.swp') ) {
$instance->_loadedFiles[] = $file; $instance->_loadedFiles[] = $file;
} }
} }
@@ -148,7 +149,13 @@ class RouteCollection {
$ROUTE = $route; $ROUTE = $route;
$route->_before = $this->_defaultMiddlewares; foreach ($route->_before as $key => $requestedMiddleware){
$route->_before[$key] = Array(
'callback' => $this->_middlewareSet[$key],
'params' => $requestedMiddleware);
}
$route->_before = array_merge($this->_defaultMiddlewares, $route->_before);
$route->execute(); $route->execute();
@@ -294,6 +301,7 @@ class RouteCollection {
*/ */
static function addDefaultMiddleware($name = '', $function) { static function addDefaultMiddleware($name = '', $function) {
self::getInstance()->_defaultMiddlewares[$name] = $function; self::getInstance()->_defaultMiddlewares[$name] = $function;
return self::getInstance();
} }
/** /**
@@ -301,16 +309,15 @@ class RouteCollection {
* @ctag RouteCollection::addDefaultMiddleware('name',function(){}) * @ctag RouteCollection::addDefaultMiddleware('name',function(){})
*/ */
static function registerMiddleware($name = '', $function) { static function registerMiddleware($name = '', $function) {
self::getInstance()->_middlewareSet[$name] = $function; return self::getInstance()->_middlewareSet[$name] = $function;
} }
/** /**
* *
* @ctag RouteCollection::onHttpError(function(){}) * @ctag RouteCollection::onHttpError(function(){})
*/ */
static function onHttpError($function) { static function onHttpError($code, $function) {
$instance = self::getInstance(); $instance = self::getInstance();
$instance->_errors[] = $function;
} }
/** /**