Rename ConnectionManager to Connector

Author: igorw

Client.php

@@ -5,56 +5,56 @@
 use Guzzle\Http\Message\Request as GuzzleRequest;
 use React\EventLoop\LoopInterface;
 use React\HttpClient\Request as ClientRequest;
-use React\SocketClient\ConnectionManagerInterface;
+use React\SocketClient\ConnectorInterface;
 
 class Client
 {
     private $loop;
 
-    private $connectionManager;
+    private $connector;
 
-    private $secureConnectionManager;
+    private $secureConnector;
 
-    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())
     {
         $guzzleRequest = new GuzzleRequest($method, $url, $headers);
-        $connectionManager = $this->getConnectionManagerForScheme($guzzleRequest->getScheme());
-        return new ClientRequest($this->loop, $connectionManager, $guzzleRequest);
+        $connector = $this->getConnectorForScheme($guzzleRequest->getScheme());
+        return new ClientRequest($this->loop, $connector, $guzzleRequest);
     }
 
-    public function setConnectionManager(ConnectionManagerInterface $connectionManager)
+    public function setConnector(ConnectorInterface $connector)
     {
-        $this->connectionManager = $connectionManager;
+        $this->connector = $connector;
     }
 
-    public function getConnectionManager()
+    public function getConnector()
     {
-        return $this->connectionManager;
+        return $this->connector;
     }
 
-    public function setSecureConnectionManager(ConnectionManagerInterface $connectionManager)
+    public function setSecureConnector(ConnectorInterface $connector)
     {
-        $this->secureConnectionManager = $connectionManager;
+        $this->secureConnector = $connector;
     }
 
-    public function getSecureConnectionManager()
+    public function getSecureConnector()
     {
-        return $this->secureConnectionManager;
+        return $this->secureConnector;
     }
 
-    private function getConnectionManagerForScheme($scheme)
+    private function getConnectorForScheme($scheme)
     {
         if ('https' === $scheme) {
-            return $this->getSecureConnectionManager();
+            return $this->getSecureConnector();
         } else {
-            return $this->getConnectionManager();
+            return $this->getConnector();
         }
     }
 }

Factory.php

@@ -4,16 +4,16 @@
 
 use React\EventLoop\LoopInterface;
 use React\Dns\Resolver\Resolver;
-use React\SocketClient\ConnectionManager;
-use React\SocketClient\SecureConnectionManager;
+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($connectionManager, $loop);
-        return new Client($loop, $connectionManager, $secureConnectionManager);
+        $connector = new Connector($loop, $resolver);
+        $secureConnector = new SecureConnector($connector, $loop);
+        return new Client($loop, $connector, $secureConnector);
     }
 }
 

Request.php

@@ -9,7 +9,7 @@
 use React\EventLoop\LoopInterface;
 use React\HttpClient\Response;
 use React\HttpClient\ResponseHeaderParser;
-use React\SocketClient\ConnectionManagerInterface;
+use React\SocketClient\ConnectorInterface;
 use React\Stream\Stream;
 use React\Stream\WritableStreamInterface;
 
@@ -26,17 +26,17 @@ class Request extends EventEmitter implements WritableStreamInterface
 
     private $request;
     private $loop;
-    private $connectionManager;
+    private $connector;
     private $stream;
     private $buffer;
     private $responseFactory;
     private $response;
     private $state = self::STATE_INIT;
 
-    public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, GuzzleRequest $request)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector, GuzzleRequest $request)
     {
         $this->loop = $loop;
-        $this->connectionManager = $connectionManager;
+        $this->connector = $connector;
         $this->request = $request;
     }
 
@@ -218,7 +218,7 @@ protected function connect()
         $host = $this->request->getHost();
         $port = $this->request->getPort();
 
-        return $this->connectionManager
+        return $this->connector
             ->getConnection($host, $port);
     }