[Process] Add support for Fiber

lyrixx · lyrixx · commit e8f41543fec0 · 2021-10-29T17:31:31.000+02:00
diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.4
+---
+
+ * Add support for `Fiber`
+
 5.2.0
 -----
 
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -427,12 +427,32 @@ public function wait(callable $callback = null)
         do {
             $this->checkTimeout();
             $running = '\\' === \DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
-            $this->readPipes($running, '\\' !== \DIRECTORY_SEPARATOR || !$running);
+
+            if (class_exists(\Fiber::class, false) && $fiber = \Fiber::getCurrent()) {
+                $this->readPipes(false, '\\' !== \DIRECTORY_SEPARATOR || !$running);
+                $startedAt = microtime(true);
+                $fiber->suspend();
+                $sleepFor = (int) (1000 - (microtime(true) - $startedAt) * 1000000);
+                if (0 < $sleepFor) {
+                    usleep($sleepFor);
+                }
+            } else {
+                $this->readPipes($running, '\\' !== \DIRECTORY_SEPARATOR || !$running);
+            }
         } while ($running);
 
         while ($this->isRunning()) {
             $this->checkTimeout();
-            usleep(1000);
+            if (class_exists(\Fiber::class, false) && $fiber = \Fiber::getCurrent()) {
+                $startedAt = microtime(true);
+                $fiber->suspend();
+                $sleepFor = (int) (1000 - (microtime(true) - $startedAt) * 1000000);
+                if (0 < $sleepFor) {
+                    usleep($sleepFor);
+                }
+            } else {
+                usleep(1000);
+            }
         }
 
         if ($this->processInformation['signaled'] && $this->processInformation['termsig'] !== $this->latestSignal) {
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -550,6 +550,30 @@ public function testMustRun()
         $this->assertEquals('foo'.\PHP_EOL, $process->getOutput());
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testMustRunWithFiber()
+    {
+        $process = new Process(['sleep', 1]);
+        $fiber = new \Fiber(function () use ($process) {
+            $process->mustRun();
+        });
+        $fiber->start();
+
+        $fiberHasBeenSuspended = false;
+        while (!$fiber->isTerminated()) {
+            $fiberHasBeenSuspended = true;
+            $this->assertTrue($fiber->isSuspended());
+            $fiber->resume();
+
+            usleep(900);
+        }
+
+        $this->assertTrue($process->isTerminated());
+        $this->assertTrue($fiberHasBeenSuspended);
+    }
+
     public function testSuccessfulMustRunHasCorrectExitCode()
     {
         $process = $this->getProcess('echo foo')->mustRun();
