[8.x] Allow custom broadcastWith in notification broadcast channel (#…

…35142) * Allow custom broadcastWith in notification broadcast channel * Fixed style * Fixed style
laravel · Nov 7, 2020 · a9af73f · a9af73f
1 parent d1a52d4
commit a9af73f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -92,6 +92,10 @@ protected function channelName()
      */
     public function broadcastWith()
     {
+        if (method_exists($this->notification, 'broadcastWith')) {
+            return $this->notification->broadcastWith();
+        }
+
         return array_merge($this->data, [
             'id' => $this->notification->id,
             'type' => $this->broadcastType(),

diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -88,6 +88,21 @@ public function testNotificationIsBroadcastedNow()
         $channel = new BroadcastChannel($events);
         $channel->send($notifiable, $notification);
     }
+
+    public function testNotificationIsBroadcastedWithCustomAdditionalPayload()
+    {
+        $notification = new CustomBroadcastWithTestNotification;
+        $notification->id = 1;
+        $notifiable = m::mock();
+
+        $event = new BroadcastNotificationCreated(
+            $notifiable, $notification, $notification->toArray($notifiable)
+        );
+
+        $data = $event->broadcastWith();
+
+        $this->assertArrayHasKey('additional', $data);
+    }
 }
 
 class NotificationBroadcastChannelTestNotification extends Notification
@@ -136,3 +151,16 @@ public function toBroadcast()
         return (new BroadcastMessage([]))->onConnection('sync');
     }
 }
+
+class CustomBroadcastWithTestNotification extends Notification
+{
+    public function toArray($notifiable)
+    {
+        return ['invoice_id' => 1];
+    }
+
+    public function broadcastWith()
+    {
+        return ['id' => 1, 'type' => 'custom', 'additional' => 'custom'];
+    }
+}