diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php index 1f94ce91af..53a58260f1 100644 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php @@ -42,27 +42,28 @@ class ExceptionCaster public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0) { - $trace = $a["\0Exception\0trace"]; - unset($a["\0Exception\0trace"]); // Ensures the trace is always last + $xPrefix = PHP_VERSION_ID >= 70000 ? "\0BaseException\0" : "\0Exception\0"; + $trace = $a[$xPrefix.'trace']; + unset($a[$xPrefix.'trace']); // Ensures the trace is always last if (!($filter & Caster::EXCLUDE_VERBOSE)) { static::filterTrace($trace, static::$traceArgs); if (null !== $trace) { - $a["\0Exception\0trace"] = $trace; + $a[$xPrefix.'trace'] = $trace; } } - if (empty($a["\0Exception\0previous"])) { - unset($a["\0Exception\0previous"]); + if (empty($a[$xPrefix.'previous'])) { + unset($a[$xPrefix.'previous']); } - unset($a["\0Exception\0string"], $a["\0+\0xdebug_message"], $a["\0+\0__destructorException"]); + unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']); return $a; } public static function castErrorException(\ErrorException $e, array $a, Stub $stub, $isNested) { - if (isset($a[$s = "\0*\0severity"], self::$errorTypes[$a[$s]])) { + if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) { $a[$s] = new ConstStub(self::$errorTypes[$a[$s]], $a[$s]); } @@ -71,23 +72,21 @@ class ExceptionCaster public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, $isNested) { - $b = (array) $a["\0Exception\0previous"]; + $prefix = Caster::PREFIX_PROTECTED; + $xPrefix = PHP_VERSION_ID >= 70000 ? "\0BaseException\0" : "\0Exception\0"; + $b = (array) $a[$xPrefix.'previous']; - if (isset($b["\0*\0message"])) { - $a["\0~\0message"] = $b["\0*\0message"]; - } - - if (isset($a["\0Exception\0trace"])) { - $b["\0Exception\0trace"][0] += array( - 'file' => $b["\0*\0file"], - 'line' => $b["\0*\0line"], + if (isset($a[$xPrefix.'trace'][0])) { + $b[$xPrefix.'trace'][0] += array( + 'file' => $b[$prefix.'file'], + 'line' => $b[$prefix.'line'], ); - array_splice($b["\0Exception\0trace"], -1 - count($a["\0Exception\0trace"])); - static::filterTrace($b["\0Exception\0trace"], false); - $a["\0~\0trace"] = $b["\0Exception\0trace"]; + array_splice($b[$xPrefix.'trace'], -1 - count($a[$xPrefix.'trace'])); + static::filterTrace($b[$xPrefix.'trace'], false); + $a[Caster::PREFIX_VIRTUAL.'trace'] = $b[$xPrefix.'trace']; } - unset($a["\0Exception\0trace"], $a["\0Exception\0previous"], $a["\0*\0code"], $a["\0*\0file"], $a["\0*\0line"]); + unset($a[$xPrefix.'trace'], $a[$xPrefix.'previous'], $a[$prefix.'code'], $a[$prefix.'file'], $a[$prefix.'line']); return $a; } diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php index dd40512819..4699e19182 100644 --- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php @@ -119,12 +119,10 @@ class VarCloner extends AbstractCloner $stub = $arrayRefs[$len] = new Stub(); $stub->type = Stub::TYPE_ARRAY; $stub->class = Stub::ARRAY_ASSOC; - $stub->value = $zval['array_count'] ?: count($v); - - $a = $v; // Copies of $GLOBALS have very strange behavior, // let's detect them with some black magic + $a = $v; $a[$gid] = true; // Happens with copies of $GLOBALS @@ -137,6 +135,8 @@ class VarCloner extends AbstractCloner } else { $a = $v; } + + $stub->value = $zval['array_count'] ?: count($a); } break; diff --git a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php b/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php index 1ab2f26ed7..ce2ab4d4b4 100644 --- a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php +++ b/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php @@ -22,6 +22,6 @@ class ThrowingCasterException extends \Exception */ public function __construct($caster, \Exception $prev) { - parent::__construct('Unexpected exception thrown from a caster: '.get_class($prev), 0, $prev); + parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev); } } diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php index b72247e1c0..8aea06d927 100644 --- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php @@ -173,8 +173,7 @@ EOTXT eof: false options: [] ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {#%d - #message: "Unexpected exception thrown from a caster: Exception" - message: "Foobar" + #message: "Unexpected Exception thrown from a caster: Foobar" trace: array:1 [ 0 => array:2 [ "call" => "%s{closure}()" diff --git a/src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php index 2148cbf07f..09082f60d6 100644 --- a/src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php @@ -39,7 +39,6 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase ob_start(); $dumper->dump($data); $out = ob_get_clean(); - $closureLabel = PHP_VERSION_ID >= 50400 ? 'public method' : 'function'; $out = preg_replace('/[ \t]+$/m', '', $out); $var['file'] = htmlspecialchars($var['file'], ENT_QUOTES, 'UTF-8'); $intMax = PHP_INT_MAX;