Merge pull request #84 from clue-labs/socket

WyriHaximus · web-flow · commit 5902038b7885 · 2017-04-23T20:15:47.000+02:00
Replace deprecated SocketClient with new Socket component
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": ">=5.4.0",
         "guzzlehttp/psr7": "^1.0",
-        "react/socket-client": "^0.6",
+        "react/socket": "^0.7",
         "react/dns": "0.4.*",
         "react/event-loop": "0.4.*",
         "react/stream": "0.4.*",
diff --git a/src/Client.php b/src/Client.php
@@ -2,29 +2,21 @@
 
 namespace React\HttpClient;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 
 class Client
 {
     private $connector;
-    private $secureConnector;
 
-    public function __construct(ConnectorInterface $connector, ConnectorInterface $secureConnector)
+    public function __construct(ConnectorInterface $connector)
     {
         $this->connector = $connector;
-        $this->secureConnector = $secureConnector;
     }
 
     public function request($method, $url, array $headers = [], $protocolVersion = '1.0')
     {
         $requestData = new RequestData($method, $url, $headers, $protocolVersion);
-        $connector = $this->getConnectorForScheme($requestData->getScheme());
 
-        return new Request($connector, $requestData);
-    }
-
-    private function getConnectorForScheme($scheme)
-    {
-        return ('https' === $scheme) ? $this->secureConnector : $this->connector;
+        return new Request($this->connector, $requestData);
     }
 }
diff --git a/src/Factory.php b/src/Factory.php
@@ -4,16 +4,16 @@
 
 use React\EventLoop\LoopInterface;
 use React\Dns\Resolver\Resolver;
-use React\SocketClient\Connector;
-use React\SocketClient\SecureConnector;
+use React\Socket\Connector;
 
 class Factory
 {
     public function create(LoopInterface $loop, Resolver $resolver)
     {
-        $connector = new Connector($loop, $resolver);
-        $secureConnector = new SecureConnector($connector, $loop);
+        $connector = new Connector($loop, array(
+            'dns' => $resolver
+        ));
 
-        return new Client($connector, $secureConnector);
+        return new Client($connector);
     }
 }
diff --git a/src/Request.php b/src/Request.php
@@ -4,7 +4,7 @@
 
 use Evenement\EventEmitterTrait;
 use GuzzleHttp\Psr7 as gPsr;
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\Stream\WritableStreamInterface;
 
 /**
@@ -230,6 +230,10 @@ protected function connect()
         $host = $this->requestData->getHost();
         $port = $this->requestData->getPort();
 
+        if ($this->requestData->getScheme() === 'https') {
+            $host = 'tls://' . $host;
+        }
+
         return $this->connector
             ->connect($host . ':' . $port);
     }
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -5,9 +5,7 @@
 use React\HttpClient\Request;
 use React\HttpClient\RequestData;
 use React\Stream\Stream;
-use React\Promise\FulfilledPromise;
 use React\Promise\RejectedPromise;
-use React\Promise;
 use React\Promise\Deferred;
 
 class RequestTest extends TestCase
@@ -17,11 +15,11 @@ class RequestTest extends TestCase
 
     public function setUp()
     {
-        $this->stream = $this->getMockBuilder('React\Stream\Stream')
+        $this->stream = $this->getMockBuilder('React\Socket\Connection')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->connector = $this->getMockBuilder('React\SocketClient\ConnectorInterface')
+        $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')
             ->getMock();
 
         $this->response = $this->getMockBuilder('React\HttpClient\Response')

Original file line number	Diff line number	Diff line change
`@@ -2,29 +2,21 @@`
`2`	`2`
`3`	`3`	`namespace React\HttpClient;`
`4`	`4`
`5`		`-use React\SocketClient\ConnectorInterface;`
	`5`	`+use React\Socket\ConnectorInterface;`
`6`	`6`
`7`	`7`	`class Client`
`8`	`8`	`{`
`9`	`9`	`private $connector;`
`10`		`- private $secureConnector;`
`11`	`10`
`12`		`- public function __construct(ConnectorInterface $connector, ConnectorInterface $secureConnector)`
	`11`	`+ public function __construct(ConnectorInterface $connector)`
`13`	`12`	`{`
`14`	`13`	`$this->connector = $connector;`
`15`		`- $this->secureConnector = $secureConnector;`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`public function request($method, $url, array $headers = [], $protocolVersion = '1.0')`
`19`	`17`	`{`
`20`	`18`	`$requestData = new RequestData($method, $url, $headers, $protocolVersion);`
`21`		`- $connector = $this->getConnectorForScheme($requestData->getScheme());`
`22`	`19`
`23`		`- return new Request($connector, $requestData);`
`24`		`- }`
`25`		`-`
`26`		`- private function getConnectorForScheme($scheme)`
`27`		`- {`
`28`		`- return ('https' === $scheme) ? $this->secureConnector : $this->connector;`
	`20`	`+ return new Request($this->connector, $requestData);`
`29`	`21`	`}`
`30`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,16 @@`
`4`	`4`
`5`	`5`	`use React\EventLoop\LoopInterface;`
`6`	`6`	`use React\Dns\Resolver\Resolver;`
`7`		`-use React\SocketClient\Connector;`
`8`		`-use React\SocketClient\SecureConnector;`
	`7`	`+use React\Socket\Connector;`
`9`	`8`
`10`	`9`	`class Factory`
`11`	`10`	`{`
`12`	`11`	`public function create(LoopInterface $loop, Resolver $resolver)`
`13`	`12`	`{`
`14`		`- $connector = new Connector($loop, $resolver);`
`15`		`- $secureConnector = new SecureConnector($connector, $loop);`
	`13`	`+ $connector = new Connector($loop, array(`
	`14`	`+ 'dns' => $resolver`
	`15`	`+ ));`
`16`	`16`
`17`		`- return new Client($connector, $secureConnector);`
	`17`	`+ return new Client($connector);`
`18`	`18`	`}`
`19`	`19`	`}`