bug #41760 [ErrorHandler] fix handling buffered SilencedErrorContext (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 119b3ec26e57 · 2021-06-24T09:57:22.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [ErrorHandler] fix handling buffered SilencedErrorContext | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41745 | License | MIT | Doc PR | - Commits ------- 07407c7 [ErrorHandler] fix handling buffered SilencedErrorContext
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/logs.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/logs.html.php
@@ -17,7 +17,7 @@
             $status = 'warning';
         } else {
             $severity = 0;
-            if (($exception = $log['context']['exception'] ?? null) instanceof \ErrorException) {
+            if (($exception = $log['context']['exception'] ?? null) instanceof \ErrorException || $exception instanceof \Symfony\Component\ErrorHandler\Exception\SilencedErrorContext) {
                 $severity = $exception->getSeverity();
             }
             $status = \E_DEPRECATED === $severity || \E_USER_DEPRECATED === $severity ? 'warning' : 'normal';
diff --git a/src/Symfony/Component/ErrorHandler/ThrowableUtils.php b/src/Symfony/Component/ErrorHandler/ThrowableUtils.php
@@ -11,14 +11,19 @@
 
 namespace Symfony\Component\ErrorHandler;
 
+use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;
+
 /**
  * @internal
  */
 class ThrowableUtils
 {
-    public static function getSeverity(\Throwable $throwable): int
+    /**
+     * @param SilencedErrorContext|\Throwable
+     */
+    public static function getSeverity($throwable): int
     {
-        if ($throwable instanceof \ErrorException) {
+        if ($throwable instanceof \ErrorException || $throwable instanceof SilencedErrorContext) {
             return $throwable->getSeverity();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`$status = 'warning';`
`18`	`18`	`} else {`
`19`	`19`	`$severity = 0;`
`20`		`- if (($exception = $log['context']['exception'] ?? null) instanceof \ErrorException) {`
	`20`	`+ if (($exception = $log['context']['exception'] ?? null) instanceof \ErrorException \|\| $exception instanceof \Symfony\Component\ErrorHandler\Exception\SilencedErrorContext) {`
`21`	`21`	`$severity = $exception->getSeverity();`
`22`	`22`	`}`
`23`	`23`	`$status = \E_DEPRECATED === $severity \|\| \E_USER_DEPRECATED === $severity ? 'warning' : 'normal';`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,19 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\ErrorHandler;`
`13`	`13`
	`14`	`+use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @internal`
`16`	`18`	`*/`
`17`	`19`	`class ThrowableUtils`
`18`	`20`	`{`
`19`		`- public static function getSeverity(\Throwable $throwable): int`
	`21`	`+ /**`
	`22`	`+ * @param SilencedErrorContext\|\Throwable`
	`23`	`+ */`
	`24`	`+ public static function getSeverity($throwable): int`
`20`	`25`	`{`
`21`		`- if ($throwable instanceof \ErrorException) {`
	`26`	`+ if ($throwable instanceof \ErrorException \|\| $throwable instanceof SilencedErrorContext) {`
`22`	`27`	`return $throwable->getSeverity();`
`23`	`28`	`}`
`24`	`29`