feature: use linux style and only replace windows

Amrouche Hamza · Simperfit · commit 3ff92f35aa57 · 2019-06-21T09:19:10.000+02:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -291,20 +291,22 @@ public function start(callable $callback = null, array $env = [])
         $this->hasCallback = null !== $callback;
         $descriptors = $this->getDescriptors();
 
+        if ($this->env) {
+            $env += $this->env;
+        }
+
         if (\is_array($commandline = $this->commandline)) {
             $commandline = implode(' ', array_map([$this, 'escapeArgument'], $commandline));
 
             if ('\\' !== \DIRECTORY_SEPARATOR) {
                 // exec is mandatory to deal with sending a signal to the process
                 $commandline = 'exec '.$commandline;
             }
+        } else {
+            $commandline = $this->replacePlaceholders($commandline, $env);
         }
 
-        if ($this->env) {
-            $env += $this->env;
-        }
         $env += $this->getDefaultEnv();
-
         $options = ['suppress_errors' => true];
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -1632,6 +1634,30 @@ private function escapeArgument(?string $argument): string
         return '"'.str_replace(['"', '^', '%', '!', "\n"], ['""', '"^^"', '"^%"', '"^!"', '!LF!'], $argument).'"';
     }
 
+    private function replacePlaceholders(string $commandline, array $env)
+    {
+        preg_match('/\"\$?([_a-zA-Z0-9]++)?\"/', $commandline, $m);
+        if (!isset($env[$m[1]]) || false === $env[$m[1]]) {
+            foreach ($env as $k => $v) {
+                if (false === $v) {
+                    unset($env[$k]);
+                }
+            }
+            if (!$env) {
+                throw new InvalidArgumentException(sprintf('Invalid command line "%s": no values provided for any placeholders.', $commandline));
+            }
+            $env = implode('", "', array_keys($env));
+
+            throw new InvalidArgumentException(sprintf('Invalid command line "%s": no value provided for placeholder "%s", did you mean "%s"?', $commandline, $m[1], $env));
+        }
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            return $commandline;
+        }
+
+        return str_replace($m[0], sprintf('!%s!', $m[1]), $commandline);
+    }
+
     private function getDefaultEnv()
     {
         $env = [];
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1500,6 +1500,35 @@ public function provideEscapeArgument()
         yield [1.1];
     }
 
+    public function testPreparedCommand()
+    {
+
+        $p = Process::fromShellCommandline('echo "$abc"DEF');
+        $p->run(null, array('abc' => 'ABC'));
+
+        $this->assertSame('ABCDEF', rtrim($p->getOutput()));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid command line "echo "$abc"": no value provided for placeholder "abc", did you mean "bcd"?
+     */
+    public function testPreparedCommandWithMissingValue()
+    {
+        $p = Process::fromShellCommandline('echo "$abc"');
+        $p->run(null, array('bcd' => 'BCD'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid command line "echo "$abc"": no values provided for any placeholders.
+     */
+    public function testPreparedCommandWithNoValues()
+    {
+        $p = Process::fromShellCommandline('echo "$abc"');
+        $p->run();
+    }
+
     public function testEnvArgument()
     {
         $env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
