chore(shell): use exec to avoid spawning a grandchild process

Signed-off-by: azjezz <azjezz@protonmail.com>
azjezz · Dec 1, 2021 · 0153af4 · 0153af4
1 parent d9fd48e
commit 0153af4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/Psl/Shell/execute.php b/src/Psl/Shell/execute.php
@@ -143,6 +143,8 @@ static function (array $m) use (
             'bypass_shell' => true,
             'blocking_pipes' => false,
         ];
+    } else {
+        $commandline = Str\format('exec %s', $commandline);
     }
     // @codeCoverageIgnoreEnd
     $descriptor = [

diff --git a/tests/unit/Shell/ExecuteTest.php b/tests/unit/Shell/ExecuteTest.php
@@ -67,16 +67,10 @@ public function testCurrentEnvironmentVariablesArePassedDownToTheProcess(): void
 
     public function testWorkingDirectoryIsUsed(): void
     {
-        if ('Darwin' === PHP_OS_FAMILY || PHP_OS_FAMILY === 'Windows') {
-            static::markTestSkipped();
-        }
-
         $temp = Env\temp_dir();
+        $result = Shell\execute(PHP_BINARY, ['-r', 'echo getcwd();'], $temp);
 
-        static::assertSame(
-            $temp,
-            Shell\execute(PHP_BINARY, ['-r', 'echo getcwd();'], $temp)
-        );
+        static::assertStringEndsWith($temp, $result);
     }
 
     public function testCurrentDirectoryIsUsedByDefault(): void