Simplify usage by supporting new Socket API

Author: SimonFrings

README.md

@@ -74,7 +74,7 @@ proxy servers etc.), you can explicitly pass a custom instance of the
 [`ConnectorInterface`](https://github.com/reactphp/socket#connectorinterface):
 
 ```php
-$connector = new React\Socket\Connector(null, array(
+$connector = new React\Socket\Connector(array(
     'dns' => '127.0.0.1',
     'tcp' => array(
         'bindto' => '192.168.10.1:0'

composer.json

@@ -10,7 +10,7 @@
         "react/promise": "^2.7",
         "react/promise-stream": "^1.1",
         "react/promise-timer": "^1.5",
-        "react/socket": "^1.8"
+        "react/socket": "^1.9"
     },
     "require-dev": {
         "clue/block-react": "^1.2",

src/Factory.php

@@ -42,7 +42,7 @@ class Factory
      * [`ConnectorInterface`](https://github.com/reactphp/socket#connectorinterface):
      *
      * ```php
-     * $connector = new React\Socket\Connector(null, array(
+     * $connector = new React\Socket\Connector(array(
      *     'dns' => '127.0.0.1',
      *     'tcp' => array(
      *         'bindto' => '192.168.10.1:0'
@@ -62,7 +62,7 @@ class Factory
     public function __construct(LoopInterface $loop = null, ConnectorInterface $connector = null)
     {
         $this->loop = $loop ?: Loop::get();
-        $this->connector = $connector ?: new Connector($this->loop);
+        $this->connector = $connector ?: new Connector(array(), $this->loop);
     }
 
     /**

tests/FactoryTest.php

@@ -4,7 +4,7 @@
 
 use React\MySQL\ConnectionInterface;
 use React\MySQL\Factory;
-use React\Socket\Server;
+use React\Socket\SocketServer;
 use React\Promise\Promise;
 
 class FactoryTest extends BaseTestCase
@@ -140,13 +140,13 @@ public function testConnectWillRejectWhenServerClosesConnection()
         $loop = \React\EventLoop\Factory::create();
         $factory = new Factory($loop);
 
-        $server = new Server(0, $loop);
-        $server->on('connection', function ($connection) use ($server) {
-            $server->close();
+        $socket = new SocketServer('127.0.0.1:0', array(), $loop);
+        $socket->on('connection', function ($connection) use ($socket) {
+            $socket->close();
             $connection->close();
         });
 
-        $parts = parse_url($server->getAddress());
+        $parts = parse_url($socket->getAddress());
         $uri = $this->getConnectionString(array('host' => $parts['host'], 'port' => $parts['port']));
 
         $promise = $factory->createConnection($uri);