From fa4b733ea3434e9ef10c8ab0b44fcb903edcb3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 6 Nov 2020 16:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Database/Base/BaseActiveRecord.php | 2 +- Database/Command.php | 2 +- Gii/GiiModel.php | 2 +- HttpServer/Abstracts/Callback.php | 4 ++-- HttpServer/Events/OnMessage.php | 2 +- HttpServer/Route/Node.php | 2 +- HttpServer/Route/Router.php | 2 +- System/Abstracts/BaseObject.php | 2 +- System/Error/ErrorHandler.php | 4 ++-- System/Error/Logger.php | 6 +++--- System/Pool/Redis.php | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index 4f793b00..26d65724 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -374,7 +374,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess $this->setAttributes($param); $this->afterSave($attributes, $param); $this->refresh(); - } catch (Exception $exception) { + } catch (\Throwable $exception) { $lastId = false; $trance->rollback(); } diff --git a/Database/Command.php b/Database/Command.php index 896998c0..e5c49156 100644 --- a/Database/Command.php +++ b/Database/Command.php @@ -202,7 +202,7 @@ class Command extends Component if (Config::get('debug.enable', false, false)) { $this->debug($this->sql . '。 Run-time: ' . (microtime(true) - $time)); } - } catch (\Throwable | Exception $exception) { + } catch (\Throwable $exception) { $this->addError($this->sql . '. error: ' . $exception->getMessage(), 'mysql'); $result = []; } finally { diff --git a/Gii/GiiModel.php b/Gii/GiiModel.php index 38fc88ea..2dc20db4 100644 --- a/Gii/GiiModel.php +++ b/Gii/GiiModel.php @@ -56,7 +56,7 @@ class GiiModel extends GiiBase if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) { try { $class = new \ReflectionClass($modelPath['namespace'] . '\\' . $managerName); - } catch (\Exception $e) { + } catch (\Throwable $e) { var_dump($e->getMessage()); } } diff --git a/HttpServer/Abstracts/Callback.php b/HttpServer/Abstracts/Callback.php index be5b9a9b..8c09ce33 100644 --- a/HttpServer/Abstracts/Callback.php +++ b/HttpServer/Abstracts/Callback.php @@ -41,7 +41,7 @@ abstract class Callback extends Application $event->offName(Event::EVENT_AFTER_REQUEST); $event->offName(Event::EVENT_BEFORE_REQUEST); $this->eventNotify($message, $event); - } catch (Exception $exception) { + } catch (\Throwable $exception) { $this->error($exception->getMessage()); } } @@ -125,7 +125,7 @@ abstract class Callback extends Application $mail->Body = $message; $mail->AltBody = $message; $mail->send(); - } catch (Exception $e) { + } catch (\Throwable $e) { $this->addError($e->getMessage(), 'email'); } } diff --git a/HttpServer/Events/OnMessage.php b/HttpServer/Events/OnMessage.php index ac78fbca..42922548 100644 --- a/HttpServer/Events/OnMessage.php +++ b/HttpServer/Events/OnMessage.php @@ -43,7 +43,7 @@ class OnMessage extends Callback } $events = $manager->getName(AWebsocket::MESSAGE, [null, null, $frame->data['route']]); $manager->runWith($events, [$frame, $server]); - } catch (\Exception $exception) { + } catch (\Throwable $exception) { $this->addError($exception->getMessage(), 'websocket'); $server->send($frame->fd, $exception->getMessage()); } finally { diff --git a/HttpServer/Route/Node.php b/HttpServer/Route/Node.php index bf8d154b..b571a96e 100644 --- a/HttpServer/Route/Node.php +++ b/HttpServer/Route/Node.php @@ -214,7 +214,7 @@ class Node extends Application $annotation->read($this, $reflect, $action, $annotations); } return [$reflect->newInstance(), $action]; - } catch (Exception $exception) { + } catch (\Throwable $exception) { $this->_error = $exception->getMessage(); $this->error($exception->getMessage(), 'router'); return null; diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index 9187c51f..266f3fa1 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -621,7 +621,7 @@ class Router extends Application implements RouterInterface try { $router = $this; include_once "{$files}"; - } catch (Exception $exception) { + } catch (\Throwable $exception) { $this->error($exception->getMessage()); } finally { if (isset($exception)) { diff --git a/System/Abstracts/BaseObject.php b/System/Abstracts/BaseObject.php index 7cde3091..1483a80c 100644 --- a/System/Abstracts/BaseObject.php +++ b/System/Abstracts/BaseObject.php @@ -90,7 +90,7 @@ class BaseObject implements Configure */ public function addError($message, $model = 'app') { - if ($message instanceof Exception) { + if ($message instanceof \Throwable) { $this->error($message->getMessage(), $message->getFile(), $message->getLine()); } else { if (!is_string($message)) { diff --git a/System/Error/ErrorHandler.php b/System/Error/ErrorHandler.php index f65e0c79..96138a45 100644 --- a/System/Error/ErrorHandler.php +++ b/System/Error/ErrorHandler.php @@ -66,11 +66,11 @@ class ErrorHandler extends Component implements ErrorInterface /** - * @param Exception $exception + * @param \Throwable $exception * * @throws Exception */ - public function exceptionHandler(Exception $exception) + public function exceptionHandler(\Throwable $exception) { $this->category = 'exception'; diff --git a/System/Error/Logger.php b/System/Error/Logger.php index 044a6e05..a7c6125d 100644 --- a/System/Error/Logger.php +++ b/System/Error/Logger.php @@ -217,7 +217,7 @@ class Logger extends Component if (is_string($data)) { return $data; } - if ($data instanceof Exception) { + if ($data instanceof Throwable) { $data = $this->getException($data); } else if (is_object($data)) { $data = get_object_vars($data); @@ -266,10 +266,10 @@ class Logger extends Component /** - * @param Exception $exception + * @param Throwable $exception * @return array */ - private function getException(Exception $exception) + private function getException(Throwable $exception) { $_tmp = [$exception->getMessage()]; $_tmp[] = $exception->getFile() . ' on line ' . $exception->getLine(); diff --git a/System/Pool/Redis.php b/System/Pool/Redis.php index 98e180be..04dae36c 100644 --- a/System/Pool/Redis.php +++ b/System/Pool/Redis.php @@ -164,7 +164,7 @@ class Redis extends Pool return $result = false; } return $result = true; - } catch (Exception $exception) { + } catch (\Throwable $exception) { return $result = false; } finally { if (!$result) {