Merge pull request #9 from clue-labs/socket

Replace deprecated SocketClient with new Socket component

Author: clue

README.md

@@ -47,7 +47,7 @@ establishing streaming connections, such as a normal TCP/IP connection.
 In order to use this library, you should understand how this integrates with its
 ecosystem.
 This base interface is actually defined in React's
-[SocketClient component](https://github.com/reactphp/socket-client) and used
+[Socket component](https://github.com/reactphp/socket) and used
 throughout React's ecosystem.
 
 Most higher-level components (such as HTTP, database or other networking
@@ -64,7 +64,7 @@ The interface only offers a single method:
 The `connect(string $uri): PromiseInterface<ConnectionInterface, Exception>` method
 can be used to establish a streaming connection.
 It returns a [Promise](https://github.com/reactphp/promise) which either
-fulfills with a [ConnectionInterface](https://github.com/reactphp/socket-client#connectioninterface) or
+fulfills with a [ConnectionInterface](https://github.com/reactphp/socket#connectioninterface) or
 rejects with an `Exception`:
 
 ```php
@@ -99,7 +99,7 @@ The proxy URL may or may not contain a scheme and port definition. The default
 port will be `80` for HTTP (or `443` for HTTPS), but many common HTTP proxy
 servers use custom ports.
 In its most simple form, the given connector will be a
-[`TcpConnector`](https://github.com/reactphp/socket-client#tcpconnector) if you
+[`TcpConnector`](https://github.com/reactphp/socket#tcpconnector) if you
 want to connect to a given IP address as above.
 
 This is the main class in this package.
@@ -134,7 +134,7 @@ Many (public) proxy servers do in fact limit this to HTTPS (443) only.
 
 If you want to establish a TLS connection (such as HTTPS) between you and
 your destination, you may want to wrap this connector in a
-[`SecureConnector`](https://github.com/reactphp/socket-client#secureconnector)
+[`SecureConnector`](https://github.com/reactphp/socket#secureconnector)
 instance:
 
 ```php
@@ -156,7 +156,7 @@ destination host as above.
 
 If you want to connect to a (rather rare) HTTPS proxy, you may want use its
 HTTPS port (443) and use a
-[`SecureConnector`](https://github.com/reactphp/socket-client#secureconnector)
+[`SecureConnector`](https://github.com/reactphp/socket#secureconnector)
 instance to create a secure connection to the proxy:
 
 ```php
@@ -206,7 +206,7 @@ MIT
 * If you want to learn more about how the
   [`ConnectorInterface`](#connectorinterface) and its usual implementations look
   like, refer to the documentation of the underlying
-  [react/socket-client](https://github.com/reactphp/socket-client) component.
+  [react/socket](https://github.com/reactphp/socket) component.
 * As an alternative to an HTTP CONNECT proxy, you may also want to look into
   using a SOCKS (SOCKS4/SOCKS5) proxy instead.
   You may want to use [clue/socks-react](https://github.com/clue/php-socks-react)

composer.json

@@ -18,7 +18,7 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/socket-client": "^0.7 || ^0.6",
+        "react/socket": "^0.7.1",
         "react/event-loop": "^0.4 || ^0.3",
         "react/promise": " ^2.1 || ^1.2",
         "ringcentral/psr7": "^1.2"

examples/01-proxy-https.php

@@ -4,9 +4,9 @@
 // The proxy can be given as first argument and defaults to localhost:8080 otherwise.
 
 use Clue\React\HttpProxy\ProxyConnector;
-use React\SocketClient\TcpConnector;
-use React\SocketClient\SecureConnector;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\TcpConnector;
+use React\Socket\SecureConnector;
+use React\Socket\ConnectionInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 

examples/02-optional-proxy-https.php

@@ -8,11 +8,11 @@
 // network protocol otherwise.
 
 use Clue\React\HttpProxy\ProxyConnector;
-use React\SocketClient\TcpConnector;
-use React\SocketClient\SecureConnector;
-use React\SocketClient\DnsConnector;
+use React\Socket\TcpConnector;
+use React\Socket\SecureConnector;
+use React\Socket\DnsConnector;
 use React\Dns\Resolver\Factory;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\ConnectionInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 

examples/11-proxy-smtp.php

@@ -5,8 +5,8 @@
 // Please note that MANY public proxies do not allow SMTP connections, YMMV.
 
 use Clue\React\HttpProxy\ProxyConnector;
-use React\SocketClient\TcpConnector;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\TcpConnector;
+use React\Socket\ConnectionInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 

examples/12-proxy-smtps.php

@@ -8,9 +8,9 @@
 // Please note that MANY public proxies do not allow SMTP connections, YMMV.
 
 use Clue\React\HttpProxy\ProxyConnector;
-use React\SocketClient\TcpConnector;
-use React\SocketClient\SecureConnector;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\TcpConnector;
+use React\Socket\SecureConnector;
+use React\Socket\ConnectionInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 

src/ProxyConnector.php

@@ -2,13 +2,13 @@
 
 namespace Clue\React\HttpProxy;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use Exception;
 use InvalidArgumentException;
 use RuntimeException;
 use RingCentral\Psr7;
 use React\Promise\Deferred;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\ConnectionInterface;
 
 /**
  * A simple Connector that uses an HTTP CONNECT proxy to create plain TCP/IP connections to any destination

tests/FunctionalTest.php

@@ -4,10 +4,10 @@
 
 use React\EventLoop\Factory;
 use Clue\React\HttpProxy\ProxyConnector;
-use React\SocketClient\TcpConnector;
-use React\SocketClient\DnsConnector;
+use React\Socket\TcpConnector;
+use React\Socket\DnsConnector;
 use Clue\React\Block;
-use React\SocketClient\SecureConnector;
+use React\Socket\SecureConnector;
 
 class FunctionalTest extends AbstractTestCase
 {

tests/ProxyConnectorTest.php

@@ -4,15 +4,15 @@
 
 use Clue\React\HttpProxy\ProxyConnector;
 use React\Promise\Promise;
-use React\SocketClient\ConnectionInterface;
+use React\Socket\ConnectionInterface;
 
 class ProxyConnectorTest extends AbstractTestCase
 {
     private $connector;
 
     public function setUp()
     {
-        $this->connector = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
+        $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
     }
 
     /**
@@ -69,7 +69,7 @@ public function testCancelPromiseWillCancelPendingConnection()
 
     public function testWillWriteToOpenConnection()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
         $stream->expects($this->once())->method('write');
 
         $promise = \React\Promise\resolve($stream);
@@ -82,7 +82,7 @@ public function testWillWriteToOpenConnection()
 
     public function testRejectsAndClosesIfStreamWritesNonHttp()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
 
         $promise = \React\Promise\resolve($stream);
         $this->connector->expects($this->once())->method('connect')->willReturn($promise);
@@ -99,7 +99,7 @@ public function testRejectsAndClosesIfStreamWritesNonHttp()
 
     public function testRejectsAndClosesIfStreamWritesTooMuchData()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
 
         $promise = \React\Promise\resolve($stream);
         $this->connector->expects($this->once())->method('connect')->willReturn($promise);
@@ -116,7 +116,7 @@ public function testRejectsAndClosesIfStreamWritesTooMuchData()
 
     public function testRejectsAndClosesIfStreamReturnsNonSuccess()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
 
         $promise = \React\Promise\resolve($stream);
         $this->connector->expects($this->once())->method('connect')->willReturn($promise);
@@ -133,7 +133,7 @@ public function testRejectsAndClosesIfStreamReturnsNonSuccess()
 
     public function testResolvesIfStreamReturnsSuccess()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
 
         $promise = \React\Promise\resolve($stream);
         $this->connector->expects($this->once())->method('connect')->willReturn($promise);
@@ -153,7 +153,7 @@ public function testResolvesIfStreamReturnsSuccess()
 
     public function testResolvesIfStreamReturnsSuccessAndEmitsExcessiveData()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
 
         $promise = \React\Promise\resolve($stream);
         $this->connector->expects($this->once())->method('connect')->willReturn($promise);
@@ -172,7 +172,7 @@ public function testResolvesIfStreamReturnsSuccessAndEmitsExcessiveData()
 
     public function testCancelPromiseWillCloseOpenConnectionAndReject()
     {
-        $stream = $this->getMockBuilder('React\SocketClient\StreamConnection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();
         $stream->expects($this->once())->method('close');
 
         $promise = \React\Promise\resolve($stream);