Merge pull request #17 from clue-labs/socket

Replace deprecated SocketClient with new Socket component

Author: clue

README.md

@@ -1,7 +1,7 @@
 # clue/connection-manager-extra [![Build Status](https://travis-ci.org/clue/php-connection-manager-extra.svg?branch=master)](https://travis-ci.org/clue/php-connection-manager-extra)
 
 This project provides _extra_ (in terms of "additional", "extraordinary", "special" and "unusual") decorators,
-built on top of [ReactPHP's SocketClient](https://github.com/reactphp/socket-client).
+built on top of [ReactPHP's Socket](https://github.com/reactphp/socket).
 
 **Table of Contents**
 
@@ -22,12 +22,12 @@ built on top of [ReactPHP's SocketClient](https://github.com/reactphp/socket-cli
 
 ## Introduction
 
-If you're not already familar with [react/socket-client](https://github.com/reactphp/socket-client),
+If you're not already familar with [react/socket](https://github.com/reactphp/socket),
 think of it as an async (non-blocking) version of [`fsockopen()`](http://php.net/manual/en/function.fsockopen.php)
 or [`stream_socket_client()`](http://php.net/manual/en/function.stream-socket-client.php).
 I.e. before you can send and receive data to/from a remote server, you first have to establish a connection - which
 takes its time because it involves several steps.
-In order to be able to establish several connections at the same time, [react/socket-client](https://github.com/reactphp/socket-client) provides a simple
+In order to be able to establish several connections at the same time, [react/socket](https://github.com/reactphp/socket) provides a simple
 API to establish simple connections in an async (non-blocking) way.
 
 This project includes several classes that extend this base functionality by implementing the same simple `ConnectorInterface`.
@@ -55,7 +55,7 @@ any combination thereof.
 
 This section lists all this libraries' features along with some examples.
 The examples assume you've [installed](#install) this library and
-already [set up a `SocketClient/Connector` instance `$connector`](https://github.com/reactphp/socket-client#async-tcpip-connections).
+already [set up a `Socket/Connector` instance `$connector`](https://github.com/reactphp/socket#connector).
 
 All classes are located in the `ConnectionManager\Extra` namespace.
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "clue/connection-manager-extra",
-    "description": "Extra decorators for creating async TCP/IP connections, built on top of ReactPHP's SocketClient",
-    "keywords": ["SocketClient", "network", "connection", "timeout", "delay", "reject", "repeat", "retry", "random", "acl", "firewall", "ReactPHP"],
+    "description": "Extra decorators for creating async TCP/IP connections, built on top of ReactPHP's Socket component",
+    "keywords": ["Socket", "network", "connection", "timeout", "delay", "reject", "repeat", "retry", "random", "acl", "firewall", "ReactPHP"],
     "homepage": "https://github.com/clue/php-connection-manager-extra",
     "license": "MIT",
     "authors": [
@@ -15,7 +15,7 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/socket-client": "^0.7 || ^0.6",
+        "react/socket": "^0.7",
         "react/event-loop": "^0.4 || ^0.3",
         "react/promise": "^2.1 || ^1.2",
         "react/promise-timer": "^1.1"

src/ConnectionManagerDelay.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\EventLoop\LoopInterface;
 use React\Promise\Timer;
 

src/ConnectionManagerReject.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\Promise;
 use Exception;
 

src/ConnectionManagerRepeat.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use InvalidArgumentException;
 use Exception;
 use React\Promise\Promise;

src/ConnectionManagerSwappable.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 
 // connection manager decorator which simplifies exchanging the actual connection manager during runtime
 class ConnectionManagerSwappable implements ConnectorInterface

src/ConnectionManagerTimeout.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\EventLoop\LoopInterface;
 use React\Promise\Timer;
 use Exception;

src/Multiple/ConnectionManagerConsecutive.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra\Multiple;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\Promise;
 use UnderflowException;
 use React\Promise\CancellablePromiseInterface;

src/Multiple/ConnectionManagerSelective.php

@@ -2,7 +2,7 @@
 
 namespace ConnectionManager\Extra\Multiple;
 
-use React\SocketClient\ConnectorInterface;
+use React\Socket\ConnectorInterface;
 use React\Promise;
 use UnderflowException;
 use InvalidArgumentException;

tests/ConnectionManagerDelayTest.php

@@ -26,7 +26,7 @@ public function testDelayTenth()
 
     public function testCancellationOfPromiseBeforeDelayDoesNotStartConnection()
     {
-        $unused = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
+        $unused = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
         $unused->expects($this->never())->method('connect');
 
         $cm = new ConnectionManagerDelay($unused, 1.0, $this->loop);