From e9b6965678b44d7173be872f584c3f980b4bd152 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 27 Aug 2022 19:39:02 +0800 Subject: [PATCH] remove redundant library --- bin/phpunit-zm | 13 ++++++++++++- composer.json | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bin/phpunit-zm b/bin/phpunit-zm index 73049fcd..b6e68c7b 100755 --- a/bin/phpunit-zm +++ b/bin/phpunit-zm @@ -31,6 +31,17 @@ $ob_event_provider = new EventProvider(); // 注册一个最低级别的 WorkerStart 事件,用于在框架的事件初始化之后开始运行 PHPUnit ob_event_provider()->addEventListener(WorkerStartEvent::getName(), function () { + register_shutdown_function(function () { + $error = error_get_last(); + // 下面这段代码的作用就是,不是错误引发的退出时照常退出即可 + if (($error['type'] ?? 0) != 0) { + logger()->emergency(zm_internal_errcode('E00027') . 'Internal fatal error: ' . $error['message'] . ' at ' . $error['file'] . "({$error['line']})"); + } + ob_dump($error); + ob_dump(func_get_args()); + ob_dump(debug_backtrace()); + Framework::getInstance()->stop(); + }); try { // 不退出,而是返回 code $retcode = Command::main(false); @@ -43,7 +54,7 @@ ob_event_provider()->addEventListener(WorkerStartEvent::getName(), function () { try { $options = ServerStartCommand::exportOptionArray(); - $options['driver'] = DIRECTORY_SEPARATOR === '/' ? 'swoole' : 'workerman'; + $options['driver'] = 'workerman'; $options['worker-num'] = 1; $options['private-mode'] = true; (new Framework($options))->init()->start(); diff --git a/composer.json b/composer.json index ca0c8537..c6294e0e 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,7 @@ "symfony/polyfill-ctype": "^1.19", "symfony/polyfill-mbstring": "^1.19", "symfony/polyfill-php80": "^1.16", - "symfony/routing": "~6.0 || ~5.0 || ~4.0", - "zhamao/logger": "dev-master" + "symfony/routing": "~6.0 || ~5.0 || ~4.0" }, "require-dev": { "brainmaestro/composer-git-hooks": "^2.8",