Skip to content

Commit bef4d8c

Browse files
committed
Remove unneeded loop argument from HttpClient: Client, Request, Response
1 parent 835e440 commit bef4d8c

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

Client.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88

99
class Client
1010
{
11-
private $loop;
1211
private $connectionManager;
1312
private $secureConnectionManager;
1413

15-
public function __construct(LoopInterface $loop, ConnectorInterface $connector, ConnectorInterface $secureConnector)
14+
public function __construct(ConnectorInterface $connector, ConnectorInterface $secureConnector)
1615
{
17-
$this->loop = $loop;
1816
$this->connector = $connector;
1917
$this->secureConnector = $secureConnector;
2018
}
@@ -23,7 +21,7 @@ public function request($method, $url, array $headers = array())
2321
{
2422
$requestData = new RequestData($method, $url, $headers);
2523
$connectionManager = $this->getConnectorForScheme($requestData->getScheme());
26-
return new Request($this->loop, $connectionManager, $requestData);
24+
return new Request($connectionManager, $requestData);
2725

2826
}
2927

Factory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function create(LoopInterface $loop, Resolver $resolver)
1313
{
1414
$connector = new Connector($loop, $resolver);
1515
$secureConnector = new SecureConnector($connector, $loop);
16-
return new Client($loop, $connector, $secureConnector);
16+
return new Client($connector, $secureConnector);
1717
}
1818
}
1919

Request.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class Request extends EventEmitter implements WritableStreamInterface
2222
const STATE_HEAD_WRITTEN = 2;
2323
const STATE_END = 3;
2424

25-
private $loop;
2625
private $connector;
2726
private $requestData;
2827

@@ -32,9 +31,8 @@ class Request extends EventEmitter implements WritableStreamInterface
3231
private $response;
3332
private $state = self::STATE_INIT;
3433

35-
public function __construct(LoopInterface $loop, ConnectorInterface $connector, RequestData $requestData)
34+
public function __construct(ConnectorInterface $connector, RequestData $requestData)
3635
{
37-
$this->loop = $loop;
3836
$this->connector = $connector;
3937
$this->requestData = $requestData;
4038
}
@@ -227,12 +225,10 @@ public function setResponseFactory($factory)
227225
public function getResponseFactory()
228226
{
229227
if (null === $factory = $this->responseFactory) {
230-
$loop = $this->loop;
231228
$stream = $this->stream;
232229

233-
$factory = function ($protocol, $version, $code, $reasonPhrase, $headers) use ($loop, $stream) {
230+
$factory = function ($protocol, $version, $code, $reasonPhrase, $headers) use ($stream) {
234231
return new Response(
235-
$loop,
236232
$stream,
237233
$protocol,
238234
$version,

Response.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
class Response extends EventEmitter implements ReadableStreamInterface
1313
{
14-
private $loop;
1514
private $stream;
1615
private $protocol;
1716
private $version;
@@ -20,9 +19,8 @@ class Response extends EventEmitter implements ReadableStreamInterface
2019
private $headers;
2120
private $readable = true;
2221

23-
public function __construct(LoopInterface $loop, Stream $stream, $protocol, $version, $code, $reasonPhrase, $headers)
22+
public function __construct(Stream $stream, $protocol, $version, $code, $reasonPhrase, $headers)
2423
{
25-
$this->loop = $loop;
2624
$this->stream = $stream;
2725
$this->protocol = $protocol;
2826
$this->version = $version;

0 commit comments

Comments
 (0)