Use argseparator (--) also for PHP CLI

amphp · Jun 21, 2017 · ba4e101 · ba4e101
1 parent d3ccd57
commit ba4e101
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/lib/Process/ChannelledProcess.php b/lib/Process/ChannelledProcess.php
@@ -28,12 +28,28 @@ class ChannelledProcess implements ProcessContext, Strand {
      * @param mixed[] $env Array of environment variables.
      */
     public function __construct(string $path, string $cwd = "", array $env = []) {
-        $options = "-d html_errors=0 -d display_errors=0 -d log_errors=1";
-        $binary = \PHP_SAPI === "phpdbg" ? \PHP_BINARY . " -b -qrr $options --" : \PHP_BINARY . " " . $options;
-        $command = $binary . " " . \escapeshellarg($path);
+        $options = [
+            "html_errors" => "0",
+            "display_errors" => "0",
+            "log_errors" => "1",
+        ];
+
+        $options = (\PHP_SAPI === "phpdbg" ? " -b -qrr " : " ") . $this->formatOptions($options) . " -- ";
+        $command = \PHP_BINARY . $options . \escapeshellarg($path);
+
         $this->process = new Process($command, $cwd, $env);
     }
 
+    private function formatOptions(array $options) {
+        $result = [];
+
+        foreach ($options as $option => $value) {
+            $result[] = \sprintf("-d %s=%s", $option, $value);
+        }
+
+        return \implode(" ", $result);
+    }
+
     /**
      * Resets process values.
      */
@@ -47,7 +63,7 @@ public function __clone() {
      */
     public function start() {
         $this->process->start();
-        $this->channel = new ChannelledStream($this->process->getStdOut(), $this->process->getStdIn());
+        $this->channel = new ChannelledStream($this->process->getStdout(), $this->process->getStdin());
     }
 
     /**