Merge branch '11.0'

sebastianbergmann · Mar 28, 2024 · 0f6a62b · 0f6a62b
2 parents b4a4693 + b7fda56
commit 0f6a62b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 66 deletions.
diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -9,11 +9,12 @@
  */
 namespace PHPUnit\Util\PHP;
 
+use const PHP_BINARY;
 use const PHP_SAPI;
 use function array_keys;
 use function array_merge;
 use function assert;
-use function escapeshellarg;
+use function explode;
 use function file_exists;
 use function file_get_contents;
 use function ini_get_all;
@@ -154,12 +155,15 @@ public function runTestJob(string $job, Test $test, string $processResultFile):
 
     /**
      * Returns the command based into the configurations.
+     *
+     * @return string[]
      */
-    public function getCommand(array $settings, ?string $file = null): string
+    public function getCommand(array $settings, ?string $file = null): array
     {
         $runtime = new Runtime;
 
-        $command = $runtime->getBinary();
+        $command   = [];
+        $command[] = PHP_BINARY;
 
         if ($runtime->hasPCOV()) {
             $settings = array_merge(
@@ -177,29 +181,29 @@ public function getCommand(array $settings, ?string $file = null): string
             );
         }
 
-        $command .= $this->settingsToParameters($settings);
+        $command = array_merge($command, $this->settingsToParameters($settings));
 
         if (PHP_SAPI === 'phpdbg') {
-            $command .= ' -qrr';
+            $command[] = '-qrr';
 
             if (!$file) {
-                $command .= 's=';
+                $command[] = 's=';
             }
         }
 
         if ($file) {
-            $command .= ' ' . escapeshellarg($file);
+            $command[] = '-f';
+            $command[] = $file;
         }
 
         if ($this->arguments) {
             if (!$file) {
-                $command .= ' --';
+                $command[] = '--';
             }
-            $command .= ' ' . $this->arguments;
-        }
 
-        if ($this->stderrRedirection) {
-            $command .= ' 2>&1';
+            foreach (explode(' ', $this->arguments) as $arg) {
+                $command[] = trim($arg);
+            }
         }
 
         return $command;
@@ -210,12 +214,16 @@ public function getCommand(array $settings, ?string $file = null): string
      */
     abstract public function runJob(string $job, array $settings = []): array;
 
-    protected function settingsToParameters(array $settings): string
+    /**
+     * @return list<string>
+     */
+    protected function settingsToParameters(array $settings): array
     {
-        $buffer = '';
+        $buffer = [];
 
         foreach ($settings as $setting) {
-            $buffer .= ' -d ' . escapeshellarg($setting);
+            $buffer[] = '-d';
+            $buffer[] = $setting;
         }
 
         return $buffer;

diff --git a/src/Util/PHP/DefaultPhpProcess.php b/src/Util/PHP/DefaultPhpProcess.php
@@ -17,7 +17,6 @@
 use function is_resource;
 use function proc_close;
 use function proc_open;
-use function rewind;
 use function stream_get_contents;
 use function sys_get_temp_dir;
 use function tempnam;
@@ -55,14 +54,6 @@ public function runJob(string $job, array $settings = []): array
         return $this->runProcess($job, $settings);
     }
 
-    /**
-     * Returns an array of file handles to be used in place of pipes.
-     */
-    protected function getHandles(): array
-    {
-        return [];
-    }
-
     /**
      * Handles creating the child process and returning the STDOUT and STDERR.
      *
@@ -73,8 +64,6 @@ protected function getHandles(): array
      */
     protected function runProcess(string $job, array $settings): array
     {
-        $handles = $this->getHandles();
-
         $env = null;
 
         if ($this->env) {
@@ -90,11 +79,15 @@ protected function runProcess(string $job, array $settings): array
         }
 
         $pipeSpec = [
-            0 => $handles[0] ?? ['pipe', 'r'],
-            1 => $handles[1] ?? ['pipe', 'w'],
-            2 => $handles[2] ?? ['pipe', 'w'],
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
         ];
 
+        if ($this->stderrRedirection) {
+            $pipeSpec[2] = ['redirect', 1];
+        }
+
         $process = proc_open(
             $this->getCommand($settings, $this->tempFile),
             $pipeSpec,
@@ -129,22 +122,6 @@ protected function runProcess(string $job, array $settings): array
             fclose($pipes[2]);
         }
 
-        if (isset($handles[1])) {
-            rewind($handles[1]);
-
-            $stdout = stream_get_contents($handles[1]);
-
-            fclose($handles[1]);
-        }
-
-        if (isset($handles[2])) {
-            rewind($handles[2]);
-
-            $stderr = stream_get_contents($handles[2]);
-
-            fclose($handles[2]);
-        }
-
         proc_close($process);
 
         $this->cleanup();

diff --git a/src/Util/PHP/WindowsPhpProcess.php b/src/Util/PHP/WindowsPhpProcess.php
@@ -9,35 +9,15 @@
  */
 namespace PHPUnit\Util\PHP;
 
-use function tmpfile;
-use PHPUnit\Framework\Exception;
-
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  *
  * @see https://bugs.php.net/bug.php?id=51800
  */
 final class WindowsPhpProcess extends DefaultPhpProcess
 {
-    /**
-     * @throws Exception
-     * @throws PhpProcessException
-     */
-    protected function getHandles(): array
-    {
-        if (false === $stdout_handle = tmpfile()) {
-            throw new PhpProcessException(
-                'A temporary file could not be created; verify that your TEMP environment variable is writable',
-            );
-        }
-
-        return [
-            1 => $stdout_handle,
-        ];
-    }
-
     protected function useTemporaryFile(): bool
     {
-        return true;
+        return false;
     }
 }