Remove request-limit feature and fix some code styles

Author: nekudo

README.md

@@ -53,7 +53,6 @@ $server->setMaxClients(100);
 $server->setCheckOrigin(false);
 $server->setAllowedOrigin('foo.lh');
 $server->setMaxConnectionsPerIp(100);
-$server->setMaxRequestsPerMinute(2000);
 
 // Add your applications here:
 $server->registerApplication('status', \Bloatless\WebSocket\Application\StatusApplication::getInstance());

cli/server.php

@@ -1,7 +1,6 @@
 <?php
 
 require __DIR__ . '/../src/Connection.php';
-require __DIR__ . '/../src/Socket.php';
 require __DIR__ . '/../src/Server.php';
 require __DIR__ . '/../src/Timer.php';
 require __DIR__ . '/../src/TimerCollection.php';
@@ -18,7 +17,6 @@
 $server->setCheckOrigin(false);
 $server->setAllowedOrigin('foo.lh');
 $server->setMaxConnectionsPerIp(100);
-$server->setMaxRequestsPerMinute(2000);
 
 // Hint: Status application should not be removed as it displays usefull server informations:
 $server->registerApplication('status', \Bloatless\WebSocket\Application\StatusApplication::getInstance());

public/js/status.js

@@ -7,7 +7,6 @@
         const elClientCount = document.getElementById('clientCount');
         const elMaxClients = document.getElementById('maxClients');
         const elMaxConnections = document.getElementById('maxConnections');
-        const elMaxRequetsPerMinute = document.getElementById('maxRequetsPerMinute');
 
         /**
          * Adds a new log message.
@@ -62,7 +61,6 @@
             elClientCount.textContent = serverinfo.clientCount;
             elMaxClients.textContent = serverinfo.maxClients;
             elMaxConnections.textContent = serverinfo.maxConnectionsPerIp;
-            elMaxRequetsPerMinute.textContent = serverinfo.maxRequetsPerMinute;
             for (let client in serverinfo.clients) {
                 if (!serverinfo.clients.hasOwnProperty(client)) {
                     continue;

public/status.html

@@ -22,7 +22,6 @@ <h2>Server Info:</h2>
 				<p>Connected Clients: <span id="clientCount"></span></p>
 				<p>Limit Clients: <span id="maxClients"></span></p>
 				<p>Limit Connections/IP: <span id="maxConnections"></span></p>
-				<p>Limit Requetes/Min: <span id="maxRequetsPerMinute"></span></p>
 			</div>
 
 			<div class="clearer"></div>

src/Application/Application.php

@@ -9,7 +9,7 @@ abstract class Application implements ApplicationInterface
     /**
      * @var array $instances
      */
-    protected static $instances = [];
+    protected static array $instances = [];
 
     protected function __construct()
     {

src/Application/DemoApplication.php

@@ -11,7 +11,7 @@ class DemoApplication extends Application
     /**
      * @var array $clients
      */
-    private $clients = [];
+    private array $clients = [];
 
     /**
      * Handles new connections to the application.

src/Application/StatusApplication.php

@@ -13,28 +13,28 @@ class StatusApplication extends Application
      *
      * @var array $clients
      */
-    private $clients = [];
+    private array $clients = [];
 
     /**
      * Holds IP/Port information of all clients connected to the server.
      *
      * @var array $serverClients
      */
-    private $serverClients = [];
+    private array $serverClients = [];
 
     /**
      * Basic server infos (like max. clients e.g.)
      *
      * @var array $serverInfo
      */
-    private $serverInfo = [];
+    private array $serverInfo = [];
 
     /**
      * Total number of connected clients.
      *
      * @var int $serverClientCount
      */
-    private $serverClientCount = 0;
+    private int $serverClientCount = 0;
 
     /**
      * Handles new connections to the application.

src/Connection.php

@@ -8,12 +8,12 @@
 
 class Connection
 {
-    public $waitingForData = false;
+    public bool $waitingForData = false;
 
     /**
      * @var Server $server
      */
-    private $server;
+    private Server $server;
 
     /**
      * @var resource $socket
@@ -23,33 +23,33 @@ class Connection
     /**
      * @var bool $handshaked
      */
-    private $handshaked = false;
+    private bool $handshaked = false;
 
 
     /**
      * @var ApplicationInterface $application
      */
-    private $application = null;
+    private ApplicationInterface $application;
 
     /**
      * @var string $ip
      */
-    private $ip;
+    private string $ip;
 
     /**
      * @var int $port
      */
-    private $port;
+    private int $port;
 
     /**
      * @var string $connectionId
      */
-    private $connectionId = '';
+    private string $connectionId = '';
 
     /**
      * @var string $dataBuffer
      */
-    private $dataBuffer = '';
+    private string $dataBuffer = '';
 
     /**
      * @param Server $server
@@ -109,13 +109,13 @@ private function handshake(string $data): bool
         foreach ($lines as $line) {
             $line = chop($line);
             if (preg_match('/\A(\S+): (.*)\z/', $line, $matches)) {
-                $headers[ strtolower( $matches[1] )] = $matches[2];
+                $headers[ strtolower($matches[1])] = $matches[2];
             }
         }
 
         // check for supported websocket version:
         if (!isset($headers['sec-websocket-version']) || $headers['sec-websocket-version'] < 6) {
-            $this->log('Unsupported websocket version.' );
+            $this->log('Unsupported websocket version.');
             $this->sendHttpResponse(501);
             stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
             $this->server->removeClientOnError($this);