[12.x] Fix: Correctly fallback to notification's connection/queue when using viaConnections/viaQueues (laravel#57625)

* fix: Ensure default connection fallback in `viaConnections` method

* fix: Ensure default queue fallback in `viaQueues` method

* test: Add tests for queued notifications with array and viaQueues

---------

Co-authored-by: Fatih Aydın <[email protected]>

Author: aydinfatih

src/Illuminate/Notifications/NotificationSender.php

@@ -232,13 +232,13 @@ protected function queueNotification($notifiables, $notification)
                 $connection = $notification->connection;
 
                 if (method_exists($notification, 'viaConnections')) {
-                    $connection = $notification->viaConnections()[$channel] ?? null;
+                    $connection = $notification->viaConnections()[$channel] ?? $connection;
                 }
 
                 $queue = $notification->queue;
 
                 if (method_exists($notification, 'viaQueues')) {
-                    $queue = $notification->viaQueues()[$channel] ?? null;
+                    $queue = $notification->viaQueues()[$channel] ?? $queue;
                 }
 
                 $delay = $notification->delay;

tests/Notifications/NotificationSenderTest.php

@@ -43,6 +43,31 @@ public function testItCanSendQueuedNotificationsWithAStringVia()
         $sender->send($notifiable, new DummyQueuedNotificationWithStringVia);
     }
 
+    public function testItCanSendQueuedNotificationsWithAnArrayVia()
+    {
+        $notifiable = m::mock(Notifiable::class);
+        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
+        $bus = m::mock(BusDispatcher::class);
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->queue === 'dummy' && $job->channels === ['database'] && $job->connection === 'redis';
+            });
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->queue === 'dummy' && $job->channels === ['mail'] && $job->connection === 'redis';
+            });
+
+        $events = m::mock(EventDispatcher::class);
+        $events->shouldReceive('listen')->once();
+
+        $sender = new NotificationSender($manager, $bus, $events);
+
+        $sender->send($notifiable, new DummyQueuedNotificationWithArrayVia);
+    }
+
     public function testItCanSendNotificationsWithAnEmptyStringVia()
     {
         $notifiable = new AnonymousNotifiable;
@@ -128,12 +153,12 @@ public function testItCanSendQueuedWithViaConnectionsNotifications()
         $bus->shouldReceive('dispatch')
             ->once()
             ->withArgs(function ($job) {
-                return $job->connection === 'sync' && $job->channels === ['database'];
+                return $job->connection === 'sync' && $job->channels === ['database'] && $job->queue === 'dummy';
             });
         $bus->shouldReceive('dispatch')
             ->once()
             ->withArgs(function ($job) {
-                return $job->connection === null && $job->channels === ['mail'];
+                return $job->connection === 'redis' && $job->channels === ['mail'] && $job->queue === 'dummy';
             });
 
         $events = m::mock(EventDispatcher::class);
@@ -144,6 +169,31 @@ public function testItCanSendQueuedWithViaConnectionsNotifications()
         $sender->send($notifiable, new DummyNotificationWithViaConnections);
     }
 
+    public function testItCanSendQueuedWithViaQueuesNotifications()
+    {
+        $notifiable = new AnonymousNotifiable;
+        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('getContainer')->andReturn(app());
+        $bus = m::mock(BusDispatcher::class);
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->queue === 'dummy' && $job->channels === ['database'] && $job->connection === 'redis';
+            });
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->queue === 'admin_notifications' && $job->channels === ['mail'] && $job->connection === 'redis';
+            });
+
+        $events = m::mock(EventDispatcher::class);
+        $events->shouldReceive('listen')->once();
+
+        $sender = new NotificationSender($manager, $bus, $events);
+
+        $sender->send($notifiable, new DummyNotificationWithViaQueues);
+    }
+
     public function testNotificationFailedSentWithoutHttpTransportException()
     {
         $this->expectException(TransportException::class);
@@ -184,6 +234,28 @@ public function via($notifiable)
     }
 }
 
+class DummyQueuedNotificationWithArrayVia extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct()
+    {
+        $this->connection = 'redis';
+        $this->queue = 'dummy';
+    }
+
+    /**
+     * Get the notification channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array|string
+     */
+    public function via($notifiable)
+    {
+        return ['mail', 'database'];
+    }
+}
+
 class DummyNotificationWithEmptyStringVia extends Notification
 {
     use Queueable;
@@ -220,6 +292,12 @@ class DummyNotificationWithViaConnections extends Notification implements Should
 {
     use Queueable;
 
+    public function __construct()
+    {
+        $this->connection = 'redis';
+        $this->queue = 'dummy';
+    }
+
     public function via($notifiable)
     {
         return ['mail', 'database'];
@@ -233,6 +311,29 @@ public function viaConnections()
     }
 }
 
+class DummyNotificationWithViaQueues extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct()
+    {
+        $this->connection = 'redis';
+        $this->queue = 'dummy';
+    }
+
+    public function via($notifiable)
+    {
+        return ['mail', 'database'];
+    }
+
+    public function viaQueues()
+    {
+        return [
+            'mail' => 'admin_notifications',
+        ];
+    }
+}
+
 class DummyNotificationWithMiddleware extends Notification implements ShouldQueue
 {
     use Queueable;