[VarDumper] Support ThrownExceptionInformation

jeroennoten · jeroennoten · commit 578efd2a57b6 · 2020-11-02T16:34:42.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -48,7 +48,7 @@ install:
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
+    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F)
     - php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
     - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -114,7 +114,7 @@ jobs:
                 run: |
                     COMPOSER_HOME="$(composer config home)"
                     ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*').x-dev" >> $GITHUB_ENV
+                    echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
 
             -   name: Determine composer cache directory
                 id: composer-cache
diff --git a/.travis.yml b/.travis.yml
@@ -199,7 +199,7 @@ install:
       git config --global user.email ""
       git config --global user.name "Symfony"
 
-      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
+      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*')
 
       if [[ ! $deps ]]; then
           php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
diff --git a/composer.json b/composer.json
@@ -175,6 +175,6 @@
     ],
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "5.2"
+        "branch-version": "5.x"
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\VarDumper\Caster;
 
 use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;
+use Symfony\Component\Messenger\Exception\ThrownExceptionDetails;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
 
@@ -83,6 +84,15 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
         return $a;
     }
 
+    public static function castThrownExceptionDetails(ThrownExceptionDetails $exceptionDetails, array $a, Stub $stub, bool $isNested, int $filter = 0)
+    {
+        $xPrefix = "\0".ThrownExceptionDetails::class."\0";
+        $stub->class = $exceptionDetails->getClass();
+        unset($a[$xPrefix.'class']);
+
+        return self::filterExceptionArray($exceptionDetails->getClass(), $a, $xPrefix, $filter);
+    }
+
     public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested)
     {
         $sPrefix = "\0".SilencedErrorContext::class."\0";
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -91,6 +91,7 @@ abstract class AbstractCloner implements ClonerInterface
         'Symfony\Component\VarDumper\Caster\FrameStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castFrameStub'],
         'Symfony\Component\VarDumper\Cloner\AbstractCloner' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
         'Symfony\Component\ErrorHandler\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'],
+        'Symfony\Component\Messenger\Exception\ThrownExceptionDetails' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castThrownExceptionDetails'],
 
         'Imagine\Image\ImageInterface' => ['Symfony\Component\VarDumper\Caster\ImagineCaster', 'castImage'],
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -244,4 +244,29 @@ public function testAnonymous()
 
         $this->assertDumpMatchesFormat($expectedDump, $e, Caster::EXCLUDE_VERBOSE);
     }
+
+    public function testThrownExceptionDetails()
+    {
+        $e = \Symfony\Component\ErrorHandler\Exception\FlattenException::createFromThrowable($this->getTestException('foo'));
+        $exceptionDetails = \Symfony\Component\Messenger\Exception\ThrownExceptionDetails::createFromFlattenException($e);
+
+        $expectedDump = <<<'EODUMP'
+Exception {
+  -message: "foo"
+  -code: 0
+  -file: "%sExceptionCasterTest.php"
+  -line: 28
+  trace: {
+    %s%eTests%eCaster%eExceptionCasterTest.php:28 {
+      Symfony\Component\VarDumper\Tests\Caster\ExceptionCasterTest->getTestException($msg, &$ref = null)
+      › {
+      ›     return new \Exception(''.$msg);
+      › }
+    }
+    %s%eTests%eCaster%eExceptionCasterTest.php:250 { …}
+%A
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $exceptionDetails);
+    }
 }
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
@@ -23,6 +23,7 @@
     "require-dev": {
         "ext-iconv": "*",
         "symfony/console": "^4.4|^5.0",
+        "symfony/error-handler": "^5.3",
         "symfony/process": "^4.4|^5.0",
         "twig/twig": "^2.4|^3.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,6 @@`
`175`	`175`	`],`
`176`	`176`	`"minimum-stability": "dev",`
`177`	`177`	`"extra": {`
`178`		`- "branch-version": "5.2"`
	`178`	`+ "branch-version": "5.x"`
`179`	`179`	`}`
`180`	`180`	`}`