This commit is contained in:
2021-08-03 18:21:56 +08:00
parent 157795fad4
commit 7e3ca6da9c
+5 -6
View File
@@ -82,7 +82,6 @@ class Event extends BaseObject
/** /**
* @param $name * @param $name
* @param $callback * @param $callback
* @param array $parameter
* @param bool $isAppend * @param bool $isAppend
* @throws Exception * @throws Exception
*/ */
@@ -101,9 +100,9 @@ class Event extends BaseObject
return; return;
} }
if (!empty(static::$_events[$name]) && $isAppend === true) { if (!empty(static::$_events[$name]) && $isAppend === true) {
array_unshift(static::$_events[$name], [$callback, $parameter]); array_unshift(static::$_events[$name], [$callback]);
} else { } else {
static::$_events[$name][] = [$callback, $parameter]; static::$_events[$name][] = [$callback];
} }
} }
@@ -118,7 +117,7 @@ class Event extends BaseObject
return; return;
} }
foreach (static::$_events[$name] as $index => $event) { foreach (static::$_events[$name] as $index => $event) {
[$handler, $parameter] = $event; [$handler] = $event;
if ($handler !== $callback) { if ($handler !== $callback) {
continue; continue;
} }
@@ -147,7 +146,7 @@ class Event extends BaseObject
return false; return false;
} }
foreach (static::$_events[$name] as $event) { foreach (static::$_events[$name] as $event) {
[$handler, $parameter] = $event; [$handler] = $event;
if ($handler === $callback) { if ($handler === $callback) {
return true; return true;
} }
@@ -170,7 +169,7 @@ class Event extends BaseObject
return static::$_events[$name]; return static::$_events[$name];
} }
foreach (static::$_events[$name] as $event) { foreach (static::$_events[$name] as $event) {
[$callback, $parameter] = $event; [$callback] = $event;
if ($callback === $handler) { if ($callback === $handler) {
return [$event]; return [$event];
} }