Merge branch 'refs/heads/future-tick'

Author: cboden

examples/child-child.php

@@ -1,7 +1,5 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
-
 $i = 0;
 
 // block all the things!

src/React/EventLoop/ExtEventLoop.php

@@ -194,7 +194,7 @@ public function run()
             $this->futureTickQueue->tick();
 
             $flags = EventBase::LOOP_ONCE;
-            if (!$this->running || !$this->futureTickQueue->isEmpty()) {
+            if (!$this->running || !$this->nextTickQueue->isEmpty() || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EventBase::LOOP_NONBLOCK;
             } elseif (!$this->streamEvents && !$this->timerEvents->count()) {
                 break;

src/React/EventLoop/LibEvLoop.php

@@ -198,7 +198,7 @@ public function run()
             $this->futureTickQueue->tick();
 
             $flags = EventLoop::RUN_ONCE;
-            if (!$this->running || !$this->futureTickQueue->isEmpty()) {
+            if (!$this->running || !$this->nextTickQueue->isEmpty() || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EventLoop::RUN_NOWAIT;
             } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count()) {
                 break;

src/React/EventLoop/LibEventLoop.php

@@ -202,7 +202,7 @@ public function run()
             $this->futureTickQueue->tick();
 
             $flags = EVLOOP_ONCE;
-            if (!$this->running || !$this->futureTickQueue->isEmpty()) {
+            if (!$this->running || !$this->nextTickQueue->isEmpty() || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EVLOOP_NONBLOCK;
             } elseif (!$this->streamEvents && !$this->timerEvents->count()) {
                 break;

tests/React/Tests/EventLoop/AbstractLoopTest.php

@@ -320,6 +320,25 @@ function () {
         $this->loop->run();
     }
 
+    public function testNextTickEventGeneratedByFutureTick()
+    {
+        $stream = $this->createStream();
+
+        $this->loop->futureTick(
+            function () {
+                $this->loop->nextTick(
+                    function () {
+                        echo 'next-tick' . PHP_EOL;
+                    }
+                );
+            }
+        );
+
+        $this->expectOutputString('next-tick' . PHP_EOL);
+
+        $this->loop->run();
+    }
+
     public function testNextTickEventGeneratedByTimer()
     {
         $this->loop->addTimer(
@@ -427,6 +446,25 @@ function () {
         $this->loop->run();
     }
 
+    public function testFutureTickEventGeneratedByNextTick()
+    {
+        $stream = $this->createStream();
+
+        $this->loop->nextTick(
+            function () {
+                $this->loop->futureTick(
+                    function () {
+                        echo 'future-tick' . PHP_EOL;
+                    }
+                );
+            }
+        );
+
+        $this->expectOutputString('future-tick' . PHP_EOL);
+
+        $this->loop->run();
+    }
+
     public function testFutureTickEventGeneratedByTimer()
     {
         $this->loop->addTimer(