call transaction callbacks after updating the transaction levels (#3…

…6890)
laravel · Apr 6, 2021 · 103261a · 103261a
1 parent 96334c9
commit 103261a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Concerns/ManagesTransactions.php b/src/Illuminate/Database/Concerns/ManagesTransactions.php
@@ -41,13 +41,13 @@ public function transaction(Closure $callback, $attempts = 1)
             }
 
             try {
-                if ($this->transactions == 1) {
+                $this->transactions = max(0, $this->transactions - 1);
+
+                if ($this->transactions == 0) {
                     $this->getPdo()->commit();
 
                     optional($this->transactionsManager)->commit($this->getName());
                 }
-
-                $this->transactions = max(0, $this->transactions - 1);
             } catch (Throwable $e) {
                 $this->handleCommitTransactionException(
                     $e, $currentAttempt, $attempts