Match doc of exception handler contract and its implementations (#30920)

laravel · Dec 24, 2019 · 61ea9fc · 61ea9fc
1 parent 7924520
commit 61ea9fc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/Illuminate/Contracts/Debug/ExceptionHandler.php b/src/Illuminate/Contracts/Debug/ExceptionHandler.php
@@ -11,6 +11,8 @@ interface ExceptionHandler
      *
      * @param  \Exception  $e
      * @return void
+     *
+     * @throws \Exception
      */
     public function report(Exception $e);
 
@@ -28,6 +30,8 @@ public function shouldReport(Exception $e);
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $e
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $e);
 

diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -93,7 +93,7 @@ public function __construct(Container $container)
      * Report or log an exception.
      *
      * @param  \Exception  $e
-     * @return mixed
+     * @return void
      *
      * @throws \Exception
      */
@@ -178,11 +178,13 @@ protected function context()
     }
 
     /**
-     * Render an exception into a response.
+     * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $e
-     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $e)
     {

diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php
@@ -82,10 +82,12 @@ public function __construct($originalHandler, $except = [])
             }
 
             /**
-             * Report the given exception.
+             * Report or log an exception.
              *
              * @param  \Exception  $e
              * @return void
+             *
+             * @throws \Exception
              */
             public function report(Exception $e)
             {
@@ -104,13 +106,12 @@ public function shouldReport(Exception $e)
             }
 
             /**
-             * Render the given exception.
+             * Render an exception into an HTTP response.
              *
              * @param  \Illuminate\Http\Request  $request
              * @param  \Exception  $e
-             * @return mixed
+             * @return \Symfony\Component\HttpFoundation\Response
              *
-             * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
              * @throws \Exception
              */
             public function render($request, Exception $e)
@@ -131,7 +132,7 @@ public function render($request, Exception $e)
             }
 
             /**
-             * Render the exception for the console.
+             * Render an exception to the console.
              *
              * @param  \Symfony\Component\Console\Output\OutputInterface  $output
              * @param  \Exception  $e