rework broadcast message

laravel · Dec 21, 2016 · 40f30f1 · 40f30f1
1 parent feac7dd
commit 40f30f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/src/Illuminate/Notifications/Channels/BroadcastChannel.php b/src/Illuminate/Notifications/Channels/BroadcastChannel.php
@@ -44,7 +44,8 @@ public function send($notifiable, Notification $notification)
         );
 
         if ($message instanceof BroadcastMessage) {
-            $event->connection = 'sync';
+            $event->onConnection($message->connection)
+                  ->onQueue($message->queue);
         }
 
         return $this->events->fire($event);

diff --git a/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -2,13 +2,14 @@
 
 namespace Illuminate\Notifications\Events;
 
+use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class BroadcastNotificationCreated implements ShouldBroadcast
 {
-    use SerializesModels;
+    use Queueable, SerializesModels;
 
     /**
      * The notifiable entity who received the notification.

diff --git a/src/Illuminate/Notifications/Messages/BroadcastMessage.php b/src/Illuminate/Notifications/Messages/BroadcastMessage.php
@@ -2,22 +2,19 @@
 
 namespace Illuminate\Notifications\Messages;
 
+use Illuminate\Bus\Queueable;
+
 class BroadcastMessage
 {
+    use Queueable;
+
     /**
      * The data for the notification.
      *
      * @var array
      */
     public $data;
 
-    /**
-     * Determine if the message should be broadcasted immediately.
-     *
-     * @var array
-     */
-    public $broadcastNow = false;
-
     /**
      * Create a new message instance.
      *
@@ -41,16 +38,4 @@ public function data($data)
 
         return $this;
     }
-
-    /**
-     * Broadcast this message immediately.
-     *
-     * @return $this
-     */
-    public function now()
-    {
-        $this->broadcastNow = true;
-
-        return $this;
-    }
 }
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -83,6 +83,6 @@ public function toArray($notifiable)
 
     public function toBroadcast()
     {
-        return (new \Illuminate\Notifications\Messages\BroadcastMessage([]))->now();
+        return (new \Illuminate\Notifications\Messages\BroadcastMessage([]))->onConnection('sync');
     }
 }