zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 15:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

add PHP8 Attribute compatibility (build 439, 2.7.0-beta4)

Browse Source
This commit is contained in:
crazywhalecc
2022-03-20 01:53:36 +08:00
parent 12363aebf0
commit c897da29c6
42 changed files with 355 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ZM/Event/EventTracer.php
View File

@@ -30,7 +30,10 @@ class EventTracer
public static function getCurrentEventMiddlewares()
{
$current_event = self::getCurrentEvent();
if (!isset($current_event->class, $current_event->method)) {
if (empty($current_event->class)) {
return null;
}
if (empty($current_event->method)) {
return null;
}
return EventManager::$middleware_map[$current_event->class][$current_event->method] ?? [];

5
src/ZM/Event/SwooleEvent/OnRequest.php
View File

@@ -39,7 +39,7 @@ class OnRequest implements SwooleEvent
$dis1 = new EventDispatcher(OnRequestEvent::class);
$dis1->setRuleFunction(function ($v) {
return eval('return ' . $v->getRule() . ';') ? true : false;
return (bool) eval('return ' . $v->getRule() . ';');
});
$dis = new EventDispatcher(OnSwooleEvent::class);
@@ -61,8 +61,7 @@ class OnRequest implements SwooleEvent
if ($result === true) {
ctx()->setCache('params', $params);
$dispatcher = new EventDispatcher(RequestMapping::class);
$div = new RequestMapping();
$div->route = $node['route'];
$div = new RequestMapping($node['route']);
$div->params = $params;
$div->method = $node['method'];
$div->request_method = $node['request_method'];