Merge branch 'refs/heads/socket-client' into 0.3-client-merge

Conflicts:
	composer.lock
	src/React/HttpClient/Client.php
	src/React/HttpClient/Request.php
	tests/React/Tests/HttpClient/RequestTest.php

Author: cboden

Client.php

@@ -3,57 +3,33 @@
 namespace React\HttpClient;
 
 use React\EventLoop\LoopInterface;
-use React\HttpClient\ConnectionManager;
 use React\HttpClient\Request;
-use React\HttpClient\SecureConnectionManager;
+use React\SocketClient\ConnectorInterface;
 
 class Client
 {
     private $loop;
     private $connectionManager;
     private $secureConnectionManager;
 
-    public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, ConnectionManagerInterface $secureConnectionManager)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector, ConnectorInterface $secureConnector)
     {
         $this->loop = $loop;
-        $this->connectionManager = $connectionManager;
-        $this->secureConnectionManager = $secureConnectionManager;
+        $this->connector = $connector;
+        $this->secureConnector = $secureConnector;
     }
 
     public function request($method, $url, array $headers = array())
     {
         $requestData = new RequestData($method, $url, $headers);
-        $connectionManager = $this->getConnectionManagerForScheme($requestData->getScheme());
+        $connectionManager = $this->getConnectorForScheme($requestData->getScheme());
         return new Request($this->loop, $connectionManager, $requestData);
-    }
-
-    public function setConnectionManager(ConnectionManagerInterface $connectionManager)
-    {
-        $this->connectionManager = $connectionManager;
-    }
 
-    public function getConnectionManager()
-    {
-        return $this->connectionManager;
-    }
-
-    public function setSecureConnectionManager(ConnectionManagerInterface $connectionManager)
-    {
-        $this->secureConnectionManager = $connectionManager;
-    }
-
-    public function getSecureConnectionManager()
-    {
-        return $this->secureConnectionManager;
     }
 
-    private function getConnectionManagerForScheme($scheme)
+    private function getConnectorForScheme($scheme)
     {
-        if ('https' === $scheme) {
-            return $this->getSecureConnectionManager();
-        } else {
-            return $this->getConnectionManager();
-        }
+        return ('https' === $scheme) ? $this->secureConnector : $this->connector;
     }
 }
 

ConnectionManager.php

@@ -4,14 +4,16 @@
 
 use React\EventLoop\LoopInterface;
 use React\Dns\Resolver\Resolver;
+use React\SocketClient\Connector;
+use React\SocketClient\SecureConnector;
 
 class Factory
 {
     public function create(LoopInterface $loop, Resolver $resolver)
     {
-        $connectionManager = new ConnectionManager($loop, $resolver);
-        $secureConnectionManager = new SecureConnectionManager($loop, $resolver);
-        return new Client($loop, $connectionManager, $secureConnectionManager);
+        $connector = new Connector($loop, $resolver);
+        $secureConnector = new SecureConnector($connector, $loop);
+        return new Client($loop, $connector, $secureConnector);
     }
 }
 

ConnectionManagerInterface.php

@@ -5,9 +5,9 @@
 use Evenement\EventEmitter;
 use Guzzle\Parser\Message\MessageParser;
 use React\EventLoop\LoopInterface;
-use React\HttpClient\ConnectionManagerInterface;
 use React\HttpClient\Response;
 use React\HttpClient\ResponseHeaderParser;
+use React\SocketClient\ConnectorInterface;
 use React\Stream\Stream;
 use React\Stream\WritableStreamInterface;
 
@@ -23,7 +23,7 @@ class Request extends EventEmitter implements WritableStreamInterface
     const STATE_END = 3;
 
     private $loop;
-    private $connectionManager;
+    private $connector;
     private $requestData;
 
     private $stream;
@@ -32,10 +32,10 @@ class Request extends EventEmitter implements WritableStreamInterface
     private $response;
     private $state = self::STATE_INIT;
 
-    public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, RequestData $requestData)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector, RequestData $requestData)
     {
         $this->loop = $loop;
-        $this->connectionManager = $connectionManager;
+        $this->connector = $connector;
         $this->requestData = $requestData;
     }
 
@@ -217,8 +217,8 @@ protected function connect()
         $host = $this->requestData->getHost();
         $port = $this->requestData->getPort();
 
-        return $this->connectionManager
-            ->getConnection($host, $port);
+        return $this->connector
+            ->createTcp($host, $port);
     }
 
     public function setResponseFactory($factory)