diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[VarDumper] Add missing isset() checks in some casters

Browse Source
This commit is contained in:
Nicolas Grekas 2017-03-10 23:26:11 +01:00
parent 25a2ce062b
commit 870c26f39b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
View File

@ -67,11 +67,13 @@ class ExceptionCaster
if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) { if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
$b = (array) $a[$xPrefix.'previous']; $b = (array) $a[$xPrefix.'previous'];
array_unshift($b[$xPrefix.'trace'], array( if (isset($a[$prefix.'file'], $a[$prefix.'line'])) {
'function' => 'new '.get_class($a[$xPrefix.'previous']), array_unshift($b[$xPrefix.'trace'], array(
'file' => $b[$prefix.'file'], 'function' => 'new '.get_class($a[$xPrefix.'previous']),
'line' => $b[$prefix.'line'], 'file' => $b[$prefix.'file'],
)); 'line' => $b[$prefix.'line'],
));
}
$a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value)); $a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
} }
@ -234,11 +236,13 @@ class ExceptionCaster
} }
if (!($filter & Caster::EXCLUDE_VERBOSE)) { if (!($filter & Caster::EXCLUDE_VERBOSE)) {
array_unshift($trace, array( if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
'function' => $xClass ? 'new '.$xClass : null, array_unshift($trace, array(
'file' => $a[Caster::PREFIX_PROTECTED.'file'], 'function' => $xClass ? 'new '.$xClass : null,
'line' => $a[Caster::PREFIX_PROTECTED.'line'], 'file' => $a[Caster::PREFIX_PROTECTED.'file'],
)); 'line' => $a[Caster::PREFIX_PROTECTED.'line'],
));
}
$a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs); $a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs);
} }
if (empty($a[$xPrefix.'previous'])) { if (empty($a[$xPrefix.'previous'])) {