php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Exception\Throwable order

Browse Source
This commit is contained in:
Игорь Тарасов
2021-06-13 18:07:43 +05:00
parent bbb756a876
commit 330166e703
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/BaseActiveRecord.php
View File

@ -335,9 +335,9 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
{
try {
return $this->__get($name) !== null;
} catch (\Throwable $t) {
} catch (\Exception $t) {
return false;
} catch (\Exception $e) {
} catch (\Throwable $e) {
return false;
}
}

2
framework/log/DbTarget.php
View File

@ -78,7 +78,7 @@ class DbTarget extends Target
list($text, $level, $category, $timestamp) = $message;
if (!is_string($text)) {
// exceptions may not be serializable if in the call stack somewhere is a Closure
if ($text instanceof \Throwable || $text instanceof \Exception) {
if ($text instanceof \Exception || $text instanceof \Throwable) {
$text = (string) $text;
} else {
$text = VarDumper::export($text);

2
framework/log/SyslogTarget.php
View File

@ -84,7 +84,7 @@ class SyslogTarget extends Target
$level = Logger::getLevelName($level);
if (!is_string($text)) {
// exceptions may not be serializable if in the call stack somewhere is a Closure
if ($text instanceof \Throwable || $text instanceof \Exception) {
if ($text instanceof \Exception || $text instanceof \Throwable) {
$text = (string) $text;
} else {
$text = VarDumper::export($text);

2
framework/log/Target.php
View File

@ -296,7 +296,7 @@ abstract class Target extends Component
$level = Logger::getLevelName($level);
if (!is_string($text)) {
// exceptions may not be serializable if in the call stack somewhere is a Closure
if ($text instanceof \Throwable || $text instanceof \Exception) {
if ($text instanceof \Exception || $text instanceof \Throwable) {
$text = (string) $text;
} else {
$text = VarDumper::export($text);