Restructured the ChessServer\Socket\WebSocket namespace

Dockerfile.dev

@@ -13,4 +13,4 @@ RUN pecl install msgpack \
 RUN curl --silent --show-error https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer
 
-CMD ["php", "cli/dev.php"]
+CMD ["php", "cli/ratchet/dev.php"]

Dockerfile.prod

@@ -13,4 +13,4 @@ RUN pecl install msgpack \
 RUN curl --silent --show-error https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer
 
-CMD ["php", "cli/prod.php"]
+CMD ["php", "cli/ratchet/prod.php"]

Dockerfile.staging

@@ -13,4 +13,4 @@ RUN pecl install msgpack \
 RUN curl --silent --show-error https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer
 
-CMD ["php", "cli/staging.php"]
+CMD ["php", "cli/ratchet/staging.php"]

Dockerfile.testing

@@ -13,4 +13,4 @@ RUN pecl install msgpack \
 RUN curl --silent --show-error https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer
 
-CMD ["php", "cli/testing.php"]
+CMD ["php", "cli/ratchet/testing.php"]

cli/dev.php → cli/ratchet/dev.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace ChessServer\Cli;
+namespace ChessServer\Cli\Ratchet;
 
-use ChessServer\Socket\WebSocket;
+use ChessServer\Socket\WebSocket\RatchetWebSocket;
 use Dotenv\Dotenv;
 use Ratchet\Server\IoServer;
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 
-require __DIR__  . '/../vendor/autoload.php';
+require __DIR__  . '/../../vendor/autoload.php';
 
-$dotenv = Dotenv::createImmutable(__DIR__.'/../');
+$dotenv = Dotenv::createImmutable(__DIR__.'/../../');
 $dotenv->load();
 
 $server = IoServer::factory(
     new HttpServer(
         new WsServer(
-            new WebSocket()
+            new RatchetWebSocket()
         )
     ),
     $_ENV['WS_PORT'],

cli/prod.php → cli/ratchet/prod.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ChessServer\Cli;
+namespace ChessServer\Cli\Ratchet;
 
-use ChessServer\Socket\WebSocket;
+use ChessServer\Socket\WebSocket\RatchetWebSocket;
 use Dotenv\Dotenv;
 use Ratchet\Http\HttpServer;
 use Ratchet\Http\OriginCheck;
@@ -13,9 +13,9 @@
 use React\Socket\Server;
 use React\Socket\SecureServer;
 
-require __DIR__  . '/../vendor/autoload.php';
+require __DIR__  . '/../../vendor/autoload.php';
 
-$dotenv = Dotenv::createImmutable(__DIR__.'/../');
+$dotenv = Dotenv::createImmutable(__DIR__.'/../../');
 $dotenv->load();
 
 $allowed = [
@@ -37,7 +37,7 @@
 $httpServer = new HttpServer(
     new OriginCheck(
       new WsServer(
-          new WebSocket()
+          new RatchetWebSocket()
       ),
       $allowed,
     )

cli/staging.php → cli/ratchet/staging.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ChessServer\Cli;
+namespace ChessServer\Cli\Ratchet;
 
-use ChessServer\Socket\WebSocket;
+use ChessServer\Socket\WebSocket\RatchetWebSocket;
 use Dotenv\Dotenv;
 use Ratchet\Http\HttpServer;
 use Ratchet\Server\IoServer;
@@ -12,9 +12,9 @@
 use React\Socket\Server;
 use React\Socket\SecureServer;
 
-require __DIR__  . '/../vendor/autoload.php';
+require __DIR__  . '/../../vendor/autoload.php';
 
-$dotenv = Dotenv::createImmutable(__DIR__.'/../');
+$dotenv = Dotenv::createImmutable(__DIR__.'/../../');
 $dotenv->load();
 
 $loop = Factory::create();
@@ -31,7 +31,7 @@
 
 $httpServer = new HttpServer(
     new WsServer(
-        new WebSocket()
+        new RatchetWebSocket()
     )
 );
 

cli/ratchet/testing.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ChessServer\Cli\Ratchet;
+
+use ChessServer\Socket\TcpSocket\RatchetTcpSocket;
+use Dotenv\Dotenv;
+
+require __DIR__  . '/../../vendor/autoload.php';
+
+$dotenv = Dotenv::createImmutable(__DIR__.'/../../');
+$dotenv->load();
+
+$server = new RatchetTcpSocket($_ENV['TCP_PORT']);

docs/installation.md

@@ -34,30 +34,30 @@ Finally, you may want to add the following entry to your `/etc/hosts` file if ru
 
 ## Run the Chess Server
 
-The chess server comes in four different flavors and can be run using a PHP script.
+The chess server runs by default using Ratchet-PHP WebSockets and comes in four different flavors.
 
 | Script | Description | Use |
 | ------ | ----------- | --- |
-| [cli/testing.php](https://github.com/chesslablab/chess-server/blob/master/cli/testing.php) | TCP socket. | Functional testing. |
-| [cli/dev.php](https://github.com/chesslablab/chess-server/blob/master/cli/dev.php) | Simple WebSocket server. | Development. |
-| [cli/staging.php](https://github.com/chesslablab/chess-server/blob/master/cli/staging.php) | Secure WebSocket server. | Staging. |
-| [cli/prod.php](https://github.com/chesslablab/chess-server/blob/master/cli/prod.php) | Secure WebSocket server. | Production. |
+| [cli/ratchet/testing.php](https://github.com/chesslablab/chess-server/blob/master/cli/ratchet/testing.php) | TCP socket. | Functional testing. |
+| [cli/ratchet/dev.php](https://github.com/chesslablab/chess-server/blob/master/cli/ratchet/dev.php) | Simple WebSocket server. | Development. |
+| [cli/ratchet/staging.php](https://github.com/chesslablab/chess-server/blob/master/cli/ratchet/staging.php) | Secure WebSocket server. | Staging. |
+| [cli/ratchet/prod.php](https://github.com/chesslablab/chess-server/blob/master/cli/ratchet/prod.php) | Secure WebSocket server. | Production. |
 
 
 ### Functional Testing
 
 Run the TCP socket server.
 
 ```
-php cli/testing.php
+php cli/ratchet/testing.php
 ```
 
 ### Simple WebSocket Server
 
 Run the simple WebSocket server if you are not using an SSL/TLS certificate.
 
 ```txt
-php cli/dev.php
+php cli/ratchet/dev.php
 ```
 
 ### Staging
@@ -67,7 +67,7 @@ Before starting the secure WebSocket server for the first time, make sure to hav
 Run the staging secure WebSocket server if you don't want to check the website's origin.
 
 ```txt
-php cli/staging.php
+php cli/ratchet/staging.php
 ```
 
 This will allow any origin to send a request to it.
@@ -79,7 +79,7 @@ Before starting the secure WebSocket server for the first time, make sure to hav
 Run the secure WebSocket server to check the website's origin as defined in the `WSS_ALLOWED` variable in the `.env.example` file.
 
 ```txt
-php cli/prod.php
+php cli/ratchet/prod.php
 ```
 
 This will allow the `WSS_ALLOWED` website to send a request to it.

src/Socket/TcpSocket.php → src/Socket/TcpSocket/RatchetTcpSocket.php

@@ -1,15 +1,17 @@
 <?php
 
-namespace ChessServer\Socket;
+namespace ChessServer\Socket\TcpSocket;
 
 use ChessServer\Command\LeaveCommand;
 use ChessServer\Game\PlayMode;
 use ChessServer\Exception\InternalErrorException;
 use ChessServer\Exception\ParserException;
+use ChessServer\Socket\ChesslaBlab;
+use ChessServer\Socket\SendInterface;
 use React\Socket\ConnectionInterface;
 use React\Socket\TcpServer;
 
-class TcpSocket extends ChesslaBlab implements SendInterface
+class RatchetTcpSocket extends ChesslaBlab implements SendInterface
 {
     private TcpServer $server;
 

src/Socket/WebSocket.php → src/Socket/WebSocket/RatchetWebSocket.php

@@ -1,15 +1,17 @@
 <?php
 
-namespace ChessServer\Socket;
+namespace ChessServer\Socket\WebSocket;
 
 use ChessServer\Command\LeaveCommand;
 use ChessServer\Game\PlayMode;
 use ChessServer\Exception\InternalErrorException;
 use ChessServer\Exception\ParserException;
+use ChessServer\Socket\ChesslaBlab;
+use ChessServer\Socket\SendInterface;
 use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
 
-class WebSocket extends ChesslaBlab implements MessageComponentInterface, SendInterface
+class RatchetWebSocket extends ChesslaBlab implements MessageComponentInterface, SendInterface
 {
     public function onOpen(ConnectionInterface $conn)
     {