Remove unneeded and undocumented loop argument for stream listeners

reactphp · Oct 13, 2017 · 8997565 · kelunik · Oct 15, 2017 · clue
1 parent 7c7aae9
commit 8997565
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -289,11 +289,11 @@ private function createStreamCallback()
             $key = (int) $stream;
 
             if (Event::READ === (Event::READ & $flags) && isset($this->readListeners[$key])) {
-                call_user_func($this->readListeners[$key], $stream, $this);
+                call_user_func($this->readListeners[$key], $stream);
             }
 
             if (Event::WRITE === (Event::WRITE & $flags) && isset($this->writeListeners[$key])) {
-                call_user_func($this->writeListeners[$key], $stream, $this);
+                call_user_func($this->writeListeners[$key], $stream);
             }
         };
     }

diff --git a/src/LibEvLoop.php b/src/LibEvLoop.php
@@ -40,7 +40,7 @@ public function addReadStream($stream, callable $listener)
         }
 
         $callback = function () use ($stream, $listener) {
-            call_user_func($listener, $stream, $this);
+            call_user_func($listener, $stream);
         };
 
         $event = new IOEvent($callback, $stream, IOEvent::READ);
@@ -59,7 +59,7 @@ public function addWriteStream($stream, callable $listener)
         }
 
         $callback = function () use ($stream, $listener) {
-            call_user_func($listener, $stream, $this);
+            call_user_func($listener, $stream);
         };
 
         $event = new IOEvent($callback, $stream, IOEvent::WRITE);

diff --git a/src/LibEventLoop.php b/src/LibEventLoop.php
@@ -307,11 +307,11 @@ private function createStreamCallback()
             $key = (int) $stream;
 
             if (EV_READ === (EV_READ & $flags) && isset($this->readListeners[$key])) {
-                call_user_func($this->readListeners[$key], $stream, $this);
+                call_user_func($this->readListeners[$key], $stream);
             }
 
             if (EV_WRITE === (EV_WRITE & $flags) && isset($this->writeListeners[$key])) {
-                call_user_func($this->writeListeners[$key], $stream, $this);
+                call_user_func($this->writeListeners[$key], $stream);
             }
         };
     }

diff --git a/src/StreamSelectLoop.php b/src/StreamSelectLoop.php
@@ -206,15 +206,15 @@ private function waitForStreamActivity($timeout)
             $key = (int) $stream;
 
             if (isset($this->readListeners[$key])) {
-                call_user_func($this->readListeners[$key], $stream, $this);
+                call_user_func($this->readListeners[$key], $stream);
             }
         }
 
         foreach ($write as $stream) {
             $key = (int) $stream;
 
             if (isset($this->writeListeners[$key])) {
-                call_user_func($this->writeListeners[$key], $stream, $this);
+                call_user_func($this->writeListeners[$key], $stream);
             }
         }
     }

diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -90,11 +90,11 @@ public function testSignalInterruptWithStream($signal)
 
         // add stream to the loop
         list($writeStream, $readStream) = $this->createSocketPair();
-        $this->loop->addReadStream($readStream, function($stream, $loop) {
+        $this->loop->addReadStream($readStream, function ($stream) {
             /** @var $loop LoopInterface */
             $read = fgets($stream);
             if ($read === "end loop\n") {
-                $loop->stop();
+                $this->loop->stop();
             }
         });
         $this->loop->addTimer(0.05, function() use ($writeStream) {