[10.x] Fix "after commit" callbacks not running on nested transactions

src/Illuminate/Database/Connection.php

@@ -1545,6 +1545,18 @@ public function unsetTransactionManager()
         $this->transactionsManager = null;
     }
 
+    /**
+     * Ignores the current transaction level when calling the callbacks.
+     *
+     * @return void
+     */
+    public function ignoreLatestTransactionForCallbacks()
+    {
+        $this->transactionsManager?->callbacksShouldIgnore(
+            $this->transactionsManager?->getTransactions()?->last()
+        );
+    }
+
     /**
      * Determine if the connection is in a "dry run".
      *

src/Illuminate/Database/DatabaseTransactionsManager.php

@@ -14,7 +14,7 @@ class DatabaseTransactionsManager
     /**
      * The database transaction that should be ignored by callbacks.
      *
-     * @var \Illuminate\Database\DatabaseTransactionRecord
+     * @var \Illuminate\Support\Collection
      */
     protected $callbacksShouldIgnore;
 
@@ -26,6 +26,7 @@ class DatabaseTransactionsManager
     public function __construct()
     {
         $this->transactions = collect();
+        $this->callbacksShouldIgnore = collect();
     }
 
     /**
@@ -56,7 +57,7 @@ public function rollback($connection, $level)
         )->values();
 
         if ($this->transactions->isEmpty()) {
-            $this->callbacksShouldIgnore = null;
+            $this->callbacksShouldIgnore = collect();
         }
     }
 
@@ -77,7 +78,7 @@ public function commit($connection)
         $forThisConnection->map->executeCallbacks();
 
         if ($this->transactions->isEmpty()) {
-            $this->callbacksShouldIgnore = null;
+            $this->callbacksShouldIgnore = collect();
         }
     }
 
@@ -104,7 +105,7 @@ public function addCallback($callback)
      */
     public function callbacksShouldIgnore(DatabaseTransactionRecord $transaction)
     {
-        $this->callbacksShouldIgnore = $transaction;
+        $this->callbacksShouldIgnore->push($transaction);
 
         return $this;
     }
@@ -117,7 +118,7 @@ public function callbacksShouldIgnore(DatabaseTransactionRecord $transaction)
     public function callbackApplicableTransactions()
     {
         return $this->transactions->reject(function ($transaction) {
-            return $transaction === $this->callbacksShouldIgnore;
+            return $this->callbacksShouldIgnore->contains($transaction);
         })->values();
     }
 

src/Illuminate/Database/Eloquent/Builder.php

@@ -1721,9 +1721,17 @@ public function withCasts($casts)
      */
     public function withSavepointIfNeeded(Closure $scope): mixed
     {
-        return $this->getQuery()->getConnection()->transactionLevel() > 0
-            ? $this->getQuery()->getConnection()->transaction($scope)
-            : $scope();
+        $connection = $this->getQuery()->getConnection();
+
+        if ($connection->transactionLevel() === 0) {
+            return $scope();
+        }
+
+        return $connection->transaction(function () use ($connection, $scope) {
+            $connection->ignoreLatestTransactionForCallbacks();
+
+            return $scope();
+        });
     }
 
     /**

src/Illuminate/Foundation/Testing/RefreshDatabase.php

@@ -98,9 +98,7 @@ public function beginDatabaseTransaction()
             $connection->setEventDispatcher($dispatcher);
 
             if ($this->app->resolved('db.transactions')) {
-                $this->app->make('db.transactions')->callbacksShouldIgnore(
-                    $this->app->make('db.transactions')->getTransactions()->first()
-                );
+                $connection->ignoreLatestTransactionForCallbacks();
             }
         }
 

tests/Integration/Database/EloquentTransactionUsingRefreshDatabaseTest.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Database;
+
+use Illuminate\Foundation\Auth\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Orchestra\Testbench\Concerns\WithLaravelMigrations;
+use Orchestra\Testbench\Factories\UserFactory;
+
+class EloquentTransactionUsingRefreshDatabaseTest extends DatabaseTestCase
+{
+    use RefreshDatabase, WithLaravelMigrations;
+
+    protected function setUp(): void
+    {
+        $this->afterApplicationCreated(fn () => User::unguard());
+        $this->beforeApplicationDestroyed(fn () => User::reguard());
+
+        parent::setUp();
+    }
+
+    public function testObserverIsCalledOnTestsWithAfterCommit()
+    {
+        User::observe($observer = EloquentTransactionUsingRefreshDatabaseUserObserver::resetting());
+
+        $user1 = User::create(UserFactory::new()->raw());
+
+        $this->assertTrue($user1->exists);
+        $this->assertEquals(1, $observer::$calledTimes, 'Failed to assert the observer was called once.');
+    }
+
+    public function testObserverCalledWithAfterCommitWhenInsideTransaction()
+    {
+        User::observe($observer = EloquentTransactionUsingRefreshDatabaseUserObserver::resetting());
+
+        $user1 = DB::transaction(fn () => User::create(UserFactory::new()->raw()));
+
+        $this->assertTrue($user1->exists);
+        $this->assertEquals(1, $observer::$calledTimes, 'Failed to assert the observer was called once.');
+    }
+
+    public function testObserverIsCalledOnTestsWithAfterCommitWhenUsingSavepoint()
+    {
+        User::observe($observer = EloquentTransactionUsingRefreshDatabaseUserObserver::resetting());
+
+        $user1 = User::createOrFirst(UserFactory::new()->raw());
+
+        $this->assertTrue($user1->exists);
+        $this->assertEquals(1, $observer::$calledTimes, 'Failed to assert the observer was called once.');
+    }
+
+    public function testObserverIsCalledOnTestsWithAfterCommitWhenUsingSavepointAndInsideTransaction()
+    {
+        User::observe($observer = EloquentTransactionUsingRefreshDatabaseUserObserver::resetting());
+
+        $user1 = DB::transaction(fn () => User::createOrFirst(UserFactory::new()->raw()));
+
+        $this->assertTrue($user1->exists);
+        $this->assertEquals(1, $observer::$calledTimes, 'Failed to assert the observer was called once.');
+    }
+}
+
+class EloquentTransactionUsingRefreshDatabaseUserObserver
+{
+    public static $calledTimes = 0;
+
+    public $afterCommit = true;
+
+    public static function resetting()
+    {
+        static::$calledTimes = 0;
+
+        return new static();
+    }
+
+    public function created($user)
+    {
+        static::$calledTimes++;
+    }
+}