Merge branch '4.4' into 5.0

* 4.4:
  Fix tests
  Fix test
This commit is contained in:
Fabien Potencier 2020-04-12 18:56:42 +02:00
commit 780b539669

View File

@ -1488,7 +1488,7 @@ EOTXT;
public function testPreparedCommandWithMissingValue() public function testPreparedCommandWithMissingValue()
{ {
$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException'); $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
$this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}".'); $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}"');
$p = Process::fromShellCommandline('echo "${:abc}"'); $p = Process::fromShellCommandline('echo "${:abc}"');
$p->run(null, ['bcd' => 'BCD']); $p->run(null, ['bcd' => 'BCD']);
} }
@ -1496,7 +1496,7 @@ EOTXT;
public function testPreparedCommandWithNoValues() public function testPreparedCommandWithNoValues()
{ {
$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException'); $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
$this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}".'); $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}"');
$p = Process::fromShellCommandline('echo "${:abc}"'); $p = Process::fromShellCommandline('echo "${:abc}"');
$p->run(null, []); $p->run(null, []);
} }