[Process] Allow writing portable "prepared" command lines

Amrouche Hamza · Amrouche Hamza · commit e59652495f9c · 2017-12-01T18:49:22.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -278,7 +278,10 @@ public function start(callable $callback = null, array $env = array())
 
         $options = array('suppress_errors' => true);
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        $windows = '\\' === DIRECTORY_SEPARATOR;
+        $commandline = $this->replacePlaceholder($commandline, $windows, $env);
+
+        if ($windows) {
             $options['bypass_shell'] = true;
             $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup);
         } elseif (!$this->useFileHandles && $this->isSigchildEnabled()) {
@@ -1562,4 +1565,33 @@ private function escapeArgument($argument)
 
         return '"'.str_replace(array('"', '^', '%', '!', "\n"), array('""', '"^^"', '"^%"', '"^!"', '!LF!'), $argument).'"';
     }
+
+    private function replacePlaceholder($commandLine, $windows, $env)
+    {
+        $toReplace = $windows ? array('!', '!') : array('$', '');
+        if (!preg_match_all('/\{([a-zA-Z0-9]+?)\}/', $commandLine, $matches)) {
+            return $commandLine;
+        }
+
+        $patterns = $replacements = array();
+        $isInEnv = false;
+        foreach ($matches as $match) {
+            $patterns[] = sprintf('/{%s}/', $match[0]);
+            $replacements[] = sprintf('%s%s%s', $toReplace[0], $match[0], $toReplace[1]);
+            if (isset($env[$match[0]])) {
+                $isInEnv = true;
+                unset($env[$match[0]]);
+            }
+        }
+
+        if (!$isInEnv) {
+            throw new InvalidArgumentException(sprintf('There are no passed env for the command line "%s", replacement cannot be done.', $commandLine));
+        }
+
+        if (!empty($env)) {
+            throw new InvalidArgumentException(sprintf('Placeholder%s "%s" doesn\'t exist.', count($env) > 1 ? 's' : '', implode(',', array_keys($env))));
+        }
+
+        return preg_replace($patterns, $replacements, $commandLine);
+    }
 }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1470,6 +1470,46 @@ public function provideEscapeArgument()
         yield array('éÉèÈàÀöä');
     }
 
+    public function testPreparedCommand()
+    {
+        $p = new Process('echo {abc}');
+        $p->run(null, array('abc' => 'ABC'));
+
+        $expected = <<<EOTXT
+ABC\n
+EOTXT;
+        $this->assertSame($expected, $p->getOutput());
+    }
+
+    /**
+     * @group prepare
+     */
+    public function testPreparedCommandWithTooMuchEnv()
+    {
+        $p = new Process('echo {abc}');
+        $p->run(null, array('abc' => 'ABC', 'bcd' => 'ABC'));
+
+        $expected = <<<EOTXT
+ABC\n
+EOTXT;
+        $this->assertSame($expected, $p->getOutput());
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
+     * @expectedExceptionMessage There are no passed env for the command line "echo {abc}", replacement cannot be done.
+     */
+    public function testPreparedCommandWithoutProvidedParam()
+    {
+        $p = new Process('echo {abc}');
+        $p->run(null, array('bcd' => 'ABC'));
+
+        $expected = <<<EOTXT
+ABC
+EOTXT;
+        $this->assertSame($expected, $p->getOutput());
+    }
+
     public function testEnvArgument()
     {
         $env = array('FOO' => 'Foo', 'BAR' => 'Bar');
