bug symfony#12553 [Debug] fix error message on double exception (nicolas-grekas)

fabpot · fabpot · commit efbf588ed048 · 2014-11-28T10:40:13.000+01:00
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes symfony#12553). Discussion ---------- [Debug] fix error message on double exception | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 1ed7606 [Debug] fix error message on double exception
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -169,7 +169,7 @@ public function getContent(FlattenException $exception)
             } catch (\Exception $e) {
                 // something nasty happened and we cannot throw an exception anymore
                 if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($exception), $exception->getMessage());
+                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage());
                 } else {
                     $title = 'Whoops, looks like something went wrong.';
                 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public function getContent(FlattenException $exception)`
`169`	`169`	`} catch (\Exception $e) {`
`170`	`170`	`// something nasty happened and we cannot throw an exception anymore`
`171`	`171`	`if ($this->debug) {`
`172`		`- $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($exception), $exception->getMessage());`
	`172`	`+ $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage());`
`173`	`173`	`} else {`
`174`	`174`	`$title = 'Whoops, looks like something went wrong.';`
`175`	`175`	`}`