[6.x] Fix report method for ViewException (#36110)

* Fix report method for ViewException * Update ViewException.php * Apply fixes from StyleCI (#36111)
laravel · Feb 1, 2021 · 8182329 · 8182329
1 parent 0966a30
commit 8182329
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
@@ -9,7 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {

diff --git a/src/Illuminate/Foundation/Console/stubs/exception-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-report.stub
@@ -9,7 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {

diff --git a/src/Illuminate/View/ViewException.php b/src/Illuminate/View/ViewException.php
@@ -3,21 +3,25 @@
 namespace Illuminate\View;
 
 use ErrorException;
+use Illuminate\Container\Container;
+use Illuminate\Support\Reflector;
 
 class ViewException extends ErrorException
 {
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {
         $exception = $this->getPrevious();
 
-        if ($exception && method_exists($exception, 'report')) {
-            $exception->report();
+        if (Reflector::isCallable($reportCallable = [$exception, 'report'])) {
+            return Container::getInstance()->call($reportCallable);
         }
+
+        return false;
     }
 
     /**