Fix detecting closed socket pipes on PHP 8

Author: clue

src/Process.php

@@ -245,6 +245,8 @@ public function start(LoopInterface $loop = null, $interval = 0.1)
 
             if ($mode === 'r+') {
                 $stream = new DuplexResourceStream($fd, $loop);
+                $stream->on('close', $streamCloseHandler);
+                $closeCount++;
             } elseif ($mode === 'w') {
                 $stream = new WritableResourceStream($fd, $loop);
             } else {

tests/AbstractProcessTest.php

@@ -579,6 +579,31 @@ public function testProcessWillExitFasterThanExitInterval()
         $this->assertLessThan(0.1, $time);
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testProcessWithSocketIoWillExitFasterThanExitInterval()
+    {
+        $loop = $this->createLoop();
+        $process = new Process(
+            DIRECTORY_SEPARATOR === '\\' ? 'cmd /c echo hi' : 'echo hi',
+            null,
+            null,
+            array(
+                array('socket'),
+                array('socket'),
+                array('socket')
+            )
+        );
+        $process->start($loop, 2);
+
+        $time = microtime(true);
+        $loop->run();
+        $time = microtime(true) - $time;
+
+        $this->assertLessThan(0.1, $time);
+    }
+
     public function testDetectsClosingStdoutWithoutHavingToWaitForExit()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
@@ -606,6 +631,39 @@ public function testDetectsClosingStdoutWithoutHavingToWaitForExit()
         $this->assertTrue($closed);
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testDetectsClosingStdoutSocketWithoutHavingToWaitForExit()
+    {
+        $loop = $this->createLoop();
+        $process = new Process(
+            (DIRECTORY_SEPARATOR === '\\' ? '' : 'exec ') . $this->getPhpBinary() . ' -r ' . escapeshellarg('fclose(STDOUT); sleep(1);'),
+            null,
+            null,
+            array(
+                array('socket'),
+                array('socket'),
+                array('socket')
+            )
+        );
+        $process->start($loop);
+
+        $closed = false;
+        $process->stdout->on('close', function () use (&$closed, $loop) {
+            $closed = true;
+            $loop->stop();
+        });
+
+        // run loop for maximum of 0.5s only
+        $loop->addTimer(0.5, function () use ($loop) {
+            $loop->stop();
+        });
+        $loop->run();
+
+        $this->assertTrue($closed);
+    }
+
     public function testKeepsRunningEvenWhenAllStdioPipesHaveBeenClosed()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
@@ -642,6 +700,48 @@ public function testKeepsRunningEvenWhenAllStdioPipesHaveBeenClosed()
         $this->assertTrue($process->isRunning());
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testKeepsRunningEvenWhenAllStdioSocketsHaveBeenClosed()
+    {
+        $loop = $this->createLoop();
+        $process = new Process(
+            (DIRECTORY_SEPARATOR === '\\' ? '' : 'exec ') . $this->getPhpBinary() . ' -r ' . escapeshellarg('fclose(STDIN);fclose(STDOUT);fclose(STDERR);sleep(1);'),
+            null,
+            null,
+            array(
+                array('socket'),
+                array('socket'),
+                array('socket')
+            )
+        );
+        $process->start($loop);
+
+        $closed = 0;
+        $process->stdout->on('close', function () use (&$closed, $loop) {
+            ++$closed;
+            if ($closed === 2) {
+                $loop->stop();
+            }
+        });
+        $process->stderr->on('close', function () use (&$closed, $loop) {
+            ++$closed;
+            if ($closed === 2) {
+                $loop->stop();
+            }
+        });
+
+        // run loop for maximum 0.5s only
+        $loop->addTimer(0.5, function () use ($loop) {
+            $loop->stop();
+        });
+        $loop->run();
+
+        $this->assertEquals(2, $closed);
+        $this->assertTrue($process->isRunning());
+    }
+
     public function testDetectsClosingProcessEvenWhenAllStdioPipesHaveBeenClosed()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
@@ -662,16 +762,42 @@ public function testDetectsClosingProcessEvenWhenAllStdioPipesHaveBeenClosed()
         $this->assertSame(0, $process->getExitCode());
     }
 
-    public function testDetectsClosingProcessEvenWhenStartedWithoutPipes()
+    /**
+     * @requires PHP 8
+     */
+    public function testDetectsClosingProcessEvenWhenAllStdioSocketsHaveBeenClosed()
     {
         $loop = $this->createLoop();
+        $process = new Process(
+            (DIRECTORY_SEPARATOR === '\\' ? '' : 'exec ') . $this->getPhpBinary() . ' -r ' . escapeshellarg('fclose(STDIN);fclose(STDOUT);fclose(STDERR);usleep(10000);'),
+            null,
+            null,
+            array(
+                array('socket'),
+                array('socket'),
+                array('socket')
+            )
+        );
+        $process->start($loop, 0.001);
 
-        if (DIRECTORY_SEPARATOR === '\\') {
-            $process = new Process('cmd /c exit 0', null, null, array());
-        } else {
-            $process = new Process('exit 0', null, null, array());
-        }
+        $time = microtime(true);
+        $loop->run();
+        $time = microtime(true) - $time;
+
+        $this->assertLessThan(0.5, $time);
+        $this->assertSame(0, $process->getExitCode());
+    }
 
+    public function testDetectsClosingProcessEvenWhenStartedWithoutPipes()
+    {
+        $loop = $this->createLoop();
+
+        $process = new Process(
+            (DIRECTORY_SEPARATOR === '\\' ? 'cmd /c ' : '') . 'exit 0',
+            null,
+            null,
+            array()
+        );
         $process->start($loop, 0.001);
 
         $time = microtime(true);