Skip to content

Commit 1242186

Browse files
committed
Don't use deprecated Events class
1 parent 6069fdc commit 1242186

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Pusher/Amqp/AmqpServerPushHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Gos\Bundle\WebSocketBundle\Pusher\Amqp;
44

5-
use Gos\Bundle\WebSocketBundle\Event\Events;
65
use Gos\Bundle\WebSocketBundle\Event\PushHandlerEvent;
6+
use Gos\Bundle\WebSocketBundle\GosWebSocketEvents;
77
use Gos\Bundle\WebSocketBundle\Pusher\AbstractServerPushHandler;
88
use Gos\Bundle\WebSocketBundle\Pusher\Message;
99
use Gos\Bundle\WebSocketBundle\Router\WampRouter;
@@ -77,7 +77,7 @@ function (\AMQPEnvelope $envelope, \AMQPQueue $queue) use ($app) {
7777
$request = $this->router->match(new Topic($message->getTopic()));
7878
$app->onPush($request, $message->getData(), $this->getName());
7979
$queue->ack($envelope->getDeliveryTag());
80-
$this->eventDispatcher->dispatch(Events::PUSHER_SUCCESS, new PushHandlerEvent($envelope->getBody(), $this));
80+
$this->eventDispatcher->dispatch(GosWebSocketEvents::PUSHER_SUCCESS, new PushHandlerEvent($envelope->getBody(), $this));
8181
} catch (\Exception $e) {
8282
if (null !== $this->logger) {
8383
$this->logger->error(
@@ -91,7 +91,7 @@ function (\AMQPEnvelope $envelope, \AMQPQueue $queue) use ($app) {
9191

9292
$queue->reject($envelope->getDeliveryTag());
9393
$this->eventDispatcher->dispatch(
94-
Events::PUSHER_FAIL,
94+
GosWebSocketEvents::PUSHER_FAIL,
9595
new PushHandlerEvent($envelope->getBody(), $this)
9696
);
9797
}

Server/App/Stack/OriginCheck.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Gos\Bundle\WebSocketBundle\Server\App\Stack;
44

55
use Gos\Bundle\WebSocketBundle\Event\ClientRejectedEvent;
6-
use Gos\Bundle\WebSocketBundle\Event\Events;
6+
use Gos\Bundle\WebSocketBundle\GosWebSocketEvents;
77
use Psr\Http\Message\RequestInterface;
88
use Ratchet\ConnectionInterface;
99
use Ratchet\Http\CloseResponseTrait;
@@ -47,7 +47,7 @@ public function onOpen(ConnectionInterface $conn, RequestInterface $request = nu
4747

4848
if (!\in_array($origin, $this->allowedOrigins)) {
4949
$this->eventDispatcher->dispatch(
50-
Events::CLIENT_REJECTED,
50+
GosWebSocketEvents::CLIENT_REJECTED,
5151
new ClientRejectedEvent($origin, $request)
5252
);
5353

Server/App/WampApplication.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Gos\Bundle\WebSocketBundle\Client\ClientStorageInterface;
66
use Gos\Bundle\WebSocketBundle\Event\ClientErrorEvent;
77
use Gos\Bundle\WebSocketBundle\Event\ClientEvent;
8-
use Gos\Bundle\WebSocketBundle\Event\Events;
8+
use Gos\Bundle\WebSocketBundle\GosWebSocketEvents;
99
use Gos\Bundle\WebSocketBundle\Router\WampRequest;
1010
use Gos\Bundle\WebSocketBundle\Router\WampRouter;
1111
use Gos\Bundle\WebSocketBundle\Server\App\Dispatcher\RpcDispatcherInterface;
@@ -170,7 +170,7 @@ public function onUnSubscribe(ConnectionInterface $conn, $topic)
170170
public function onOpen(ConnectionInterface $conn)
171171
{
172172
$event = new ClientEvent($conn, ClientEvent::CONNECTED);
173-
$this->eventDispatcher->dispatch(Events::CLIENT_CONNECTED, $event);
173+
$this->eventDispatcher->dispatch(GosWebSocketEvents::CLIENT_CONNECTED, $event);
174174
}
175175

176176
public function onClose(ConnectionInterface $conn)
@@ -181,13 +181,13 @@ public function onClose(ConnectionInterface $conn)
181181
}
182182

183183
$event = new ClientEvent($conn, ClientEvent::DISCONNECTED);
184-
$this->eventDispatcher->dispatch(Events::CLIENT_DISCONNECTED, $event);
184+
$this->eventDispatcher->dispatch(GosWebSocketEvents::CLIENT_DISCONNECTED, $event);
185185
}
186186

187187
public function onError(ConnectionInterface $conn, \Exception $e)
188188
{
189189
$event = new ClientErrorEvent($conn, ClientEvent::ERROR);
190190
$event->setException($e);
191-
$this->eventDispatcher->dispatch(Events::CLIENT_ERROR, $event);
191+
$this->eventDispatcher->dispatch(GosWebSocketEvents::CLIENT_ERROR, $event);
192192
}
193193
}

Server/Type/WebSocketServer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Gos\Bundle\WebSocketBundle\Server\Type;
44

5-
use Gos\Bundle\WebSocketBundle\Event\Events;
65
use Gos\Bundle\WebSocketBundle\Event\ServerEvent;
6+
use Gos\Bundle\WebSocketBundle\GosWebSocketEvents;
77
use Gos\Bundle\WebSocketBundle\Server\App\ServerBuilderInterface;
88
use Psr\Log\LoggerAwareInterface;
99
use Psr\Log\LoggerAwareTrait;
@@ -60,7 +60,7 @@ public function launch(string $host, int $port, bool $profile): void
6060

6161
// Server Event Loop to add other services in the same loop.
6262
$event = new ServerEvent($this->loop, $server, $profile);
63-
$this->eventDispatcher->dispatch(Events::SERVER_LAUNCHED, $event);
63+
$this->eventDispatcher->dispatch(GosWebSocketEvents::SERVER_LAUNCHED, $event);
6464

6565
if (null !== $this->logger) {
6666
$this->logger->info(

0 commit comments

Comments
 (0)