Move acceptor before clientHandler arg

amphp · Sep 9, 2023 · fe925cf · fe925cf
1 parent 7667826
commit fe925cf
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/examples/broadcast-server/server.php b/examples/broadcast-server/server.php
@@ -56,7 +56,7 @@ public function handleClient(WebsocketClient $client, Request $request, Response
     }
 };
 
-$websocket = new Websocket($server, $logger, $clientHandler, $acceptor);
+$websocket = new Websocket($server, $logger, $acceptor, $clientHandler);
 
 $router = new Router($server, new NullLogger(), $errorHandler);
 $router->addRoute('GET', '/broadcast', $websocket);

diff --git a/examples/stackexchange-questions/server.php b/examples/stackexchange-questions/server.php
@@ -100,8 +100,8 @@ public function handleClient(WebsocketClient $client, Request $request, Response
 $websocket = new Websocket(
     httpServer: $server,
     logger: $logger,
-    clientHandler: $clientHandler,
     acceptor: $acceptor,
+    clientHandler: $clientHandler,
 );
 
 $router = new Router($server, new NullLogger(), $errorHandler);

diff --git a/src/Websocket.php b/src/Websocket.php
@@ -35,8 +35,8 @@ final class Websocket implements RequestHandler
     public function __construct(
         HttpServer $httpServer,
         private readonly PsrLogger $logger,
-        private readonly WebsocketClientHandler $clientHandler,
         private readonly RequestHandler $acceptor,
+        private readonly WebsocketClientHandler $clientHandler,
         private readonly WebsocketClientFactory $clientFactory = new Rfc6455ClientFactory(),
         private readonly ?WebsocketCompressionContextFactory $compressionContextFactory = null,
     ) {

diff --git a/test-autobahn/server.php b/test-autobahn/server.php
@@ -24,6 +24,7 @@
 $websocket = new Websocket(
     httpServer: $server,
     logger: $logger,
+    acceptor: new Rfc6455Acceptor(),
     clientHandler: new class implements WebsocketClientHandler {
         public function handleClient(WebsocketClient $client, Request $request, Response $response): void
         {
@@ -36,7 +37,6 @@ public function handleClient(WebsocketClient $client, Request $request, Response
             }
         }
     },
-    acceptor: new Rfc6455Acceptor(),
     clientFactory: new Rfc6455ClientFactory(
         heartbeatQueue: null,
         rateLimit: null,

diff --git a/test/WebsocketIntegrationTest.php b/test/WebsocketIntegrationTest.php
@@ -49,6 +49,7 @@ protected function createWebsocketServer(\Closure $clientHandler): SocketHttpSer
         $websocket = new Websocket(
             httpServer: $httpServer,
             logger: $this->logger,
+            acceptor: new Rfc6455Acceptor(),
             clientHandler: new class($clientHandler, $gateway) implements WebsocketClientHandler {
                 public function __construct(
                     private readonly \Closure $clientHandler,
@@ -62,7 +63,6 @@ public function handleClient(WebsocketClient $client, Request $request, Response
                     ($this->clientHandler)($this->gateway, $client);
                 }
             },
-            acceptor: new Rfc6455Acceptor(),
         );
 
         $httpServer->expose(new Socket\InternetAddress('127.0.0.1', 0));

diff --git a/test/WebsocketTest.php b/test/WebsocketTest.php
@@ -77,6 +77,7 @@ protected function createWebsocketServer(
         $websocket = new Websocket(
             httpServer: $httpServer,
             logger: $logger,
+            acceptor: new Rfc6455Acceptor(),
             clientHandler: new class($clientHandler, $gateway) implements WebsocketClientHandler {
                 public function __construct(
                     private readonly \Closure $clientHandler,
@@ -90,7 +91,6 @@ public function handleClient(WebsocketClient $client, Request $request, Response
                     ($this->clientHandler)($this->gateway, $client);
                 }
             },
-            acceptor: new Rfc6455Acceptor(),
             clientFactory: $factory,
         );
 
@@ -123,8 +123,8 @@ public function testHandshake(Request $request, int $status, array $expectedHead
         $websocket = new Websocket(
             httpServer: $server,
             logger: $logger,
-            clientHandler: $this->createMock(WebsocketClientHandler::class),
             acceptor: $upgradeHandler,
+            clientHandler: $this->createMock(WebsocketClientHandler::class),
         );
         $server->start($websocket, $this->createMock(ErrorHandler::class));