use correct id

laravel · Nov 17, 2023 · ce68666 · ce68666
1 parent 074fde9
commit ce68666
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php
@@ -51,11 +51,11 @@ public function broadcast(Application $app, array $payload, Connection $except =
     {
         collect(App::make(ChannelManager::class)->for($app)->connections($this))
             ->each(function ($connection) use ($payload, $except) {
-                if ($except && $except->identifier() === $connection->identifier()) {
+                if ($except && $except->id() === $connection->id()) {
                     return;
                 }
 
-                if (isset($payload['except']) && $payload['except'] === $connection->identifier()) {
+                if (isset($payload['except']) && $payload['except'] === $connection->id()) {
                     return;
                 }
 

diff --git a/src/ClientEvent.php b/src/ClientEvent.php
@@ -33,7 +33,7 @@ public static function whisper(Connection $connection, array $payload): void
     {
         Event::dispatch(
             $connection->app(),
-            $payload + ['except' => $connection->identifier()],
+            $payload + ['except' => $connection->id()],
             $connection
         );
     }

diff --git a/src/Contracts/Connection.php b/src/Contracts/Connection.php
@@ -97,7 +97,7 @@ public function disconnect(): void
 
         App::make(ConnectionManager::class)
             ->for($this->app())
-            ->disconnect($this->identifier());
+            ->disconnect($this->id());
 
         $this->terminate();
     }

diff --git a/src/Managers/ChannelManager.php b/src/Managers/ChannelManager.php
@@ -45,15 +45,15 @@ public function app(): ?Application
      */
     public function subscribe(Channel $channel, Connection $connection, $data = []): void
     {
-        $this->connections[$this->application->id()][$channel->name()][$connection->identifier()] = $connection;
+        $this->connections[$this->application->id()][$channel->name()][$connection->id()] = $connection;
     }
 
     /**
      * Unsubscribe from a channel.
      */
     public function unsubscribe(Channel $channel, Connection $connection): void
     {
-        unset($this->connections[$this->application->id()][$channel->name()][$connection->identifier()]);
+        unset($this->connections[$this->application->id()][$channel->name()][$connection->id()]);
     }
 
     /**