Fixed inconsistency by not passing $appId to all methods

Author: rennokki

src/Statistics/Logger/MemoryStatisticsLogger.php

@@ -6,7 +6,6 @@
 use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver;
 use BeyondCode\LaravelWebSockets\Statistics\Statistic;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use Ratchet\ConnectionInterface;
 
 class MemoryStatisticsLogger implements StatisticsLogger
 {
@@ -47,12 +46,12 @@ public function __construct(ChannelManager $channelManager, StatisticsDriver $dr
     /**
      * Handle the incoming websocket message.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function webSocketMessage(ConnectionInterface $connection)
+    public function webSocketMessage($appId)
     {
-        $this->findOrMakeStatisticForAppId($connection->app->id)
+        $this->findOrMakeStatisticForAppId($appId)
             ->webSocketMessage();
     }
 
@@ -71,24 +70,24 @@ public function apiMessage($appId)
     /**
      * Handle the new conection.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function connection(ConnectionInterface $connection)
+    public function connection($appId)
     {
-        $this->findOrMakeStatisticForAppId($connection->app->id)
+        $this->findOrMakeStatisticForAppId($appId)
             ->connection();
     }
 
     /**
      * Handle disconnections.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function disconnection(ConnectionInterface $connection)
+    public function disconnection($appId)
     {
-        $this->findOrMakeStatisticForAppId($connection->app->id)
+        $this->findOrMakeStatisticForAppId($appId)
             ->disconnection();
     }
 

src/Statistics/Logger/NullStatisticsLogger.php

@@ -4,7 +4,6 @@
 
 use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use Ratchet\ConnectionInterface;
 
 class NullStatisticsLogger implements StatisticsLogger
 {
@@ -38,10 +37,10 @@ public function __construct(ChannelManager $channelManager, StatisticsDriver $dr
     /**
      * Handle the incoming websocket message.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function webSocketMessage(ConnectionInterface $connection)
+    public function webSocketMessage($appId)
     {
         //
     }
@@ -60,21 +59,21 @@ public function apiMessage($appId)
     /**
      * Handle the new conection.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function connection(ConnectionInterface $connection)
+    public function connection($appId)
     {
         //
     }
 
     /**
      * Handle disconnections.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function disconnection(ConnectionInterface $connection)
+    public function disconnection($appId)
     {
         //
     }

src/Statistics/Logger/StatisticsLogger.php

@@ -2,17 +2,15 @@
 
 namespace BeyondCode\LaravelWebSockets\Statistics\Logger;
 
-use Ratchet\ConnectionInterface;
-
 interface StatisticsLogger
 {
     /**
      * Handle the incoming websocket message.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function webSocketMessage(ConnectionInterface $connection);
+    public function webSocketMessage($appId);
 
     /**
      * Handle the incoming API message.
@@ -25,18 +23,18 @@ public function apiMessage($appId);
     /**
      * Handle the new conection.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function connection(ConnectionInterface $connection);
+    public function connection($appId);
 
     /**
      * Handle disconnections.
      *
-     * @param  \Ratchet\ConnectionInterface  $connection
+     * @param  mixed  $appId
      * @return void
      */
-    public function disconnection(ConnectionInterface $connection);
+    public function disconnection($appId);
 
     /**
      * Save all the stored statistics.

src/WebSockets/WebSocketHandler.php

@@ -65,7 +65,7 @@ public function onMessage(ConnectionInterface $connection, MessageInterface $mes
 
         $message->respond();
 
-        StatisticsLogger::webSocketMessage($connection);
+        StatisticsLogger::webSocketMessage($connection->app->id);
     }
 
     /**
@@ -82,7 +82,7 @@ public function onClose(ConnectionInterface $connection)
             'socketId' => $connection->socketId,
         ]);
 
-        StatisticsLogger::disconnection($connection);
+        StatisticsLogger::disconnection($connection->app->id);
     }
 
     /**
@@ -200,7 +200,7 @@ protected function establishConnection(ConnectionInterface $connection)
             'socketId' => $connection->socketId,
         ]);
 
-        StatisticsLogger::connection($connection);
+        StatisticsLogger::connection($connection->app->id);
 
         return $this;
     }