Remove unneeded loop argument from HttpClient: Client, Request, Response

reactphp · Dec 4, 2013 · bef4d8c · bef4d8c
1 parent 835e440
commit bef4d8c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/Client.php b/Client.php
@@ -8,13 +8,11 @@
 
 class Client
 {
-    private $loop;
     private $connectionManager;
     private $secureConnectionManager;
 
-    public function __construct(LoopInterface $loop, ConnectorInterface $connector, ConnectorInterface $secureConnector)
+    public function __construct(ConnectorInterface $connector, ConnectorInterface $secureConnector)
     {
-        $this->loop = $loop;
         $this->connector = $connector;
         $this->secureConnector = $secureConnector;
     }
@@ -23,7 +21,7 @@ public function request($method, $url, array $headers = array())
     {
         $requestData = new RequestData($method, $url, $headers);
         $connectionManager = $this->getConnectorForScheme($requestData->getScheme());
-        return new Request($this->loop, $connectionManager, $requestData);
+        return new Request($connectionManager, $requestData);
 
     }
 

diff --git a/Factory.php b/Factory.php
@@ -13,7 +13,7 @@ public function create(LoopInterface $loop, Resolver $resolver)
     {
         $connector = new Connector($loop, $resolver);
         $secureConnector = new SecureConnector($connector, $loop);
-        return new Client($loop, $connector, $secureConnector);
+        return new Client($connector, $secureConnector);
     }
 }
 
diff --git a/Request.php b/Request.php
@@ -22,7 +22,6 @@ class Request extends EventEmitter implements WritableStreamInterface
     const STATE_HEAD_WRITTEN = 2;
     const STATE_END = 3;
 
-    private $loop;
     private $connector;
     private $requestData;
 
@@ -32,9 +31,8 @@ class Request extends EventEmitter implements WritableStreamInterface
     private $response;
     private $state = self::STATE_INIT;
 
-    public function __construct(LoopInterface $loop, ConnectorInterface $connector, RequestData $requestData)
+    public function __construct(ConnectorInterface $connector, RequestData $requestData)
     {
-        $this->loop = $loop;
         $this->connector = $connector;
         $this->requestData = $requestData;
     }
@@ -227,12 +225,10 @@ public function setResponseFactory($factory)
     public function getResponseFactory()
     {
         if (null === $factory = $this->responseFactory) {
-            $loop = $this->loop;
             $stream = $this->stream;
 
-            $factory = function ($protocol, $version, $code, $reasonPhrase, $headers) use ($loop, $stream) {
+            $factory = function ($protocol, $version, $code, $reasonPhrase, $headers) use ($stream) {
                 return new Response(
-                    $loop,
                     $stream,
                     $protocol,
                     $version,

diff --git a/Response.php b/Response.php
@@ -11,7 +11,6 @@
 
 class Response extends EventEmitter implements ReadableStreamInterface
 {
-    private $loop;
     private $stream;
     private $protocol;
     private $version;
@@ -20,9 +19,8 @@ class Response extends EventEmitter implements ReadableStreamInterface
     private $headers;
     private $readable = true;
 
-    public function __construct(LoopInterface $loop, Stream $stream, $protocol, $version, $code, $reasonPhrase, $headers)
+    public function __construct(Stream $stream, $protocol, $version, $code, $reasonPhrase, $headers)
     {
-        $this->loop = $loop;
         $this->stream = $stream;
         $this->protocol = $protocol;
         $this->version = $version;