diff --git a/src/LaravelEcho/Http/Controllers/EventController.php b/src/LaravelEcho/Http/Controllers/EventController.php index ff98864..4b1c5e7 100644 --- a/src/LaravelEcho/Http/Controllers/EventController.php +++ b/src/LaravelEcho/Http/Controllers/EventController.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; class EventController extends EchoController { - /** @var ChannelManager */ + /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */ protected $channelManager; public function __construct(ChannelManager $channelManager) @@ -31,12 +31,13 @@ class EventController extends EchoController foreach ($request->json()->get('channels', []) as $channelId) { $channel = $this->channelManager->find($request->appId, $channelId); - $channel->broadcast([ + optional($channel)->broadcast([ 'channel' => $channelId, 'event' => $request->json()->get('name'), 'data' => $request->json()->get('data'), ]); } + return $request->json()->all(); } } \ No newline at end of file diff --git a/src/LaravelEcho/Pusher/Channels/ChannelManager.php b/src/LaravelEcho/Pusher/Channels/ChannelManager.php index 3bb0f16..435f9fc 100644 --- a/src/LaravelEcho/Pusher/Channels/ChannelManager.php +++ b/src/LaravelEcho/Pusher/Channels/ChannelManager.php @@ -25,7 +25,7 @@ class ChannelManager return $this->channels[$appId][$channelId]; } - public function find(string $appId, string $channelId) + public function find(string $appId, string $channelId): ?Channel { return $this->channels[$appId][$channelId] ?? null; }