added ability to set middleware based on notifiable instance and channel (#44767)

* added ability to set middleware based on notifiable instance and channel

* fixed style issues

* Update NotificationSender.php

Co-authored-by: Taylor Otwell <[email protected]>

Author: AndrewMonty

src/Illuminate/Notifications/NotificationSender.php

@@ -211,17 +211,21 @@ protected function queueNotification($notifiables, $notification)
                     $delay = $notification->withDelay($notifiable, $channel) ?? null;
                 }
 
+                $middleware = $notification->middleware ?? [];
+
+                if (method_exists($notification, 'middleware')) {
+                    $middleware = array_merge(
+                        $notification->middleware($notifiable, $channel),
+                        $middleware
+                    );
+                }
+
                 $this->bus->dispatch(
                     (new SendQueuedNotifications($notifiable, $notification, [$channel]))
                             ->onConnection($notification->connection)
                             ->onQueue($queue)
                             ->delay(is_array($delay) ? ($delay[$channel] ?? null) : $delay)
-                            ->through(
-                                array_merge(
-                                    method_exists($notification, 'middleware') ? $notification->middleware() : [],
-                                    $notification->middleware ?? []
-                                )
-                            )
+                            ->through($middleware)
                 );
             }
         }

tests/Notifications/NotificationSenderTest.php

@@ -61,6 +61,49 @@ public function testItCannotSendNotificationsViaDatabaseForAnonymousNotifiables(
 
         $sender->sendNow($notifiable, new DummyNotificationWithDatabaseVia);
     }
+
+    public function testItCanSendQueuedNotificationsThroughMiddleware()
+    {
+        $notifiable = m::mock(Notifiable::class);
+        $manager = m::mock(ChannelManager::class);
+        $bus = m::mock(BusDispatcher::class);
+        $bus->shouldReceive('dispatch')
+            ->withArgs(function ($job) {
+                return $job->middleware[0] instanceof TestNotificationMiddleware;
+            });
+        $events = m::mock(EventDispatcher::class);
+
+        $sender = new NotificationSender($manager, $bus, $events);
+
+        $sender->send($notifiable, new DummyNotificationWithMiddleware);
+    }
+
+    public function testItCanSendQueuedMultiChannelNotificationsThroughDifferentMiddleware()
+    {
+        $notifiable = m::mock(Notifiable::class);
+        $manager = m::mock(ChannelManager::class);
+        $bus = m::mock(BusDispatcher::class);
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->middleware[0] instanceof TestMailNotificationMiddleware;
+            });
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return $job->middleware[0] instanceof TestDatabaseNotificationMiddleware;
+            });
+        $bus->shouldReceive('dispatch')
+            ->once()
+            ->withArgs(function ($job) {
+                return empty($job->middleware);
+            });
+        $events = m::mock(EventDispatcher::class);
+
+        $sender = new NotificationSender($manager, $bus, $events);
+
+        $sender->send($notifiable, new DummyMultiChannelNotificationWithConditionalMiddlware);
+    }
 }
 
 class DummyQueuedNotificationWithStringVia extends Notification implements ShouldQueue
@@ -110,3 +153,67 @@ public function via($notifiable)
         return 'database';
     }
 }
+
+class DummyNotificationWithMiddleware extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function via($notifiable)
+    {
+        return 'mail';
+    }
+
+    public function middleware()
+    {
+        return [
+            new TestNotificationMiddleware,
+        ];
+    }
+}
+
+class DummyMultiChannelNotificationWithConditionalMiddlware extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function via($notifiable)
+    {
+        return [
+            'mail',
+            'database',
+            'broadcast',
+        ];
+    }
+
+    public function middleware($notifiable, $channel)
+    {
+        return match ($channel) {
+            'mail' => [new TestMailNotificationMiddleware],
+            'database' => [new TestDatabaseNotificationMiddleware],
+            default => []
+        };
+    }
+}
+
+class TestNotificationMiddleware
+{
+    public function handle($command, $next)
+    {
+        return $next($command);
+    }
+}
+
+class TestMailNotificationMiddleware
+{
+    public function handle($command, $next)
+    {
+        return $next($command);
+    }
+}
+
+class TestDatabaseNotificationMiddleware
+{
+    public function handle($command, $next)
+    {
+        return $next($command);
+    }
+}