diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Process] Allow writing portable "prepared" command lines

This commit is contained in:
Amrouche Hamza 2017-10-31 07:00:43 +01:00 committed by Amrouche Hamza
parent dca9325e61
commit 3f8354f58f
No known key found for this signature in database
GPG Key ID: E45A3DA456145BC1
2 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/Process/Process.php
View File

@ -291,6 +291,12 @@ class Process implements \IteratorAggregate
$this->hasCallback = null !== $callback;
$descriptors = $this->getDescriptors();
if ($this->env) {
$env += $this->env;
}
$env += $this->getDefaultEnv();
if (\is_array($commandline = $this->commandline)) {
$commandline = implode(' ', array_map([$this, 'escapeArgument'], $commandline));
@ -298,13 +304,10 @@ class Process implements \IteratorAggregate
// 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 +1635,17 @@ class Process implements \IteratorAggregate
return '"'.str_replace(['"', '^', '%', '!', "\n"], ['""', '"^^"', '"^%"', '"^!"', '!LF!'], $argument).'"';
}
private function replacePlaceholders(string $commandline, array $env)
{
return preg_replace_callback('/"\$([_a-zA-Z]++[_a-zA-Z0-9]*+)"/', function ($matches) use ($commandline, $env) {
if (!isset($env[$matches[1]]) || false === $env[$matches[1]]) {
throw new InvalidArgumentException(sprintf('Command line is missing a value for key %s: %s.', $matches[0], $commandline));
}
return '\\' === \DIRECTORY_SEPARATOR ? $this->escapeArgument($env[$matches[1]]) : $matches[0];
}, $commandline);
}
private function getDefaultEnv()
{
$env = [];

44
src/Symfony/Component/Process/Tests/ProcessTest.php
View File

@ -1500,6 +1500,50 @@ EOTXT;
yield [1.1];
}
public function testPreparedCommand()
{
$p = Process::fromShellCommandline('echo "$abc"DEF');
$p->run(null, ['abc' => 'ABC']);
$this->assertSame('ABCDEF', rtrim($p->getOutput()));
}
public function testPreparedCommandMulti()
{
$p = Process::fromShellCommandline('echo "$abc""$def"');
$p->run(null, ['abc' => 'ABC', 'def' => 'DEF']);
$this->assertSame('ABCDEF', rtrim($p->getOutput()));
}
public function testPreparedCommandWithQuoteInIt()
{
$p = Process::fromShellCommandline('php -r "$code" "$def"');
$p->run(null, ['code' => 'echo $argv[1];', 'def' => '"DEF"']);
$this->assertSame('"DEF"', rtrim($p->getOutput()));
}
/**
* @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
* @expectedExceptionMessage Command line is missing a value for key "$abc": echo "$abc".
*/
public function testPreparedCommandWithMissingValue()
{
$p = Process::fromShellCommandline('echo "$abc"');
$p->run(null, ['bcd' => 'BCD']);
}
/**
* @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
* @expectedExceptionMessage Command line is missing a value for key "$abc": echo "$abc".
*/
public function testPreparedCommandWithNoValues()
{
$p = Process::fromShellCommandline('echo "$abc"');
$p->run(null, []);
}
public function testEnvArgument()
{
$env = ['FOO' => 'Foo', 'BAR' => 'Bar'];