laravel · Orrison · Jun 6, 2025 · Jun 6, 2025 · Jun 6, 2025
diff --git a/src/Illuminate/Notifications/NotificationSender.php b/src/Illuminate/Notifications/NotificationSender.php
@@ -249,7 +249,11 @@ protected function queueNotification($notifiables, $notification)
                }

                $this->bus->dispatch(
-                    (new SendQueuedNotifications($notifiable, $notification, [$channel]))
+                    $this->manager->getContainer()->make(SendQueuedNotifications::class, [
+                        'notifiables' => $notifiable,
+                        'notification' => $notification,
+                        'channels' => [$channel],
+                    ])
                        ->onConnection($connection)
                        ->onQueue($queue)
                        ->delay(is_array($delay) ? ($delay[$channel] ?? null) : $delay)

diff --git a/tests/Notifications/NotificationChannelManagerTest.php b/tests/Notifications/NotificationChannelManagerTest.php
@@ -15,6 +15,8 @@
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Notifications\SendQueuedNotifications;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -159,6 +161,26 @@ public function testNotificationCanBeQueued()

        $manager->send([new NotificationChannelManagerTestNotifiable], new NotificationChannelManagerTestQueuedNotification);
    }
+
+    public function testSendQueuedNotificationsCanBeOverrideViaContainer()
+    {
+        $container = new Container;
+        $container->instance('config', ['app.name' => 'Name', 'app.logo' => 'Logo']);
+        $container->instance(Dispatcher::class, $events = m::mock());
+        $container->instance(Bus::class, $bus = m::mock());
+        $bus->shouldReceive('dispatch')->with(m::type(TestSendQueuedNotifications::class));
+        $container->bind(SendQueuedNotifications::class, TestSendQueuedNotifications::class);
+        Container::setInstance($container);
+        $manager = m::mock(ChannelManager::class.'[driver]', [$container]);
+        $events->shouldReceive('listen')->once();
+
+        $manager->send([new NotificationChannelManagerTestNotifiable], new NotificationChannelManagerTestQueuedNotification);
+    }
+}
+
+class TestSendQueuedNotifications implements ShouldQueue
+{
+    use InteractsWithQueue, Queueable, SerializesModels;
 }

 class NotificationChannelManagerTestNotifiable

diff --git a/tests/Notifications/NotificationSenderTest.php b/tests/Notifications/NotificationSenderTest.php
@@ -27,6 +27,7 @@ public function testItCanSendQueuedNotificationsWithAStringVia()
    {
        $notifiable = m::mock(Notifiable::class);
        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
        $bus = m::mock(BusDispatcher::class);
        $bus->shouldReceive('dispatch');
        $events = m::mock(EventDispatcher::class);
@@ -55,6 +56,7 @@ public function testItCannotSendNotificationsViaDatabaseForAnonymousNotifiables(
    {
        $notifiable = new AnonymousNotifiable;
        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
        $bus = m::mock(BusDispatcher::class);
        $bus->shouldNotReceive('dispatch');
        $events = m::mock(EventDispatcher::class);
@@ -76,6 +78,7 @@ public function testItCanSendQueuedNotificationsThroughMiddleware()
            });
        $events = m::mock(EventDispatcher::class);
        $events->shouldReceive('listen')->once();
+        $manager->shouldReceive('getContainer')->andReturn(app());

        $sender = new NotificationSender($manager, $bus, $events);

@@ -86,6 +89,7 @@ public function testItCanSendQueuedMultiChannelNotificationsThroughDifferentMidd
    {
        $notifiable = m::mock(Notifiable::class);
        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
        $bus = m::mock(BusDispatcher::class);
        $bus->shouldReceive('dispatch')
            ->once()
@@ -114,6 +118,7 @@ public function testItCanSendQueuedWithViaConnectionsNotifications()
    {
        $notifiable = new AnonymousNotifiable;
        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
        $bus = m::mock(BusDispatcher::class);
        $bus->shouldReceive('dispatch')
            ->once()