Update SocketClient to v0.6

Author: clue

composer.json

@@ -14,7 +14,7 @@
         "php": ">=5.3",
         "evenement/evenement": "~1.0|~2.0",
         "react/promise": "~1.0|~2.0",
-        "react/socket-client": "^0.5 || ^0.4 || ^0.3",
+        "react/socket-client": "^0.6",
         "react/event-loop": "0.3.*|0.4.*"
     },
     "require-dev": {

src/Client.php

@@ -2,17 +2,17 @@
 
 namespace Clue\React\Ami;
 
-use Clue\React\Ami\Protocol\Event;
 use Clue\React\Ami\Protocol\Action;
-use Evenement\EventEmitter;
-use React\Stream\Stream;
+use Clue\React\Ami\Protocol\ErrorException;
+use Clue\React\Ami\Protocol\Event;
+use Clue\React\Ami\Protocol\Message;
 use Clue\React\Ami\Protocol\Parser;
+use Clue\React\Ami\Protocol\UnexpectedMessageException;
+use Evenement\EventEmitter;
 use React\Promise\Deferred;
+use React\SocketClient\ConnectionInterface;
 use Exception;
 use UnexpectedValueException;
-use Clue\React\Ami\Protocol\Message;
-use Clue\React\Ami\Protocol\ErrorException;
-use Clue\React\Ami\Protocol\UnexpectedMessageException;
 
 class Client extends EventEmitter
 {
@@ -23,7 +23,7 @@ class Client extends EventEmitter
 
     private $actionId = 0;
 
-    public function __construct(Stream $stream, Parser $parser = null)
+    public function __construct(ConnectionInterface $stream, Parser $parser = null)
     {
         if ($parser === null) {
             $parser = new Parser();
@@ -47,8 +47,6 @@ public function __construct(Stream $stream, Parser $parser = null)
         $this->on('error', array($that, 'close'));
 
         $this->stream->on('close', array ($that, 'close'));
-
-        $this->stream->resume();
     }
 
     public function request(Action $message)

src/Factory.php

@@ -3,11 +3,11 @@
 namespace Clue\React\Ami;
 
 use React\EventLoop\LoopInterface;
+use React\SocketClient\ConnectionInterface;
 use React\SocketClient\ConnectorInterface;
 use React\SocketClient\Connector;
 use React\SocketClient\SecureConnector;
 use React\Dns\Resolver\Factory as ResolverFactory;
-use React\Stream\Stream;
 use InvalidArgumentException;
 
 class Factory
@@ -38,7 +38,7 @@ public function createClient($address = null)
         $secure = (isset($parts['scheme']) && $parts['scheme'] !== 'tcp');
         $connector = $secure ? $this->secureConnector : $this->connector;
 
-        $promise = $connector->create($parts['host'], $parts['port'])->then(function (Stream $stream) {
+        $promise = $connector->connect($parts['host'] . ':' . $parts['port'])->then(function (ConnectionInterface $stream) {
             return new Client($stream);
         });
 

tests/ClientTest.php

@@ -16,19 +16,19 @@ public function testClosingStreamClosesClient()
 
         $client->on('close', $this->expectCallableOnce());
 
-        $stream->close();
-        //$stream->emit('close', array($this));
+        $stream->emit('close');
     }
 
     public function testParserExceptionForwardsErrorAndClosesClient()
     {
         $stream = $this->createStreamMock();
+        $stream->expects($this->once())->method('close');
+
         $parser = new Parser();
 
         $client = new Client($stream, $parser);
 
         $client->on('error', $this->expectCallableOnce());
-        $client->on('close', $this->expectCallableOnce());
 
         $stream->emit('data', array("invalid chunk\r\n\r\ninvalid chunk\r\n\r\n"));
     }
@@ -45,6 +45,6 @@ public function testUnexpectedResponseEmitsErrorAndClosesClient()
 
     private function createStreamMock()
     {
-        return new Stream(fopen('php://memory', 'r+'), $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock());
+        return $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('write', 'close'))->getMock();
     }
 }

tests/CollectorTest.php

@@ -51,7 +51,7 @@ public function testCollectingSIPEvents()
 
     private function createClientMock()
     {
-        $stream = $this->getMockBuilder('React\Stream\Stream')->disableOriginalConstructor()->getMock();
+        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->getMock();
 
         $client = $this->getMockBuilder('Clue\React\Ami\Client')->setMethods(array('createAction'))->setConstructorArgs(array($stream))->getMock();
 

tests/FactoryTest.php

@@ -26,23 +26,23 @@ public function testDefaultCtor()
     public function testCreateClientUsesTcpConnectorWithDefaultLocation()
     {
         $promise = new Promise(function () { });
-        $this->tcp->expects($this->once())->method('create')->with('127.0.0.1', 5038)->willReturn($promise);
+        $this->tcp->expects($this->once())->method('connect')->with('127.0.0.1:5038')->willReturn($promise);
 
         $this->factory->createClient();
     }
 
     public function testCreateClientUsesTcpConnectorWithLocalhostLocation()
     {
         $promise = new Promise(function () { });
-        $this->tcp->expects($this->once())->method('create')->with('127.0.0.1', 5038)->willReturn($promise);
+        $this->tcp->expects($this->once())->method('connect')->with('127.0.0.1:5038')->willReturn($promise);
 
         $this->factory->createClient('localhost');
     }
 
     public function testCreateClientUsesTlsConnectorWithTlsLocation()
     {
         $promise = new Promise(function () { });
-        $this->tls->expects($this->once())->method('create')->with('ami.local', 1234)->willReturn($promise);
+        $this->tls->expects($this->once())->method('connect')->with('ami.local:1234')->willReturn($promise);
 
         $this->factory->createClient('tls://ami.local:1234');
     }