Fix issues due to temporal dependence

Author: clue

README.md

@@ -113,15 +113,16 @@ new connections even after this event.
 
 #### getPort()
 
-The `getPort(): int` method can be used to
+The `getPort(): ?int` method can be used to
 return the port this server is currently listening on.
 
 ```php
 $port = $server->getPort();
 echo 'Server listening on port ' . $port . PHP_EOL;
 ```
 
-This method MUST NOT be called after calling [`shutdown()`](#shutdown).
+It will return the port number or `NULL` if it is unknown (not applicable to
+this server socket or already closed).
 
 #### shutdown()
 
@@ -135,7 +136,7 @@ echo 'Shutting down server socket' . PHP_EOL;
 $server->shutdown();
 ```
 
-This method MUST NOT be called more than once on the same instance.
+Calling this method more than once on the same instance is a NO-OP.
 
 ### Server
 

src/SecureServer.php

@@ -43,6 +43,10 @@ class SecureServer extends EventEmitter implements ServerInterface
 
     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' => ''

src/Server.php

@@ -130,16 +130,22 @@ public function handleConnection($socket)
 
     public function getPort()
     {
+        if (!is_resource($this->master)) {
+            return null;
+        }
+
         $name = stream_socket_get_name($this->master, false);
 
         return (int) substr(strrchr($name, ':'), 1);
     }
 
     public function shutdown()
     {
-        $this->loop->removeStream($this->master);
-        fclose($this->master);
-        $this->removeAllListeners();
+        if (is_resource($this->master)) {
+            $this->loop->removeStream($this->master);
+            fclose($this->master);
+            $this->removeAllListeners();
+        }
     }
 
     public function createConnection($socket)

src/ServerInterface.php

@@ -51,9 +51,7 @@ interface ServerInterface extends EventEmitterInterface
     /**
      * Returns the port this server is currently listening on
      *
-     * This method MUST NOT be called after calling shutdown().
-     *
-     * @return int the port number
+     * @return ?int the port number or NULL if it is unknown (not applicable to this server socket or already closed)
      */
     public function getPort();
 
@@ -62,7 +60,7 @@ public function getPort();
      *
      * This will stop listening for new incoming connections on this socket.
      *
-     * This method MUST NOT be called more than once on the same instance.
+     * Calling this method more than once on the same instance is a NO-OP.
      *
      * @return void
      */

tests/FunctionalSecureServerTest.php

@@ -366,4 +366,17 @@ public function testEmitsErrorIfConnectionIsNotSecureHandshake()
 
         Block\sleep(self::TIMEOUT, $loop);
     }
+
+    /**
+     * @expectedException React\Socket\ConnectionException
+     */
+    public function testFailsToCreateSecureServerOnClosedSocket()
+    {
+        $loop = Factory::create();
+
+        $server = new Server(0, $loop);
+        $server->shutdown();
+
+        new SecureServer($server, $loop, array());
+    }
 }

tests/ServerTest.php

@@ -139,6 +139,18 @@ public function testLoopWillEndWhenServerIsShutDown()
         $this->loop->run();
     }
 
+    public function testShutDownTwiceIsNoOp()
+    {
+        $this->server->shutdown();
+        $this->server->shutdown();
+    }
+
+    public function testGetPortAfterShutDownReturnsNull()
+    {
+        $this->server->shutdown();
+        $this->assertNull($this->server->getPort());
+    }
+
     public function testLoopWillEndWhenServerIsShutDownAfterSingleConnection()
     {
         $client = stream_socket_client('tcp://localhost:' . $this->port);