revert on failure

Author: taylorotwell

src/Illuminate/Database/Concerns/ManagesTransactions.php

@@ -38,7 +38,7 @@ public function transaction(Closure $callback, $attempts = 1, ?Closure $onFailur
             // exception back out, and let the developer handle an uncaught exception.
             catch (Throwable $e) {
                 $this->handleTransactionException(
-                    $e, $currentAttempt, $attempts, $onFailure
+                    $e, $currentAttempt, $attempts
                 );
 
                 continue;
@@ -79,12 +79,11 @@ public function transaction(Closure $callback, $attempts = 1, ?Closure $onFailur
      * @param  \Throwable  $e
      * @param  int  $currentAttempt
      * @param  int  $maxAttempts
-     * @param  Closure|null  $onFailure
      * @return void
      *
      * @throws \Throwable
      */
-    protected function handleTransactionException(Throwable $e, $currentAttempt, $maxAttempts, ?Closure $onFailure)
+    protected function handleTransactionException(Throwable $e, $currentAttempt, $maxAttempts)
     {
         // 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
@@ -110,10 +109,6 @@ protected function handleTransactionException(Throwable $e, $currentAttempt, $ma
             return;
         }
 
-        if ($onFailure !== null) {
-            $onFailure($e);
-        }
-
         throw $e;
     }
 

src/Illuminate/Database/ConnectionInterface.php

@@ -131,12 +131,11 @@ 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, ?Closure $onFailure = null);
+    public function transaction(Closure $callback, $attempts = 1);
 
     /**
      * Start a new database transaction.

src/Illuminate/Database/SqlServerConnection.php

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

tests/Integration/Database/DatabaseTransactionsTest.php

@@ -105,42 +105,6 @@ 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