Merge pull request #18 from clue-labs/socket

Forward compatibility with upcoming Socket v1.0 and v0.8

Author: clue

composer.json

@@ -15,7 +15,7 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/socket": "^0.7",
+        "react/socket": "^1.0 || ^0.8 || ^0.7",
         "react/event-loop": "^0.4 || ^0.3",
         "react/promise": "^2.1 || ^1.2",
         "react/promise-timer": "^1.1"

src/ConnectionManagerTimeout.php

@@ -5,7 +5,6 @@
 use React\Socket\ConnectorInterface;
 use React\EventLoop\LoopInterface;
 use React\Promise\Timer;
-use Exception;
 
 class ConnectionManagerTimeout implements ConnectorInterface
 {

tests/ConnectionManagerTimeoutTest.php

@@ -2,11 +2,9 @@
 
 use ConnectionManager\Extra\ConnectionManagerReject;
 
-use React\Stream\Stream;
 use ConnectionManager\Extra\ConnectionManagerDelay;
 use ConnectionManager\Extra\ConnectionManagerTimeout;
 use React\Promise\Promise;
-use React\Promise\Timer;
 
 class ConnectionManagerTimeoutTest extends TestCase
 {
@@ -31,7 +29,7 @@ public function testTimeoutOkay()
 
     public function testTimeoutExpire()
     {
-        $will = $this->createConnectionManagerMock(new Stream(fopen('php://temp', 'r+'), $this->loop));
+        $will = $this->createConnectionManagerMock(true);
         $wont = new ConnectionManagerDelay($will, 0.2, $this->loop);
 
         $cm = new ConnectionManagerTimeout($wont, 0.1, $this->loop);
@@ -58,12 +56,12 @@ public function testTimeoutAbort()
 
     public function testWillEndConnectionIfConnectionResolvesDespiteTimeout()
     {
-        $stream = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->disableOriginalConstructor()->getMock();
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('end');
 
         $loop = $this->loop;
         $promise = new Promise(function ($resolve) use ($loop, $stream) {
-            $loop->addTimer(0.002, function () use ($resolve, $stream) {
+            $loop->addTimer(0.01, function () use ($resolve, $stream) {
                 $resolve($stream);
             });
         });

tests/Multiple/ConnectionManagerSelectiveTest.php

@@ -1,7 +1,5 @@
 <?php
 
-use React\Stream\Stream;
-
 use ConnectionManager\Extra\Multiple\ConnectionManagerSelective;
 use ConnectionManager\Extra\ConnectionManagerReject;
 
@@ -140,7 +138,7 @@ public function testNotMatchingDomainWillReject()
 
     public function testReject()
     {
-        $will = $this->createConnectionManagerMock(new Stream(fopen('php://temp', 'r+'), $this->createLoopMock()));
+        $will = $this->createConnectionManagerMock(true);
 
         $cm = new ConnectionManagerSelective(array(
             'www.google.com:443' => $will,
@@ -157,7 +155,7 @@ public function testReject()
     public function testFirstEntryWinsIfMultipleMatch()
     {
         $wont = new ConnectionManagerReject();
-        $will = $this->createConnectionManagerMock(new Stream(fopen('php://temp', 'r+'), $this->createLoopMock()));
+        $will = $this->createConnectionManagerMock(true);
 
         $cm = new ConnectionManagerSelective(array(
             'www.google.com:443' => $will,
@@ -170,7 +168,7 @@ public function testFirstEntryWinsIfMultipleMatch()
 
     public function testWildcardsMatch()
     {
-        $will = $this->createConnectionManagerMock(new Stream(fopen('php://temp', 'r+'), $this->createLoopMock()));
+        $will = $this->createConnectionManagerMock(true);
 
         $cm = new ConnectionManagerSelective(array(
             '*.com' => $will,