BaseEvent is now DefaultEvent and no longer extends ShouldBroadcast

BaseEvent is now deprecated

src/app/Events/BaseEvent.php

@@ -2,66 +2,14 @@
 
 namespace GemaDigital\Framework\app\Events;
 
-use Auth;
-use Carbon\Carbon;
-use GemaDigital\Framework\app\Events\SerializesEvents;
-use GemaDigital\Framework\app\Events\ShouldBroadcast;
-use Illuminate\Broadcasting\Channel;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-abstract class BaseEvent implements ShouldBroadcast
+use GemaDigital\Framework\app\Events\DefaultEvent;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+/**
+ * @deprecated 10.3
+ * Should use the DefaultEvent
+ */
+abstract class BaseEvent extends DefaultEvent implements ShouldBroadcast
 {
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
-    use SerializesEvents;
-
-    public $channel;
-    public $user;
-    public $timestamp;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(string $channel)
-    {
-        $this->channel = $channel;
-        $this->user = $this->getUserData();
-        $this->timestamp = Carbon::now();
-    }
-
-    public function broadcastAs()
-    {
-        return (new \ReflectionClass($this))->getShortName();
-    }
-
-    public function broadcastOn()
-    {
-        return new Channel($this->channel);
-    }
-
-    public function getChannel()
-    {
-        return $this->channel;
-    }
-
-    public function getUserData()
-    {
-        $user = Auth::user();
-
-        return $user ? (object) $user->only(['id', 'name', 'email']) : null;
-    }
 
-    public function __toString()
-    {
-        return json_encode([
-            get_class_name($this),
-            $this->broadcastOn()->name,
-            $this,
-        ]);
-    }
 }

src/app/Events/BroadcastEvent.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace GemaDigital\Framework\app\Events;
+
+use GemaDigital\Framework\app\Events\DefaultEvent;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+abstract class BroadcastEvent extends DefaultEvent implements ShouldBroadcast
+{
+
+}

src/app/Events/BroadcastNowEvent.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace GemaDigital\Framework\app\Events;
+
+use GemaDigital\Framework\app\Events\DefaultEvent;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+
+abstract class BroadcastNowEvent extends DefaultEvent implements ShouldBroadcastNow
+{
+
+}

src/app/Events/DefaultEvent.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace GemaDigital\Framework\app\Events;
+
+use Auth;
+use Carbon\Carbon;
+use GemaDigital\Framework\app\Events\SerializesEvents;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+abstract class DefaultEvent
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+    use SerializesEvents;
+
+    public $channel;
+    public $user;
+    public $timestamp;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(string $channel)
+    {
+        $this->channel = $channel;
+        $this->user = $this->getUserData();
+        $this->timestamp = Carbon::now();
+    }
+
+    public function broadcastAs()
+    {
+        return (new \ReflectionClass($this))->getShortName();
+    }
+
+    public function broadcastOn()
+    {
+        return new Channel($this->channel);
+    }
+
+    public function getChannel()
+    {
+        return $this->channel;
+    }
+
+    public function getUserData()
+    {
+        $user = Auth::user();
+
+        return $user ? (object) $user->only(['id', 'name', 'email']) : null;
+    }
+
+    public function __toString()
+    {
+        return json_encode([
+            get_class_name($this),
+            $this->broadcastOn()->name,
+            $this,
+        ]);
+    }
+}