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-08-31 22:48:33 +08:00
parent 7ef79b21db
commit 1436a149d1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/Annotation/Annotation.php
+4 -4
View File
@@ -65,7 +65,8 @@ class Annotation extends BaseAnnotation
*/ */
public function registration_notes($path, $namespace) public function registration_notes($path, $namespace)
{ {
foreach ($path as $item) { $path = rtrim($path, '/');
foreach (glob($path . '/*') as $item) {
$this->scanning($item, $namespace); $this->scanning($item, $namespace);
} }
} }
@@ -181,17 +182,16 @@ class Annotation extends BaseAnnotation
/** /**
* @param $path * @param $path
* @param mixed ...$param
* @return bool|mixed * @return bool|mixed
*/ */
public function runWith($path, $param) public function runWith($path)
{ {
if (!$this->has($path)) { if (!$this->has($path)) {
return null; return null;
} }
$callback = $this->_Scan_directory[$path]; $callback = $this->_Scan_directory[$path];
if (!isset($this->params[$path])) { if (!isset($this->params[$path])) {
return $callback(...$param); return $callback();
} }
return $callback(...$this->params[$path]); return $callback(...$this->params[$path]);
} }