as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2020-10-15 10:59:28 +08:00
parent 350f531ec7
commit 76deb101b2
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Route/Router.php
+18 -18
View File
@@ -283,24 +283,7 @@ class Router extends Application implements RouterInterface
$node->path = $value; $node->path = $value;
$node->index = $index; $node->index = $index;
$node->method = $method; $node->method = $method;
$node->namespace = $this->loadNamespace($method);
$name = array_column($this->groupTacks, 'namespace');
$dir = array_column($this->groupTacks, 'dir');
if (!empty($dir)) {
array_unshift($name, implode('\\', $dir));
} else {
if ($method == 'package' || $method == 'receive') {
$dir = 'App\\Listener';
} else {
$dir = $this->dir;
}
array_unshift($name, $dir);
}
if (!empty($name) && $name = array_filter($name)) {
$node->namespace = $name;
}
$name = array_column($this->groupTacks, 'middleware'); $name = array_column($this->groupTacks, 'middleware');
if ($this->middleware instanceof \Closure) { if ($this->middleware instanceof \Closure) {
@@ -311,6 +294,23 @@ class Router extends Application implements RouterInterface
return $node; return $node;
} }
/**
* @param $method
* @return array
*/
private function loadNamespace($method)
{
$name = array_column($this->groupTacks, 'namespace');
if ($method == 'package' || $method == 'receive') {
$dir = 'App\\Listener';
} else {
$dir = $this->dir;
}
array_unshift($name, $dir);
return array_filter($name);
}
/** /**
* @param array $config * @param array $config
* @param callable $callback * @param callable $callback