diff --git a/src/Ratchet/Component/Server/IOServerComponent.php b/src/Ratchet/Component/Server/IOServerComponent.php index e207540..15bb5f5 100644 --- a/src/Ratchet/Component/Server/IOServerComponent.php +++ b/src/Ratchet/Component/Server/IOServerComponent.php @@ -162,6 +162,7 @@ class IOServerComponent implements MessageComponentInterface { $new_connection = new Connection($new_socket); $new_connection->remoteAddress = $new_socket->getRemoteAddress(); + $new_connection->resourceId = (int)substr((string)$new_socket->getResource(), strrpos((string)$new_socket->getResource(), '#') + 1); $this->_resources[] = $new_connection->getSocket()->getResource(); $this->_connections[$new_connection->getSocket()->getResource()] = $new_connection; diff --git a/src/Ratchet/Resource/Connection.php b/src/Ratchet/Resource/Connection.php index df2c5c4..4f1485c 100644 --- a/src/Ratchet/Resource/Connection.php +++ b/src/Ratchet/Resource/Connection.php @@ -16,13 +16,6 @@ class Connection implements ConnectionInterface { $this->_socket = $socket; } - /** - * @return int - */ - public function getID() { - return (int)(string)$this->_socket; - } - /** * This is here because I couldn't figure out a better/easier way to tie a connection and socket together for the server and commands * Anyway, if you're here, it's not recommended you use this/directly interact with the socket in your App... diff --git a/src/Ratchet/Resource/ConnectionInterface.php b/src/Ratchet/Resource/ConnectionInterface.php index 6b0608c..93dd516 100644 --- a/src/Ratchet/Resource/ConnectionInterface.php +++ b/src/Ratchet/Resource/ConnectionInterface.php @@ -2,8 +2,4 @@ namespace Ratchet\Resource; interface ConnectionInterface { - /** - * @return int - */ - function getId(); } \ No newline at end of file diff --git a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php index 5a03df0..f0a3389 100644 --- a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php +++ b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php @@ -43,7 +43,7 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase { $this->_server->onOpen($master); $clone = $this->_decorated->_conn_open; - $this->assertEquals($master->getID() + 1, $clone->getID()); + $this->assertEquals($master->resourceId + 1, $clone->resourceId); } public function testOnMessageSendsToApp() { diff --git a/tests/Ratchet/Tests/Mock/FakeSocket.php b/tests/Ratchet/Tests/Mock/FakeSocket.php index f547238..1ef7e63 100644 --- a/tests/Ratchet/Tests/Mock/FakeSocket.php +++ b/tests/Ratchet/Tests/Mock/FakeSocket.php @@ -12,7 +12,7 @@ class FakeSocket implements SocketInterface { public $_last = array(); public function getResource() { - return null; + return "#{$this->_id}"; } public function __toString() {