update NotificationFake.php

laravel · Jan 14, 2024 · 8340930 · 8340930
1 parent d14cb38
commit 8340930
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Illuminate/Support/Testing/Fakes/NotificationFake.php b/src/Illuminate/Support/Testing/Fakes/NotificationFake.php
@@ -6,6 +6,7 @@
 use Exception;
 use Illuminate\Contracts\Notifications\Dispatcher as NotificationDispatcher;
 use Illuminate\Contracts\Notifications\Factory as NotificationFactory;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Notifications\AnonymousNotifiable;
 use Illuminate\Support\Collection;
@@ -454,6 +455,10 @@ protected function queuedNotificationsFor($notifiable, $notification)
      */
     public function send($notifiables, $notification)
     {
+        if ($notification instanceof ShouldQueue) {
+            return $this->queue($notifiables, $notification);
+        }
+
         $this->sendNow($notifiables, $notification);
     }
 
@@ -507,10 +512,9 @@ public function sendNow($notifiables, $notification, array $channels = null)
      *
      * @param  \Illuminate\Support\Collection|array|mixed  $notifiables
      * @param  mixed  $notification
-     * @param  array|null  $channels
      * @return void
      */
-    protected function queue($notifiables, $notification, array $channels = null)
+    protected function queue($notifiables, $notification)
     {
         if (! $notifiables instanceof Collection && ! is_array($notifiables)) {
             $notifiables = [$notifiables];
@@ -521,22 +525,15 @@ protected function queue($notifiables, $notification, array $channels = null)
                 $notification->id = Str::uuid()->toString();
             }
 
-            $notifiableChannels = $channels ?: $notification->via($notifiable);
-
             if (method_exists($notification, 'shouldSend')) {
                 $notifiableChannels = array_filter(
                     $notifiableChannels,
                     fn ($channel) => $notification->shouldSend($notifiable, $channel) !== false
                 );
             }
 
-            if (empty($notifiableChannels)) {
-                continue;
-            }
-
             $this->queuedNotifications[get_class($notifiable)][$notifiable->getKey()][get_class($notification)][] = [
                 'notification' => $notification,
-                'channels' => $notifiableChannels,
                 'notifiable' => $notifiable,
                 'locale' => $notification->locale ?? $this->locale ?? value(function () use ($notifiable) {
                     if ($notifiable instanceof HasLocalePreference) {