Fix throwable error on exception controller (#2093)

* fix(throwable): fix ExceptionController

* style: remove tabulation

Author: baiiko

Controller/ExceptionController.php

@@ -65,7 +65,12 @@ public function __construct(
     public function showAction(Request $request, $exception, DebugLoggerInterface $logger = null)
     {
         $currentContent = $this->getAndCleanOutputBuffering($request->headers->get('X-Php-Ob-Level', -1));
-        $code = $this->getStatusCode($exception);
+
+        if ($exception instanceof \Exception) {
+            $code = $this->getStatusCode($exception);
+        } else {
+            $code = $this->getStatusCodeFromThrowable($exception);
+        }
         $templateData = $this->getTemplateData($currentContent, $code, $exception, $logger);
 
         $view = $this->createView($exception, $code, $templateData, $request, $this->showException);
@@ -101,17 +106,7 @@ protected function createView(\Exception $exception, $code, array $templateData,
      */
     protected function getStatusCode(\Exception $exception)
     {
-        // If matched
-        if ($statusCode = $this->exceptionCodes->resolveException($exception)) {
-            return $statusCode;
-        }
-
-        // Otherwise, default
-        if ($exception instanceof HttpExceptionInterface) {
-            return $exception->getStatusCode();
-        }
-
-        return 500;
+        return $this->getStatusCodeFromThrowable($exception);
     }
 
     /**
@@ -159,4 +154,26 @@ private function getAndCleanOutputBuffering($startObLevel)
 
         return ob_get_clean();
     }
+
+    /**
+     * Determines the status code to use for the response.
+     *
+     * @param \Throwable $exception
+     *
+     * @return int
+     */
+    private function getStatusCodeFromThrowable(\Throwable $exception)
+    {
+        // If matched
+        if ($statusCode = $this->exceptionCodes->resolveThrowable($exception)) {
+            return $statusCode;
+        }
+
+        // Otherwise, default
+        if ($exception instanceof HttpExceptionInterface) {
+            return $exception->getStatusCode();
+        }
+
+        return 500;
+    }
 }

Util/ExceptionValueMap.php

@@ -44,6 +44,18 @@ public function __construct(array $map)
      * @return mixed|false Value found or false is not found
      */
     public function resolveException(\Exception $exception)
+    {
+        return $this->resolveThrowable($exception);
+    }
+
+    /**
+     * Resolves the value corresponding to an exception object.
+     *
+     * @param \Throwable $exception
+     *
+     * @return mixed|false Value found or false is not found
+     */
+    public function resolveThrowable(\Throwable $exception)
     {
         return $this->doResolveClass(get_class($exception));
     }