Merge pull request #71 from clue-labs/internal

WyriHaximus · web-flow · commit 87099476ea49 · 2017-02-08T13:57:54.000+01:00
Mark Server and SecureServer as final and mark internal connection handler as internal
diff --git a/README.md b/README.md
@@ -296,13 +296,13 @@ If you want to typehint in your higher-level protocol implementation, you SHOULD
 use the generic [`ServerInterface`](#serverinterface) instead.
 
 > Advanced usage: Despite allowing any `ServerInterface` as first parameter,
-you SHOULD pass an unmodified `Server` instance as first parameter, unless you
+you SHOULD pass a `Server` instance as first parameter, unless you
 know what you're doing.
 Internally, the `SecureServer` has to set the required TLS context options on
 the underlying stream resources.
 These resources are not exposed through any of the interfaces defined in this
 package, but only through the `React\Stream\Stream` class.
-The unmodified `Server` class is guaranteed to emit connections that implement
+The `Server` class is guaranteed to emit connections that implement
 the `ConnectionInterface` and also extend the `Stream` class in order to
 expose these underlying resources.
 If you use a custom `ServerInterface` and its `connection` event does not
diff --git a/src/SecureServer.php b/src/SecureServer.php
@@ -52,7 +52,7 @@
  * @see ServerInterface
  * @see ConnectionInterface
  */
-class SecureServer extends EventEmitter implements ServerInterface
+final class SecureServer extends EventEmitter implements ServerInterface
 {
     private $tcp;
     private $encryption;
@@ -96,13 +96,13 @@ class SecureServer extends EventEmitter implements ServerInterface
      * Passing unknown context options has no effect.
      *
      * Advanced usage: Despite allowing any `ServerInterface` as first parameter,
-     * you SHOULD pass an unmodified `Server` instance as first parameter, unless you
+     * you SHOULD pass a `Server` instance as first parameter, unless you
      * know what you're doing.
      * Internally, the `SecureServer` has to set the required TLS context options on
      * the underlying stream resources.
      * These resources are not exposed through any of the interfaces defined in this
      * package, but only through the `React\Stream\Stream` class.
-     * The unmodified `Server` class is guaranteed to emit connections that implement
+     * The `Server` class is guaranteed to emit connections that implement
      * the `ConnectionInterface` and also extend the `Stream` class in order to
      * expose these underlying resources.
      * If you use a custom `ServerInterface` and its `connection` event does not
diff --git a/src/Server.php b/src/Server.php
@@ -34,7 +34,7 @@
  * @see ServerInterface
  * @see ConnectionInterface
  */
-class Server extends EventEmitter implements ServerInterface
+final class Server extends EventEmitter implements ServerInterface
 {
     private $master;
     private $loop;
@@ -100,7 +100,7 @@ class Server extends EventEmitter implements ServerInterface
      * and/or PHP version.
      * Passing unknown context options has no effect.
      *
-     * @param string        $uri
+     * @param string|int    $uri
      * @param LoopInterface $loop
      * @param array         $context
      * @throws InvalidArgumentException if the listening address is invalid
@@ -165,15 +165,6 @@ public function __construct($uri, LoopInterface $loop, array $context = array())
         });
     }
 
-    public function handleConnection($socket)
-    {
-        stream_set_blocking($socket, 0);
-
-        $client = $this->createConnection($socket);
-
-        $this->emit('connection', array($client));
-    }
-
     public function getAddress()
     {
         if (!is_resource($this->master)) {
@@ -203,8 +194,11 @@ public function close()
         $this->removeAllListeners();
     }
 
-    public function createConnection($socket)
+    /** @internal */
+    public function handleConnection($socket)
     {
-        return new Connection($socket, $this->loop);
+        $this->emit('connection', array(
+            new Connection($socket, $this->loop)
+        ));
     }
 }
diff --git a/tests/SecureServerTest.php b/tests/SecureServerTest.php
@@ -3,6 +3,7 @@
 namespace React\Tests\Socket;
 
 use React\Socket\SecureServer;
+use React\Socket\Server;
 
 class SecureServerTest extends TestCase
 {
@@ -39,10 +40,10 @@ public function testCloseWillBePassedThroughToTcpServer()
 
     public function testConnectionWillBeEndedWithErrorIfItIsNotAStream()
     {
-        $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->setMethods(null)->getMock();
-
         $loop = $this->getMock('React\EventLoop\LoopInterface');
 
+        $tcp = new Server(0, $loop);
+
         $connection = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $connection->expects($this->once())->method('end');
 
@@ -55,10 +56,10 @@ public function testConnectionWillBeEndedWithErrorIfItIsNotAStream()
 
     public function testSocketErrorWillBeForwarded()
     {
-        $tcp = $this->getMockBuilder('React\Socket\Server')->disableOriginalConstructor()->setMethods(null)->getMock();
-
         $loop = $this->getMock('React\EventLoop\LoopInterface');
 
+        $tcp = new Server(0, $loop);
+
         $server = new SecureServer($tcp, $loop, array());
 
         $server->on('error', $this->expectCallableOnce());
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -30,9 +30,7 @@ public function setUp()
     }
 
     /**
-     * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Server::handleConnection
-     * @covers React\Socket\Server::createConnection
      */
     public function testConnection()
     {
@@ -43,9 +41,7 @@ public function testConnection()
     }
 
     /**
-     * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Server::handleConnection
-     * @covers React\Socket\Server::createConnection
      */
     public function testConnectionWithManyClients()
     {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`* @see ServerInterface`
`35`	`35`	`* @see ConnectionInterface`
`36`	`36`	`*/`
`37`		`-class Server extends EventEmitter implements ServerInterface`
	`37`	`+final class Server extends EventEmitter implements ServerInterface`
`38`	`38`	`{`
`39`	`39`	`private $master;`
`40`	`40`	`private $loop;`
`@@ -100,7 +100,7 @@ class Server extends EventEmitter implements ServerInterface`
`100`	`100`	`* and/or PHP version.`
`101`	`101`	`* Passing unknown context options has no effect.`
`102`	`102`	`*`
`103`		`- * @param string $uri`
	`103`	`+ * @param string\|int $uri`
`104`	`104`	`* @param LoopInterface $loop`
`105`	`105`	`* @param array $context`
`106`	`106`	`* @throws InvalidArgumentException if the listening address is invalid`
`@@ -165,15 +165,6 @@ public function __construct($uri, LoopInterface $loop, array $context = array())`
`165`	`165`	`});`
`166`	`166`	`}`
`167`	`167`
`168`		`- public function handleConnection($socket)`
`169`		`- {`
`170`		`- stream_set_blocking($socket, 0);`
`171`		`-`
`172`		`- $client = $this->createConnection($socket);`
`173`		`-`
`174`		`- $this->emit('connection', array($client));`
`175`		`- }`
`176`		`-`
`177`	`168`	`public function getAddress()`
`178`	`169`	`{`
`179`	`170`	`if (!is_resource($this->master)) {`
`@@ -203,8 +194,11 @@ public function close()`
`203`	`194`	`$this->removeAllListeners();`
`204`	`195`	`}`
`205`	`196`
`206`		`- public function createConnection($socket)`
	`197`	`+ /** @internal */`
	`198`	`+ public function handleConnection($socket)`
`207`	`199`	`{`
`208`		`- return new Connection($socket, $this->loop);`
	`200`	`+ $this->emit('connection', array(`
	`201`	`+ new Connection($socket, $this->loop)`
	`202`	`+ ));`
`209`	`203`	`}`
`210`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ public function setUp()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * @covers React\EventLoop\StreamSelectLoop::tick`
`34`	`33`	`* @covers React\Socket\Server::handleConnection`
`35`		`- * @covers React\Socket\Server::createConnection`
`36`	`34`	`*/`
`37`	`35`	`public function testConnection()`
`38`	`36`	`{`
`@@ -43,9 +41,7 @@ public function testConnection()`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`/**`
`46`		`- * @covers React\EventLoop\StreamSelectLoop::tick`
`47`	`44`	`* @covers React\Socket\Server::handleConnection`
`48`		`- * @covers React\Socket\Server::createConnection`
`49`	`45`	`*/`
`50`	`46`	`public function testConnectionWithManyClients()`
`51`	`47`	`{`