Fixed and added test-case for next-tick events added by timers.

reactphp · nrk · Dec 5, 2013 · Nov 13, 2013 · Nov 13, 2013 · Nov 13, 2013
commit 93da5ec7c889f19d818436479696c40ceff1406e
diff --git a/src/React/EventLoop/StreamSelectLoop.php b/src/React/EventLoop/StreamSelectLoop.php
@@ -199,8 +199,12 @@ public function run()
 
             $this->timers->tick();
 
+            // Timers have placed more items on the next-tick queue ...
+            if (!$this->nextTickQueue->isEmpty()) {
+                $timeout = 0;
+
             // There is a pending timer, only block until it is due ...
-            if ($scheduledAt = $this->timers->getFirst()) {
+            } elseif ($scheduledAt = $this->timers->getFirst()) {
 
                 if (0 > $timeout = $scheduledAt - $this->timers->getTime()) {
                     $timeout = 0;

diff --git a/tests/React/Tests/EventLoop/AbstractLoopTest.php b/tests/React/Tests/EventLoop/AbstractLoopTest.php
@@ -307,6 +307,24 @@ function () {
         $this->loop->run();
     }
 
+    public function testNextTickEventGeneratedByTimer()
+    {
+        $this->loop->addTimer(
+            0.001,
+            function () {
+                $this->loop->nextTick(
+                    function () {
+                        echo 'next-tick' . PHP_EOL;
+                    }
+                );
+            }
+        );
+
+        $this->expectOutputString('next-tick' . PHP_EOL);
+
+        $this->loop->run();
+    }
+
     private function assertRunFasterThan($maxInterval)
     {
         $start = microtime(true);