Merge pull request #1477 from xabbuh/drop-exception-type-hint

GuilhemN · GuilhemN · commit 14b237a8a8dc · 2016-05-15T16:01:35.000+02:00
remove \Exception type hint
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -54,14 +54,14 @@ public function __construct(
      * Converts an Exception to a Response.
      *
      * @param Request                   $request
-     * @param \Exception                $exception
+     * @param \Exception|\Throwable     $exception
      * @param DebugLoggerInterface|null $logger
      *
      * @throws \InvalidArgumentException
      *
      * @return Response
      */
-    public function showAction(Request $request, \Exception $exception, DebugLoggerInterface $logger = null)
+    public function showAction(Request $request, $exception, DebugLoggerInterface $logger = null)
     {
         $currentContent = $this->getAndCleanOutputBuffering($request->headers->get('X-Php-Ob-Level', -1));
         $code = $this->getStatusCode($exception);

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ public function __construct(`
`54`	`54`	`* Converts an Exception to a Response.`
`55`	`55`	`*`
`56`	`56`	`* @param Request $request`
`57`		`- * @param \Exception $exception`
	`57`	`+ * @param \Exception\|\Throwable $exception`
`58`	`58`	`* @param DebugLoggerInterface\|null $logger`
`59`	`59`	`*`
`60`	`60`	`* @throws \InvalidArgumentException`
`61`	`61`	`*`
`62`	`62`	`* @return Response`
`63`	`63`	`*/`
`64`		`- public function showAction(Request $request, \Exception $exception, DebugLoggerInterface $logger = null)`
	`64`	`+ public function showAction(Request $request, $exception, DebugLoggerInterface $logger = null)`
`65`	`65`	`{`
`66`	`66`	`$currentContent = $this->getAndCleanOutputBuffering($request->headers->get('X-Php-Ob-Level', -1));`
`67`	`67`	`$code = $this->getStatusCode($exception);`