[Process] Allow writing portable "prepared" command lines

Amrouche Hamza · Amrouche Hamza · commit 2c23e961d4e7 · 2017-10-31T08:05:17.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -278,8 +278,13 @@ public function start(callable $callback = null, array $env = array())
 
         $options = array('suppress_errors' => true);
 
+        if ('\\' !== DIRECTORY_SEPARATOR) {
+            $commandline = $this->replacePlaceholder($commandline, array('$', ''));
+        }
+
         if ('\\' === DIRECTORY_SEPARATOR) {
             $options['bypass_shell'] = true;
+            $commandline = $this->replacePlaceholder($commandline, array('!', '!'));
             $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup);
         } elseif (!$this->useFileHandles && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
@@ -1562,4 +1567,13 @@ private function escapeArgument($argument)
 
         return '"'.str_replace(array('"', '^', '%', '!', "\n"), array('""', '"^^"', '"^%"', '"^!"', '!LF!'), $argument).'"';
     }
+
+    private function replacePlaceholder($commandLine, $toReplace)
+    {
+        if (preg_match('/\{([a-zA-Z0-9]*?)\}/', $commandLine)) {
+            return str_replace(array('{', '}'), $toReplace, $commandLine);
+        }
+
+        return $commandLine;
+    }
 }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1470,6 +1470,18 @@ public function provideEscapeArgument()
         yield array('éÉèÈàÀöä');
     }
 
+    public function testWithPreparedCommand()
+    {
+        $p = new Process('echo {abc}');
+        $p->run(null, array('abc' => 'ABC'));
+
+        $expected = <<<EOTXT
+ABC
+
+EOTXT;
+        $this->assertSame($expected, $p->getOutput());
+    }
+
     public function testEnvArgument()
     {
         $env = array('FOO' => 'Foo', 'BAR' => 'Bar');
