Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 9fb17b4499ab · 2017-03-12T17:01:59.000+01:00
* 2.7:
  [VarDumper] ExceptionCaster robustness fix
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -65,15 +65,13 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
         $prefix = Caster::PREFIX_PROTECTED;
         $xPrefix = "\0Exception\0";
 
-        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
+        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace']) && $a[$xPrefix.'previous'] instanceof \Exception) {
             $b = (array) $a[$xPrefix.'previous'];
-            if (isset($a[$prefix.'file'], $a[$prefix.'line'])) {
-                array_unshift($b[$xPrefix.'trace'], array(
-                    'function' => 'new '.get_class($a[$xPrefix.'previous']),
-                    'file' => $b[$prefix.'file'],
-                    'line' => $b[$prefix.'line'],
-                ));
-            }
+            array_unshift($b[$xPrefix.'trace'], array(
+                'function' => 'new '.get_class($a[$xPrefix.'previous']),
+                'file' => $b[$prefix.'file'],
+                'line' => $b[$prefix.'line'],
+            ));
             $a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
         }
 
