feat: Add a callback to be called on transaction failure

src/Illuminate/Database/Concerns/ManagesTransactions.php

@@ -16,11 +16,12 @@ trait ManagesTransactions
      *
      * @param  (\Closure(static): TReturn)  $callback
      * @param  int  $attempts
+     * @param  Closure|null  $onFailure
      * @return TReturn
      *
      * @throws \Throwable
      */
-    public function transaction(Closure $callback, $attempts = 1)
+    public function transaction(Closure $callback, $attempts = 1, ?Closure $onFailure = null)
     {
         for ($currentAttempt = 1; $currentAttempt <= $attempts; $currentAttempt++) {
             $this->beginTransaction();
@@ -37,7 +38,7 @@ public function transaction(Closure $callback, $attempts = 1)
             // exception back out, and let the developer handle an uncaught exception.
             catch (Throwable $e) {
                 $this->handleTransactionException(
-                    $e, $currentAttempt, $attempts
+                    $e, $currentAttempt, $attempts, $onFailure
                 );
 
                 continue;
@@ -78,11 +79,12 @@ public function transaction(Closure $callback, $attempts = 1)
      * @param  \Throwable  $e
      * @param  int  $currentAttempt
      * @param  int  $maxAttempts
+     * @param Closure|null $onFailure
      * @return void
      *
      * @throws \Throwable
      */
-    protected function handleTransactionException(Throwable $e, $currentAttempt, $maxAttempts)
+    protected function handleTransactionException(Throwable $e, $currentAttempt, $maxAttempts, ?Closure $onFailure)
     {
         // On a deadlock, MySQL rolls back the entire transaction so we can't just
         // retry the query. We have to throw this exception all the way out and
@@ -108,6 +110,10 @@ protected function handleTransactionException(Throwable $e, $currentAttempt, $ma
             return;
         }
 
+        if ($onFailure !== null) {
+            $onFailure($e);
+        }
+
         throw $e;
     }
 

src/Illuminate/Database/ConnectionInterface.php

@@ -131,11 +131,12 @@ public function prepareBindings(array $bindings);
      *
      * @param  \Closure  $callback
      * @param  int  $attempts
+     * @param  Closure|null  $onFailure
      * @return mixed
      *
      * @throws \Throwable
      */
-    public function transaction(Closure $callback, $attempts = 1);
+    public function transaction(Closure $callback, $attempts = 1, ?Closure $onFailure = null);
 
     /**
      * Start a new database transaction.

src/Illuminate/Database/SqlServerConnection.php

@@ -27,15 +27,16 @@ public function getDriverTitle()
      *
      * @param  \Closure  $callback
      * @param  int  $attempts
+     * @param  Closure|null  $onFailure
      * @return mixed
      *
      * @throws \Throwable
      */
-    public function transaction(Closure $callback, $attempts = 1)
+    public function transaction(Closure $callback, $attempts = 1, ?Closure $onFailure = null)
     {
         for ($a = 1; $a <= $attempts; $a++) {
             if ($this->getDriverName() === 'sqlsrv') {
-                return parent::transaction($callback, $attempts);
+                return parent::transaction($callback, $attempts, $onFailure);
             }
 
             $this->getPdo()->exec('BEGIN TRAN');
@@ -55,6 +56,10 @@ public function transaction(Closure $callback, $attempts = 1)
             catch (Throwable $e) {
                 $this->getPdo()->exec('ROLLBACK TRAN');
 
+                if ($a === $attempts && $onFailure !== null) {
+                    $onFailure($e);
+                }
+
                 throw $e;
             }
 

tests/Integration/Database/DatabaseTransactionsTest.php

@@ -105,6 +105,42 @@ public function testTransactionsDoNotAffectDifferentConnections()
         $this->assertTrue($secondObject->ran);
         $this->assertFalse($thirdObject->ran);
     }
+
+    public function testOnErrorCallbackIsCalled()
+    {
+        $executed = false;
+        try {
+            DB::transaction(function () {
+                throw new \Exception;
+            }, 1, function () use (&$executed) {
+                $executed = true;
+            });
+        } catch (\Throwable) {
+            // Ignore the exception
+        }
+
+        $this->assertTrue($executed);
+    }
+
+    public function testOnErrorCallbackIsCalledWithDeadlockRetry()
+    {
+        $executed = false;
+        $attempts = 0;
+
+        try {
+            DB::transaction(function () use (&$attempts) {
+                $attempts += 1;
+                throw new \Exception('has been chosen as the deadlock victim');
+            }, 3, function () use (&$executed) {
+                $executed = true;
+            });
+        } catch (\Throwable) {
+            // Ignore the exception
+        }
+
+        $this->assertSame(3, $attempts);
+        $this->assertTrue($executed);
+    }
 }
 
 class TestObjectForTransactions