Update SocketClient to v0.7

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.6",
+        "react/socket-client": "^0.7",
         "react/event-loop": "0.3.*|0.4.*"
     },
     "require-dev": {

src/Factory.php

@@ -4,46 +4,39 @@
 
 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\SocketClient\ConnectorInterface;
 use InvalidArgumentException;
 
 class Factory
 {
     private $loop;
     private $connector;
-    private $secureConnector;
 
-    public function __construct(LoopInterface $loop, ConnectorInterface $connector = null, ConnectorInterface $secureConnector = null)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector = null)
     {
         if ($connector === null) {
-            $resolverFactory = new ResolverFactory();
-            $connector = new Connector($loop, $resolverFactory->create('8.8.8.8', $loop));
-        }
-        if ($secureConnector === null) {
-            $secureConnector = new SecureConnector($connector, $loop);
+            $connector = new Connector($loop);
         }
 
         $this->loop = $loop;
         $this->connector = $connector;
-        $this->secureConnector = $secureConnector;
     }
 
     public function createClient($address = null)
     {
         $parts = $this->parseUrl($address);
 
-        $secure = (isset($parts['scheme']) && $parts['scheme'] !== 'tcp');
-        $connector = $secure ? $this->secureConnector : $this->connector;
+        if (isset($parts['scheme']) && $parts['scheme'] !== 'tcp') {
+            $parts['host'] = 'tls://' . $parts['host'];
+        }
 
-        $promise = $connector->connect($parts['host'] . ':' . $parts['port'])->then(function (ConnectionInterface $stream) {
+        $promise = $this->connector->connect($parts['host'] . ':' . $parts['port'])->then(function (ConnectionInterface $stream) {
             return new Client($stream);
         });
 
         if (isset($parts['user'])) {
-            $promise = $promise->then(function (Client $client) use ($parts, $secure) {
+            $promise = $promise->then(function (Client $client) use ($parts) {
                 $sender = new ActionSender($client);
 
                 return $sender->login($parts['user'], $parts['pass'])->then(

tests/FactoryTest.php

@@ -6,16 +6,14 @@ class FactoryTest extends TestCase
 {
     private $loop;
     private $tcp;
-    private $tls;
     private $factory;
 
     public function setUp()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $this->tcp = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
-        $this->tls = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
 
-        $this->factory = new Factory($this->loop, $this->tcp, $this->tls);
+        $this->factory = new Factory($this->loop, $this->tcp);
     }
 
     public function testDefaultCtor()
@@ -42,7 +40,7 @@ public function testCreateClientUsesTcpConnectorWithLocalhostLocation()
     public function testCreateClientUsesTlsConnectorWithTlsLocation()
     {
         $promise = new Promise(function () { });
-        $this->tls->expects($this->once())->method('connect')->with('ami.local:1234')->willReturn($promise);
+        $this->tcp->expects($this->once())->method('connect')->with('tls://ami.local:1234')->willReturn($promise);
 
         $this->factory->createClient('tls://ami.local:1234');
     }