[11.x] Add Illuminate\Bus\BatchRepository::rollBack() contract. (#4…

…9176) Introduced #48961 (minor release for Laravel 10). Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Nov 29, 2023 · 059759a · 059759a
1 parent 8725dff
commit 059759a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/Illuminate/Bus/BatchRepository.php b/src/Illuminate/Bus/BatchRepository.php
@@ -4,9 +4,6 @@
 
 use Closure;
 
-/**
- * @method void rollBack()
- */
 interface BatchRepository
 {
     /**
@@ -92,4 +89,11 @@ public function delete(string $batchId);
      * @return mixed
      */
     public function transaction(Closure $callback);
+
+    /**
+     * Rollback the last database transaction for the connection.
+     *
+     * @return void
+     */
+    public function rollBack();
 }
diff --git a/src/Illuminate/Queue/Jobs/Job.php b/src/Illuminate/Queue/Jobs/Job.php
@@ -197,12 +197,10 @@ public function fail($e = null)
             in_array(Batchable::class, class_uses_recursive($commandName))) {
             $batchRepository = $this->resolve(BatchRepository::class);
 
-            if (method_exists($batchRepository, 'rollBack')) {
-                try {
-                    $batchRepository->rollBack();
-                } catch (Throwable $e) {
-                    // ...
-                }
+            try {
+                $batchRepository->rollBack();
+            } catch (Throwable $e) {
+                // ...
             }
         }
 

diff --git a/src/Illuminate/Support/Testing/Fakes/BatchRepositoryFake.php b/src/Illuminate/Support/Testing/Fakes/BatchRepositoryFake.php
@@ -150,4 +150,14 @@ public function transaction(Closure $callback)
     {
         return $callback();
     }
+
+    /**
+     * Rollback the last database transaction for the connection.
+     *
+     * @return void
+     */
+    public function rollBack()
+    {
+        //
+    }
 }