push failing test

src/Illuminate/Database/DatabaseTransactionsManager.php

@@ -49,13 +49,14 @@ public function begin($connection, $level)
      * Rollback the active database transaction.
      *
      * @param  string  $connection
-     * @param  int  $level
+     * @param  int  $newTransactionLevel
      * @return void
      */
-    public function rollback($connection, $level)
+    public function rollback($connection, $newTransactionLevel)
     {
         $this->pendingTransactions = $this->pendingTransactions->reject(
-            fn ($transaction) => $transaction->connection == $connection && $transaction->level > $level
+            fn ($transaction) => $transaction->connection == $connection &&
+                                 $transaction->level > $newTransactionLevel
         )->values();
     }
 
@@ -95,18 +96,21 @@ public function addCallback($callback)
      * Move relevant pending transactions to a committed state.
      *
      * @param  string  $connection
+     * @param  int  $levelBeingCommitted
      * @return void
      */
-    public function stageTransactions($connection, $level)
+    public function stageTransactions($connection, $levelBeingCommitted)
     {
         $this->committedTransactions = $this->committedTransactions->merge(
             $this->pendingTransactions->filter(
-                fn ($transaction) => $transaction->connection === $connection && $transaction->level >= $level
+                fn ($transaction) => $transaction->connection === $connection &&
+                                     $transaction->level >= $levelBeingCommitted
             )
         );
 
         $this->pendingTransactions = $this->pendingTransactions->reject(
-            fn ($transaction) => $transaction->connection === $connection && $transaction->level >= $level
+            fn ($transaction) => $transaction->connection === $connection &&
+                                 $transaction->level >= $levelBeingCommitted
         );
     }
 

tests/Integration/Events/ShouldDispatchAfterCommitEventTest.php

@@ -146,6 +146,30 @@ public function testItDoesNotDispatchAfterCommitEventsImmediatelyIfASiblingTrans
 
         $this->assertTrue(ShouldDispatchAfterCommitTestEvent::$ran);
     }
+
+    public function testChildEventsAreNotDispatchedIfParentTransactionFails()
+    {
+        Event::listen(ShouldDispatchAfterCommitTestEvent::class, ShouldDispatchAfterCommitListener::class);
+
+        try {
+            DB::transaction(function () {
+                DB::transaction(function () {
+                    Event::dispatch(new ShouldDispatchAfterCommitTestEvent);
+                });
+
+                $this->assertFalse(ShouldDispatchAfterCommitTestEvent::$ran);
+
+                throw new \Exception;
+            });
+        } catch (\Exception $e) {
+            //
+        }
+
+        DB::transaction(fn () => true);
+
+        // Should not have ran because parent transaction failed...
+        $this->assertFalse(ShouldDispatchAfterCommitTestEvent::$ran);
+    }
 }
 
 class TransactionUnawareTestEvent