Merge pull request #8 from clue/fix-hhvm

Fix hhvm

Author: clue

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - 5.4
   - 5.3
+  - hhvm
 before_script:
   - composer install --dev --prefer-source --no-interaction
 script:

CHANGELOG.md

@@ -20,6 +20,8 @@ you spot any mistakes.
 * Fix: Typo in `Socket\React\Stream\Server` that passed null (thanks @cboden!)
 * Fix: End connection if reading from stream socket fails
   ([#7](https://github.com/clue/socket-react/pull/7))
+* Fix: Compatibility with hhvm
+  ([#8](https://github.com/clue/socket-react/pull/8))
 
 ## 0.1.0 (2013-04-18)
 

Socket/React/EventLoop/SocketSelectLoop.php

@@ -29,9 +29,7 @@ public function __construct()
 
     public function addReadStream($stream, $listener)
     {
-        if (get_resource_type($stream) !== 'Socket') {
-            throw new InvalidArgumentException('Socket loop only accepts resources of type "Socket", but "' . get_resource_type($stream) .'" given');
-        }
+        $this->assertStream($stream);
 
         $id = (int) $stream;
 
@@ -43,9 +41,7 @@ public function addReadStream($stream, $listener)
 
     public function addWriteStream($stream, $listener)
     {
-        if (get_resource_type($stream) !== 'Socket') {
-            throw new InvalidArgumentException('Socket loop only accepts resources of type "Socket", but "' . get_resource_type($stream) .'" given');
-        }
+        $this->assertStream($stream);
 
         $id = (int) $stream;
 
@@ -194,4 +190,19 @@ public function stop()
     {
         $this->running = false;
     }
+
+    private function assertStream($stream)
+    {
+        static $checked = array();
+        $type = get_resource_type($stream);
+        if (is_resource($stream) && !isset($checked[$type])) {
+            $except = array($stream);
+            $null = null;
+            $checked[$type] = (@socket_select($null, $null, $except, 0) !== false);
+        }
+
+        if (!$checked[$type]) {
+            throw new InvalidArgumentException('Socket loop only accepts resources of type "Socket", but "' . $type .'" given');
+        }
+    }
 }

tests/EventLoop/AbstractLoopTest.php

@@ -46,24 +46,4 @@ public function testClientTcp4()
 
         $this->loop->run();
     }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testAddReadStreamInvalid()
-    {
-        $stream = fopen('php://temp', 'r+');
-
-        $this->loop->addReadStream($stream, null);
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testAddWriteStreamInvalid()
-    {
-        $stream = fopen('php://temp', 'r+');
-
-        $this->loop->addWriteStream($stream, null);
-    }
 }