handle exceptions in batch callbacks (#38327)

laravel · Aug 10, 2021 · 2f44389 · 2f44389
1 parent 7b88554
commit 2f44389
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Illuminate/Bus/Batch.php b/src/Illuminate/Bus/Batch.php
@@ -427,9 +427,15 @@ public function delete()
      */
     protected function invokeHandlerCallback($handler, Batch $batch, Throwable $e = null)
     {
-        return $handler instanceof SerializableClosure
-                    ? $handler->__invoke($batch, $e)
-                    : call_user_func($handler, $batch, $e);
+        try {
+            return $handler instanceof SerializableClosure
+                ? $handler->__invoke($batch, $e)
+                : call_user_func($handler, $batch, $e);
+        } catch (Throwable $e) {
+            if (function_exists('report')) {
+                report($e);
+            }
+        }
     }
 
     /**