TCP socket context options should be nested in outer array

Author: clue

README.md

@@ -377,25 +377,29 @@ $second = new Server(8080, $loop);
 ```
 
 > Note that these error conditions may vary depending on your system and/or
-configuration.
-See the exception message and code for more details about the actual error
-condition.
+  configuration.
+  See the exception message and code for more details about the actual error
+  condition.
 
-Optionally, you can specify [socket context options](http://php.net/manual/en/context.socket.php)
+Optionally, you can specify [TCP socket context options](http://php.net/manual/en/context.socket.php)
 for the underlying stream socket resource like this:
 
 ```php
 $server = new Server('[::1]:8080', $loop, array(
-    'backlog' => 200,
-    'so_reuseport' => true,
-    'ipv6_v6only' => true
+    'tcp' => array(
+        'backlog' => 200,
+        'so_reuseport' => true,
+        'ipv6_v6only' => true
+    )
 ));
 ```
 
 > Note that available [socket context options](http://php.net/manual/en/context.socket.php),
-their defaults and effects of changing these may vary depending on your system
-and/or PHP version.
-Passing unknown context options has no effect.
+  their defaults and effects of changing these may vary depending on your system
+  and/or PHP version.
+  Passing unknown context options has no effect.
+  For BC reasons, you can also pass the TCP socket context options as a simple
+  array without wrapping this in another array under the `tcp` key.
 
 Whenever a client connects, it will emit a `connection` event with a connection
 instance implementing [`ConnectionInterface`](#connectioninterface):

src/Server.php

@@ -11,7 +11,17 @@ final class Server extends EventEmitter implements ServerInterface
 
     public function __construct($uri, LoopInterface $loop, array $context = array())
     {
-        $server = new TcpServer($uri, $loop, $context);
+        // sanitize TCP context options if not properly wrapped
+        if ($context && !isset($context['tcp'])) {
+            $context = array('tcp' => $context);
+        }
+
+        // apply default options if not explicitly given
+        $context += array(
+            'tcp' => array(),
+        );
+
+        $server = new TcpServer($uri, $loop, $context['tcp']);
         $this->server = $server;
 
         $that = $this;

tests/ServerTest.php

@@ -5,6 +5,7 @@
 use React\EventLoop\Factory;
 use React\Socket\Server;
 use Clue\React\Block;
+use React\Socket\ConnectionInterface;
 
 class ServerTest extends TestCase
 {
@@ -81,4 +82,29 @@ public function testDoesNotAllowConnectionToClosedServer()
 
         $this->assertFalse($client);
     }
+
+    public function testEmitsConnectionWithInheritedContextOptions()
+    {
+        if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.13', '<')) {
+            // https://3v4l.org/hB4Tc
+            $this->markTestSkipped('Not supported on legacy HHVM < 3.13');
+        }
+
+        $loop = Factory::create();
+
+        $server = new Server(0, $loop, array(
+            'backlog' => 4
+        ));
+
+        $all = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$all) {
+            $all = stream_context_get_options($conn->stream);
+        });
+
+        $client = stream_socket_client($server->getAddress());
+
+        Block\sleep(0.1, $loop);
+
+        $this->assertEquals(array('socket' => array('backlog' => 4)), $all);
+    }
 }