Merge pull request #85 from clue-labs/factory

WyriHaximus · web-flow · commit f5eaedb54368 · 2017-05-17T09:37:31.000+02:00
Replace Factory with Client constructor
diff --git a/README.md b/README.md
@@ -35,12 +35,7 @@ Interesting events emitted by Response:
 <?php
 
 $loop = React\EventLoop\Factory::create();
-
-$dnsResolverFactory = new React\Dns\Resolver\Factory();
-$dnsResolver = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
-$factory = new React\HttpClient\Factory();
-$client = $factory->create($loop, $dnsResolver);
+$client = new React\HttpClient\Client($loop);
 
 $request = $client->request('GET', 'https://github.com/');
 $request->on('response', function ($response) {
diff --git a/composer.json b/composer.json
@@ -7,7 +7,6 @@
         "php": ">=5.4.0",
         "guzzlehttp/psr7": "^1.0",
         "react/socket": "^0.7",
-        "react/dns": "0.4.*",
         "react/event-loop": "0.4.*",
         "react/stream": "0.4.*",
         "react/promise": "~2.2",
diff --git a/examples/01-google.php b/examples/01-google.php
@@ -1,17 +1,12 @@
 <?php
 
-use React\HttpClient\Factory;
+use React\HttpClient\Client;
 use React\HttpClient\Response;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-
-$resolverFactory = new React\Dns\Resolver\Factory();
-$resolver = $resolverFactory->create('8.8.8.8', $loop);
-
-$factory = new Factory();
-$client = $factory->create($loop, $resolver);
+$client = new Client($loop);
 
 $request = $client->request('GET', 'https://google.com/');
 
diff --git a/examples/02-post-json.php b/examples/02-post-json.php
@@ -1,17 +1,12 @@
 <?php
 
-use React\HttpClient\Factory;
+use React\HttpClient\Client;
 use React\HttpClient\Response;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-
-$resolverFactory = new React\Dns\Resolver\Factory();
-$resolver = $resolverFactory->create('8.8.8.8', $loop);
-
-$factory = new Factory();
-$client = $factory->create($loop, $resolver);
+$client = new Client($loop);
 
 $data = json_encode(array('result' => 42));
 
diff --git a/examples/03-streaming.php b/examples/03-streaming.php
@@ -1,17 +1,12 @@
 <?php
 
-use React\HttpClient\Factory;
+use React\HttpClient\Client;
 use React\HttpClient\Response;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-
-$resolverFactory = new React\Dns\Resolver\Factory();
-$resolver = $resolverFactory->create('8.8.8.8', $loop);
-
-$factory = new Factory();
-$client = $factory->create($loop, $resolver);
+$client = new Client($loop);
 
 $request = $client->request('GET', 'http://httpbin.org/drip?duration=5&numbytes=5&code=200');
 
diff --git a/src/Client.php b/src/Client.php
@@ -2,14 +2,20 @@
 
 namespace React\HttpClient;
 
+use React\EventLoop\LoopInterface;
 use React\Socket\ConnectorInterface;
+use React\Socket\Connector;
 
 class Client
 {
     private $connector;
 
-    public function __construct(ConnectorInterface $connector)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector = null)
     {
+        if ($connector === null) {
+            $connector = new Connector($loop);
+        }
+
         $this->connector = $connector;
     }
 
diff --git a/src/Factory.php b/src/Factory.php

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,20 @@`
`2`	`2`
`3`	`3`	`namespace React\HttpClient;`
`4`	`4`
	`5`	`+use React\EventLoop\LoopInterface;`
`5`	`6`	`use React\Socket\ConnectorInterface;`
	`7`	`+use React\Socket\Connector;`
`6`	`8`
`7`	`9`	`class Client`
`8`	`10`	`{`
`9`	`11`	`private $connector;`
`10`	`12`
`11`		`- public function __construct(ConnectorInterface $connector)`
	`13`	`+ public function __construct(LoopInterface $loop, ConnectorInterface $connector = null)`
`12`	`14`	`{`
	`15`	`+ if ($connector === null) {`
	`16`	`+ $connector = new Connector($loop);`
	`17`	`+ }`
	`18`	`+`
`13`	`19`	`$this->connector = $connector;`
`14`	`20`	`}`
`15`	`21`