broadcast events using new style jobs (#17433)

src/Illuminate/Broadcasting/BroadcastEvent.php

@@ -4,51 +4,49 @@
 
 use ReflectionClass;
 use ReflectionProperty;
+use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\Job;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Broadcasting\Broadcaster;
 
-class BroadcastEvent
+class BroadcastEvent implements ShouldQueue
 {
+    use Queueable;
+
     /**
-     * The broadcaster implementation.
+     * The event instance.
      *
-     * @var \Illuminate\Contracts\Broadcasting\Broadcaster
+     * @var mixed
      */
-    protected $broadcaster;
+    protected $event;
 
     /**
      * Create a new job handler instance.
      *
-     * @param  \Illuminate\Contracts\Broadcasting\Broadcaster  $broadcaster
+     * @param  mixed  $event
      * @return void
      */
-    public function __construct(Broadcaster $broadcaster)
+    public function __construct($event)
     {
-        $this->broadcaster = $broadcaster;
+        $this->event = $event;
     }
 
     /**
      * Handle the queued job.
      *
-     * @param  \Illuminate\Contracts\Queue\Job  $job
-     * @param  array  $data
+     * @param  \Illuminate\Contracts\Broadcasting\Broadcaster  $broadcaster
      * @return void
      */
-    public function fire(Job $job, array $data)
+    public function handle(Broadcaster $broadcaster)
     {
-        $event = unserialize($data['event']);
+        $name = method_exists($this->event, 'broadcastAs')
+                ? $this->event->broadcastAs() : get_class($this->event);
 
-        $name = method_exists($event, 'broadcastAs')
-                ? $event->broadcastAs() : get_class($event);
-
-        $channels = array_wrap($event->broadcastOn());
-
-        $this->broadcaster->broadcast(
-            $channels, $name, $this->getPayloadFromEvent($event)
+        $broadcaster->broadcast(
+            array_wrap($this->event->broadcastOn()), $name,
+            $this->getPayloadFromEvent($this->event)
         );
-
-        $job->delete();
     }
 
     /**

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -120,7 +120,7 @@ public function queue($event)
         }
 
         $this->app->make('queue')->connection($connection)->pushOn(
-            $queue, BroadcastEvent::class, ['event' => serialize(clone $event)]
+            $queue, new BroadcastEvent(clone $event)
         );
     }
 

src/Illuminate/Broadcasting/composer.json

@@ -15,7 +15,9 @@
     ],
     "require": {
         "php": ">=5.6.4",
+        "illuminate/bus": "5.4.*",
         "illuminate/contracts": "5.4.*",
+        "illuminate/queue": "5.4.*",
         "illuminate/support": "5.4.*"
     },
     "autoload": {

tests/Broadcasting/BroadcastEventTest.php

@@ -21,13 +21,8 @@ public function testBasicEventBroadcastParameterFormatting()
         );
 
         $event = new TestBroadcastEvent;
-        $serializedEvent = serialize($event);
-        $jobData = ['event' => $serializedEvent];
 
-        $job = m::mock('Illuminate\Contracts\Queue\Job');
-        $job->shouldReceive('delete')->once();
-
-        (new \Illuminate\Broadcasting\BroadcastEvent($broadcaster))->fire($job, $jobData);
+        (new \Illuminate\Broadcasting\BroadcastEvent($event))->handle($broadcaster);
     }
 
     public function testManualParameterSpecification()
@@ -39,13 +34,8 @@ public function testManualParameterSpecification()
         );
 
         $event = new TestBroadcastEventWithManualData;
-        $serializedEvent = serialize($event);
-        $jobData = ['event' => $serializedEvent];
-
-        $job = m::mock('Illuminate\Contracts\Queue\Job');
-        $job->shouldReceive('delete')->once();
 
-        (new \Illuminate\Broadcasting\BroadcastEvent($broadcaster))->fire($job, $jobData);
+        (new \Illuminate\Broadcasting\BroadcastEvent($event))->handle($broadcaster);
     }
 }