panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复BUG/升级1.1.6版本

Browse Source
This commit is contained in:
Ying
2023-04-25 20:11:49 +08:00
parent 445e5f9662
commit 6a6866bbaf
2357 changed files with 456920 additions and 140567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
vendor/webman/event/src/BootStrap.php vendored
View File

@@ -7,6 +7,7 @@ use support\Log;
class BootStrap implements \Webman\Bootstrap
{
/**
* @var array
*/
@@ -19,17 +20,30 @@ class BootStrap implements \Webman\Bootstrap
public static function start($worker)
{
static::getEvents([config()]);
}
protected static function convertCallable($callback)
{
if (\is_array($callback)) {
$callback = \array_values($callback);
if (isset($callback[1]) && \is_string($callback[0]) && \class_exists($callback[0])) {
$callback = [Container::get($callback[0]), $callback[1]];
foreach (static::$events as $name => $events) {
// 支持排序，1 2 3 ... 9 a b c...z
ksort($events, SORT_NATURAL);
foreach ($events as $callbacks) {
foreach ($callbacks as $callback) {
Event::on($name, $callback);
}
}
}
return $callback;
}
/**
* @param $callbacks
* @return array|mixed
*/
protected static function convertCallable($callbacks)
{
if (\is_array($callbacks)) {
$callback = \array_values($callbacks);
if (isset($callback[1]) && \is_string($callback[0]) && \class_exists($callback[0])) {
return [Container::get($callback[0]), $callback[1]];
}
}
return $callbacks;
}
/**
@@ -43,12 +57,10 @@ class BootStrap implements \Webman\Bootstrap
continue;
}
if (isset($config['event']) && is_array($config['event']) && !isset($config['event']['app']['enable'])) {
$events = [];
foreach ($config['event'] as $event_name => $callbacks) {
$callbacks = static::convertCallable($callbacks);
if (is_callable($callbacks)) {
$events[$event_name] = [$callbacks];
Event::on($event_name, $callbacks);
static::$events[$event_name][] = [$callbacks];
continue;
}
if (!is_array($callbacks)) {
@@ -57,11 +69,11 @@ class BootStrap implements \Webman\Bootstrap
Log::error($msg);
continue;
}
foreach ($callbacks as $callback) {
ksort($callbacks, SORT_NATURAL);
foreach ($callbacks as $id => $callback) {
$callback = static::convertCallable($callback);
if (is_callable($callback)) {
$events[$event_name][] = $callback;
Event::on($event_name, $callback);
static::$events[$event_name][$id][] = $callback;
continue;
}
$msg = "Events: $event_name => " . var_export($callback, true) . " is not callable\n";
@@ -69,7 +81,6 @@ class BootStrap implements \Webman\Bootstrap
Log::error($msg);
}
}
static::$events = array_merge_recursive(static::$events, $events);
unset($config['event']);
}
static::getEvents($config);

28
vendor/webman/event/src/Event.php vendored
View File

@@ -63,9 +63,8 @@ class Event
* @param bool $halt
* @return array|null|mixed
*/
public static function emit($event_name, $data, $halt = false)
public static function emit($event_name, $data, bool $halt = false)
{
$success_count = 0;
$listeners = static::getListeners($event_name);
$responses = [];
foreach ($listeners as $listener) {
@@ -91,6 +90,29 @@ class Event
}
return $halt ? null : $responses;
}
/**
* @param mixed $event_name
* @param mixed $data
* @param bool $halt
* @return array|null|mixed
*/
public static function dispatch($event_name, $data, bool $halt = false)
{
$listeners = static::getListeners($event_name);
$responses = [];
foreach ($listeners as $listener) {
$response = $listener($data, $event_name);
$responses[] = $response;
if ($halt && !is_null($response)) {
return $response;
}
if ($response === false) {
break;
}
}
return $halt ? null : $responses;
}
/**
* @return array
@@ -136,4 +158,4 @@ class Event
{
return !empty(static::getListeners($event_name));
}
}
}