Fixed some typos and code styling, dropped support for PHP 7.4 and use new PHP 8 only features

composer.json

@@ -22,9 +22,9 @@
         }
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-sockets": "*",
-        "psr/log": "^1.1"
+        "psr/log": "^3.0"
     }
 }

examples/Application/Chat.php

@@ -85,7 +85,7 @@ public function onIPCData(array $data): void
         $actionName = 'action' . ucfirst($data['action']);
         $message = 'System Message: ' . $data['data'] ?? '';
         if (method_exists($this, $actionName)) {
-            call_user_func([$this, $actionName], $message);
+            $this->$actionName($message);
         }
     }
 
@@ -98,8 +98,8 @@ public function onIPCData(array $data): void
     private function actionEcho(string $text): void
     {
         $encodedData = $this->encodeData('echo', $text);
-        foreach ($this->clients as $sendto) {
-            $sendto->send($encodedData);
+        foreach ($this->clients as $client) {
+            $client->send($encodedData);
         }
     }
 }

src/Application/Application.php

@@ -28,7 +28,7 @@ protected function __clone()
      */
     final public static function getInstance(): ApplicationInterface
     {
-        $calledClassName = get_called_class();
+        $calledClassName = static::class;
         if (!isset(self::$instances[$calledClassName])) {
             self::$instances[$calledClassName] = new $calledClassName();
         }
@@ -40,12 +40,13 @@ final public static function getInstance(): ApplicationInterface
      * Decodes json data received from stream.
      *
      * @param string $data
-     * @throws \RuntimeException
      * @return array
+     * @throws \JsonException
+     * @throws \RuntimeException
      */
     protected function decodeData(string $data): array
     {
-        $decodedData = json_decode($data, true);
+        $decodedData = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
         if (empty($decodedData)) {
             throw new \RuntimeException('Could not decode data.');
         }
@@ -58,14 +59,14 @@ protected function decodeData(string $data): array
     }
 
     /**
-     * Enocdes data to be send to client.
+     * Encodes data to be sent to client.
      *
      * @param string $action
      * @param mixed $data
-     * @throws \InvalidArgumentException
      * @return string
+     * @throws \InvalidArgumentException
      */
-    protected function encodeData(string $action, $data): string
+    protected function encodeData(string $action, mixed $data): string
     {
         if (empty($action)) {
             throw new \InvalidArgumentException('Action can not be empty.');

src/Application/ApplicationInterface.php

@@ -9,29 +9,29 @@
 interface ApplicationInterface
 {
     /**
-     * This method is tirggered when a new client connects to server/application.
+     * This method is triggered when a new client connects to server/application.
      *
      * @param Connection $connection
      */
     public function onConnect(Connection $connection): void;
 
     /**
-     * This methods is triggered when a client disconnects from server/application.
+     * This method is triggered when a client disconnects from server/application.
      *
      * @param Connection $connection
      */
     public function onDisconnect(Connection $connection): void;
 
     /**
-     * This method is triggered when the server recieves new data from a client.
+     * This method is triggered when the server receives new data from a client.
      *
      * @param string $data
      * @param Connection $client
      */
     public function onData(string $data, Connection $client): void;
 
     /**
-     * This method is called when server recieves to for an application on the IPC socket.
+     * This method is called when server receives to for an application on the IPC socket.
      *
      * @param array $data
      */

src/Application/StatusApplication.php

@@ -46,7 +46,7 @@ public function onConnect(Connection $connection): void
     {
         $id = $connection->getClientId();
         $this->clients[$id] = $connection;
-        $this->sendServerinfo($connection);
+        $this->sendServerInfo($connection);
     }
 
     /**
@@ -62,7 +62,7 @@ public function onDisconnect(Connection $connection): void
     }
 
     /**
-     * This application does not expect any incomming client data.
+     * This application does not expect any incoming client data.
      *
      * @param string $data
      * @param Connection $client
@@ -86,11 +86,8 @@ public function onIPCData(array $data): void
      */
     public function setServerInfo(array $serverInfo): bool
     {
-        if (is_array($serverInfo)) {
-            $this->serverInfo = $serverInfo;
-            return true;
-        }
-        return false;
+        $this->serverInfo = $serverInfo;
+        return true;
     }
 
     /**
@@ -153,14 +150,14 @@ public function clientActivity(string $client): void
     /**
      * Sends a status message to all clients connected to the application.
      *
-     * @param $text
+     * @param string $text
      * @param string $type
      */
     public function statusMsg(string $text, string $type = 'info'): void
     {
         $data = [
             'type' => $type,
-            'text' => '[' . strftime('%m-%d %H:%M', time()) . '] ' . $text,
+            'text' => '[' . date('m-d H:i') . '] ' . $text,
         ];
         $encodedData = $this->encodeData('statusMsg', $data);
         $this->sendAll($encodedData);
@@ -172,7 +169,7 @@ public function statusMsg(string $text, string $type = 'info'): void
      * @param Connection $client
      * @return void
      */
-    private function sendServerinfo(Connection $client): void
+    private function sendServerInfo(Connection $client): void
     {
         if (count($this->clients) < 1) {
             return;
@@ -195,8 +192,8 @@ private function sendAll(string $encodedData): void
         if (count($this->clients) < 1) {
             return;
         }
-        foreach ($this->clients as $sendto) {
-            $sendto->send($encodedData);
+        foreach ($this->clients as $client) {
+            $client->send($encodedData);
         }
     }
 }

src/Connection.php

@@ -49,7 +49,7 @@ class Connection
      * @var string $dataBuffer
      */
     private string $dataBuffer = '';
-  
+
     /**
      * @var array $headers
      */
@@ -176,7 +176,7 @@ private function handshake(string $data): bool
     }
 
     /**
-     * Sends an http response to client.
+     * Sends a http response to client.
      *
      * @param int $httpStatusCode
      * @throws \RuntimeException
@@ -245,11 +245,11 @@ private function handle(string $data): bool
             $this->waitingForData = true;
             $this->dataBuffer .= $data;
             return false;
-        } else {
-            $this->dataBuffer = '';
-            $this->waitingForData = false;
         }
 
+        $this->dataBuffer = '';
+        $this->waitingForData = false;
+
         // trigger status application:
         if ($this->server->hasApplication('status')) {
             $client = $this->ip . ':' . $this->port;
@@ -381,7 +381,7 @@ public function log(string $message, string $type = 'info'): void
     }
 
     /**
-     * Encodes a frame/message according the the WebSocket protocol standard.
+     * Encodes a frame/message according the WebSocket protocol standard.
      *
      * @param string $payload
      * @param string $type
@@ -531,7 +531,7 @@ private function hybi10Decode(string $data): array
         /**
          * We have to check for large frames here. socket_recv cuts at 1024 bytes
          * so if websocket-frame is > 1024 bytes we have to wait until whole
-         * data is transferd.
+         * data is transferred.
          */
         if (strlen($data) < $dataLength) {
             return [];
@@ -546,7 +546,7 @@ private function hybi10Decode(string $data): array
             }
             $decodedData['payload'] = $unmaskedPayload;
         } else {
-            $payloadOffset = $payloadOffset - 4;
+            $payloadOffset -= 4;
             $decodedData['payload'] = substr($data, $payloadOffset);
         }
 
@@ -584,17 +584,18 @@ public function getClientId(): string
     }
 
     /**
-     * Retuns the socket/resource of the connection.
+     * Returns the socket/resource of the connection.
      *
      * @return resource
      */
     public function getClientSocket()
     {
         return $this->socket;
     }
-  
+
     /**
      * Return the headers of the connection
+     *
      * @return array
      */
     public function getClientHeaders(): array

src/IPCPayloadFactory.php

@@ -31,21 +31,18 @@ public static function makeApplicationPayload(string $applicationName, array $da
     }
 
     /**
-     * Creates payload object from json ecoded string.
+     * Creates payload object from json encoded string.
      *
      * @param string $json
      * @return IPCPayload
      */
     public static function fromJson(string $json): IPCPayload
     {
         $data = json_decode($json, true);
-        switch ($data['type']) {
-            case IPCPayload::TYPE_SERVER:
-                return new IPCPayload(IPCPayload::TYPE_SERVER, $data['action'], $data['data']);
-            case IPCPayload::TYPE_APPLICATION:
-                return new IPCPayload(IPCPayload::TYPE_APPLICATION, $data['action'], $data['data']);
-            default:
-                throw new \RuntimeException('Can not create IPCPayload from invalid data type.');
-        }
+        return match ($data['type']) {
+            IPCPayload::TYPE_SERVER => new IPCPayload(IPCPayload::TYPE_SERVER, $data['action'], $data['data']),
+            IPCPayload::TYPE_APPLICATION => new IPCPayload(IPCPayload::TYPE_APPLICATION, $data['action'], $data['data']),
+            default => throw new \RuntimeException('Can not create IPCPayload from invalid data type.'),
+        };
     }
 }

src/Logger/StdOutLogger.php

@@ -27,11 +27,12 @@ class StdOutLogger extends AbstractLogger
      * @param mixed $level
      * @param string $message
      * @param array $context
+     * @return void
      */
-    public function log($level, $message, array $context = [])
+    public function log($level, $message, array $context = []): void
     {
         $level = $level ?? LogLevel::ERROR;
-        $output = isset(self::OUTMAP[$level]) ? self::OUTMAP[$level] : STDERR;
+        $output = self::OUTMAP[$level] ?? STDERR;
         fwrite($output, date('Y-m-d H:i:s') . ' [' . $level . '] ' . $message . PHP_EOL);
     }
 }

src/PushClient.php

@@ -61,7 +61,7 @@ private function sendPayloadToServer(IPCPayload $payload): bool
         if ($dataLength > self::MAX_PAYLOAD_LENGTH) {
             throw new \RuntimeException(
                 sprintf(
-                    'IPC payload exeeds max length of %d bytes. (%d bytes given.)',
+                    'IPC payload exceeds max length of %d bytes. (%d bytes given.)',
                     self::MAX_PAYLOAD_LENGTH,
                     $dataLength
                 )