diff --git a/examples/stackexchange-questions/server.php b/examples/stackexchange-questions/server.php index e6a54c2..87e49e1 100644 --- a/examples/stackexchange-questions/server.php +++ b/examples/stackexchange-questions/server.php @@ -22,7 +22,7 @@ use Amp\Websocket\Server\ClientHandler; use Amp\Websocket\Server\Gateway; use Amp\Websocket\Server\Websocket; -use Amp\Websocket\Server\WebsocketObserver; +use Amp\Websocket\Server\WebsocketServerObserver; use Monolog\Logger; use function Amp\ByteStream\getStdout; use function Amp\call; @@ -30,7 +30,7 @@ require __DIR__ . '/../../vendor/autoload.php'; Loop::run(function (): Promise { - $websocket = new Websocket(new class implements ClientHandler, WebsocketObserver { + $websocket = new Websocket(new class implements ClientHandler, WebsocketServerObserver { /** @var string|null */ private $watcher; diff --git a/src/Websocket.php b/src/Websocket.php index 53d486b..6700a8c 100644 --- a/src/Websocket.php +++ b/src/Websocket.php @@ -69,15 +69,15 @@ public function __construct( $this->compressionFactory = $compressionFactory ?? new Rfc7692CompressionFactory; $this->clientFactory = $clientFactory ?? new Rfc6455ClientFactory; - if ($this->clientHandler instanceof WebsocketObserver) { + if ($this->clientHandler instanceof WebsocketServerObserver) { $this->observers->attach($this->clientHandler); } - if ($this->clientFactory instanceof WebsocketObserver) { + if ($this->clientFactory instanceof WebsocketServerObserver) { $this->observers->attach($this->clientFactory); } - if ($this->compressionFactory instanceof WebsocketObserver) { + if ($this->compressionFactory instanceof WebsocketServerObserver) { $this->observers->attach($this->compressionFactory); } } @@ -418,9 +418,9 @@ public function getOptions(): Options /** * Attaches a WebsocketObserver that is notified when the server starts and stops. * - * @param WebsocketObserver $observer + * @param WebsocketServerObserver $observer */ - public function attach(WebsocketObserver $observer): void + public function attach(WebsocketServerObserver $observer): void { $this->observers->attach($observer); } @@ -441,7 +441,7 @@ public function onStart(HttpServer $server): Promise return call(function () use ($server): \Generator { $onStartPromises = []; foreach ($this->observers as $observer) { - \assert($observer instanceof WebsocketObserver); + \assert($observer instanceof WebsocketServerObserver); $onStartPromises[] = $observer->onStart($server, $this); } @@ -461,7 +461,7 @@ public function onStop(HttpServer $server): Promise return call(function () use ($server): \Generator { $onStopPromises = []; foreach ($this->observers as $observer) { - \assert($observer instanceof WebsocketObserver); + \assert($observer instanceof WebsocketServerObserver); $onStopPromises[] = $observer->onStop($server, $this); } diff --git a/src/WebsocketObserver.php b/src/WebsocketServerObserver.php similarity index 96% rename from src/WebsocketObserver.php rename to src/WebsocketServerObserver.php index aed2208..331e25c 100644 --- a/src/WebsocketObserver.php +++ b/src/WebsocketServerObserver.php @@ -5,7 +5,7 @@ use Amp\Http\Server\HttpServer; use Amp\Promise; -interface WebsocketObserver +interface WebsocketServerObserver { /** * Called when the HTTP server is started. If an instance of WebsocketObserver is attached to multiple diff --git a/test/WebsocketTest.php b/test/WebsocketTest.php index b3f65a3..75d16de 100644 --- a/test/WebsocketTest.php +++ b/test/WebsocketTest.php @@ -20,7 +20,7 @@ use Amp\Websocket\Server\ClientHandler; use Amp\Websocket\Server\Gateway; use Amp\Websocket\Server\Websocket; -use Amp\Websocket\Server\WebsocketObserver; +use Amp\Websocket\Server\WebsocketServerObserver; use PHPUnit\Framework\MockObject\MockObject; use Psr\Http\Message\UriInterface as PsrUri; use Psr\Log\NullLogger; @@ -297,7 +297,7 @@ public function testWebsocketObserverAttachment(): \Generator $webserver = new HttpServer([Server::listen('127.0.0.1:0')], $websocket, new NullLogger); - $observer = $this->createMock(WebsocketObserver::class); + $observer = $this->createMock(WebsocketServerObserver::class); $observer->expects($this->once()) ->method('onStart') ->willReturn(new Success);