Skip to content

Commit fc5309f

Browse files
committed
Removed Defaultdict.php
1 parent 6914850 commit fc5309f

File tree

3 files changed

+7
-192
lines changed

3 files changed

+7
-192
lines changed

sockets.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DemoSslEchoHandler extends WebSocketUriHandler
2727
/**
2828
* @var TcpStream[][]
2929
*/
30-
protected $streams;
30+
protected $streams = array();
3131
protected $server;
3232

3333
/**
@@ -48,18 +48,21 @@ protected function getStream(IWebSocketConnection $user, $id)
4848
*/
4949
protected function getStreamsByUser(IWebSocketConnection $user)
5050
{
51-
return $this->streams[$user->getId()];
51+
return array_key_exists($user->getId(), $this->streams) ? $this->streams[$user->getId()] : [];
5252
}
5353

5454
protected function removeStream(IWebSocketConnection $user, TcpStream $stream)
5555
{
5656
unset($this->streams[$user->getId()][$stream->getId()]);
5757
}
5858

59+
protected function addStream(IWebSocketConnection $user, TcpStream $stream){
60+
$this->streams[$user->getId()][$stream->getId()] = $stream;
61+
}
62+
5963
public function __construct(\Devristo\Phpws\Server\SocketServer $server, $logger)
6064
{
6165
parent::__construct($logger);
62-
$this->streams = new DefaultDict(array());
6366
$this->socketServer = $server;
6467
}
6568

@@ -132,7 +135,7 @@ protected function requestConnect(IWebSocketConnection $user, $message)
132135
$uriHandler->removeStream($user, $stream);
133136
});
134137

135-
$this->streams[$user->getId()][$stream->getId()] = $stream;
138+
$this->addStream($user, $stream);
136139

137140
$user->sendString(json_encode(array(
138141
'connection' => $stream->getId(),

src/Devristo/Phpws/Utilities/DefaultDict.php

Lines changed: 0 additions & 94 deletions
This file was deleted.

src/Devristo/Phpws/Utilities/Defaultdict.php

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)