Merge pull request reactphp#88 from jsor-labs/update-master-from-0.4

jsor · web-flow · commit ef22aec681e0 · 2017-03-27T08:30:52.000+02:00
Add tests for double watchers to be ignored
diff --git a/src/LibEvLoop.php b/src/LibEvLoop.php
@@ -35,6 +35,10 @@ public function __construct()
      */
     public function addReadStream($stream, callable $listener)
     {
+        if (isset($this->readEvents[(int) $stream])) {
+            return;
+        }
+
         $callback = function () use ($stream, $listener) {
             call_user_func($listener, $stream, $this);
         };
@@ -50,6 +54,10 @@ public function addReadStream($stream, callable $listener)
      */
     public function addWriteStream($stream, callable $listener)
     {
+        if (isset($this->writeEvents[(int) $stream])) {
+            return;
+        }
+
         $callback = function () use ($stream, $listener) {
             call_user_func($listener, $stream, $this);
         };
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -47,6 +47,20 @@ public function testAddReadStream()
         $this->tickLoop($this->loop);
     }
 
+    public function testAddReadStreamIgnoresSecondCallable()
+    {
+        list ($input, $output) = $this->createSocketPair();
+
+        $this->loop->addReadStream($input, $this->expectCallableExactly(2));
+        $this->loop->addReadStream($input, $this->expectCallableNever());
+
+        fwrite($output, "foo\n");
+        $this->tickLoop($this->loop);
+
+        fwrite($output, "bar\n");
+        $this->tickLoop($this->loop);
+    }
+
     public function testAddWriteStream()
     {
         list ($input) = $this->createSocketPair();
@@ -56,6 +70,16 @@ public function testAddWriteStream()
         $this->tickLoop($this->loop);
     }
 
+    public function testAddWriteStreamIgnoresSecondCallable()
+    {
+        list ($input) = $this->createSocketPair();
+
+        $this->loop->addWriteStream($input, $this->expectCallableExactly(2));
+        $this->loop->addWriteStream($input, $this->expectCallableNever());
+        $this->tickLoop($this->loop);
+        $this->tickLoop($this->loop);
+    }
+
     public function testRemoveReadStreamInstantly()
     {
         list ($input, $output) = $this->createSocketPair();
