Do not expose $master property

Interfering with this (previously public) property could introduce some
very subtle bugs, so it's best to simply avoid exposing it.

Empirical evidence seems to suggest this isn't used much outside of this
package anyway.

Inside this package, we can safely replace all references to it with
references to child sockets created upon connection.

Author: clue

src/SecureServer.php

@@ -56,6 +56,7 @@ class SecureServer extends EventEmitter implements ServerInterface
 {
     private $tcp;
     private $encryption;
+    private $context;
 
     /**
      * Creates a secure TLS server and starts waiting for incoming connections
@@ -106,27 +107,19 @@ class SecureServer extends EventEmitter implements ServerInterface
      * @param Server $tcp
      * @param LoopInterface $loop
      * @param array $context
-     * @throws ConnectionException
      * @see Server
      * @link http://php.net/manual/en/context.ssl.php for TLS context options
      */
     public function __construct(Server $tcp, LoopInterface $loop, array $context)
     {
-        if (!is_resource($tcp->master)) {
-            throw new ConnectionException('TCP server already shut down');
-        }
-
         // default to empty passphrase to surpress blocking passphrase prompt
         $context += array(
             'passphrase' => ''
         );
 
-        foreach ($context as $name => $value) {
-            stream_context_set_option($tcp->master, 'ssl', $name, $value);
-        }
-
         $this->tcp = $tcp;
         $this->encryption = new StreamEncryption($loop);
+        $this->context = $context;
 
         $that = $this;
         $this->tcp->on('connection', function ($connection) use ($that) {
@@ -156,6 +149,10 @@ public function handleConnection(ConnectionInterface $connection)
             return;
         }
 
+        foreach ($this->context as $name => $value) {
+            stream_context_set_option($connection->stream, 'ssl', $name, $value);
+        }
+
         $that = $this;
 
         $this->encryption->enable($connection)->then(

src/Server.php

@@ -36,7 +36,7 @@
  */
 class Server extends EventEmitter implements ServerInterface
 {
-    public $master;
+    private $master;
     private $loop;
 
     /**

tests/FunctionalSecureServerTest.php

@@ -368,19 +368,6 @@ public function testEmitsErrorIfConnectionIsNotSecureHandshake()
         Block\sleep(self::TIMEOUT, $loop);
     }
 
-    /**
-     * @expectedException React\Socket\ConnectionException
-     */
-    public function testFailsToCreateSecureServerOnClosedSocket()
-    {
-        $loop = Factory::create();
-
-        $server = new Server(0, $loop);
-        $server->close();
-
-        new SecureServer($server, $loop, array());
-    }
-
     private function getPort(ServerInterface $server)
     {
         return parse_url($server->getAddress(), PHP_URL_PORT);

tests/FunctionalServerTest.php

@@ -229,7 +229,7 @@ public function testEmitsConnectionWithLocalIpv6()
         $this->assertEquals($server->getAddress(), $local);
     }
 
-    public function testAppliesContextOptionsToSocketStreamResource()
+    public function testEmitsConnectionWithInheritedContextOptions()
     {
         if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.13', '<')) {
             // https://3v4l.org/hB4Tc
@@ -242,7 +242,18 @@ public function testAppliesContextOptionsToSocketStreamResource()
             'backlog' => 4
         ));
 
-        $all = stream_context_get_options($server->master);
+        $all = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$all) {
+            $all = stream_context_get_options($conn->stream);
+        });
+        $port = $this->getPort($server);
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('127.0.0.1', $port);
+
+        $promise->then($this->expectCallableOnce());
+
+        Block\sleep(0.1, $loop);
 
         $this->assertEquals(array('socket' => array('backlog' => 4)), $all);
     }

tests/SecureServerTest.php

@@ -17,7 +17,6 @@ public function testGetAddressWillBePassedThroughToTcpServer()
     {
         $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->getMock();
         $tcp->expects($this->once())->method('getAddress')->willReturn('127.0.0.1:1234');
-        $tcp->master = stream_socket_server('tcp://localhost:0');
 
         $loop = $this->getMock('React\EventLoop\LoopInterface');
 
@@ -30,7 +29,6 @@ public function testCloseWillBePassedThroughToTcpServer()
     {
         $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->getMock();
         $tcp->expects($this->once())->method('close');
-        $tcp->master = stream_socket_server('tcp://localhost:0');
 
         $loop = $this->getMock('React\EventLoop\LoopInterface');
 
@@ -42,7 +40,6 @@ public function testCloseWillBePassedThroughToTcpServer()
     public function testConnectionWillBeEndedWithErrorIfItIsNotAStream()
     {
         $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->setMethods(null)->getMock();
-        $tcp->master = stream_socket_server('tcp://localhost:0');
 
         $loop = $this->getMock('React\EventLoop\LoopInterface');
 
@@ -59,7 +56,6 @@ public function testConnectionWillBeEndedWithErrorIfItIsNotAStream()
     public function testSocketErrorWillBeForwarded()
     {
         $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->setMethods(null)->getMock();
-        $tcp->master = stream_socket_server('tcp://localhost:0');
 
         $loop = $this->getMock('React\EventLoop\LoopInterface');