This commit is contained in:
2021-08-13 15:22:11 +08:00
parent c95cc8d799
commit 695c24b79f
4 changed files with 7 additions and 7 deletions
+4 -1
View File
@@ -35,7 +35,10 @@ use Kiri\Events\EventProvider;
public function execute(mixed $class, mixed $method = null): bool
{
$pro = di(EventProvider::class);
$pro->on($this->name, [di($class), $method]);
if (is_string($class)) {
$class = di($class);
}
$pro->on($this->name, [$class, $method]);
return true;
}
+1 -2
View File
@@ -554,14 +554,13 @@ class Router extends HttpService implements RouterInterface
$di = Kiri::getDi();
foreach ($classes as $class) {
$instance = $di->get($class);
$methods = $di->getMethodAttribute($class);
foreach ($methods as $method => $attribute) {
if (empty($attribute)) {
continue;
}
foreach ($attribute as $item) {
$item->execute($instance, $method);
$item->execute($class, $method);
}
}
}
-1
View File
@@ -62,7 +62,6 @@ class OnServerWorker extends \Server\Abstracts\Server
/**
* @param Annotation $annotation
* @throws NotFindClassException
* @throws ReflectionException
* @throws Exception
*/
+2 -3
View File
@@ -123,9 +123,8 @@ if (!function_exists('injectRuntime')) {
$fileLists = Kiri::getAnnotation()->runtime($path, $exclude);
$di = Kiri::getDi();
foreach ($fileLists as $class) {
$instance = $di->get($class);
foreach ($di->getTargetNote($class) as $value) {
$value->execute($instance);
$value->execute($class);
}
$methods = $di->getMethodAttribute($class);
foreach ($methods as $method => $attribute) {
@@ -133,7 +132,7 @@ if (!function_exists('injectRuntime')) {
continue;
}
foreach ($attribute as $item) {
$item->execute($instance, $method);
$item->execute($class, $method);
}
}
}