Merge branch '5.0'

fabpot · fabpot · commit edb0518e56ea · 2020-04-12T18:56:52.000+02:00
* 5.0:
  Fix tests
  Fix test
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1488,15 +1488,15 @@ public function testPreparedCommandWithQuoteInIt()
     public function testPreparedCommandWithMissingValue()
     {
         $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->run(null, ['bcd' => 'BCD']);
     }
 
     public function testPreparedCommandWithNoValues()
     {
         $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->run(null, []);
     }

Original file line number	Diff line number	Diff line change
`@@ -1488,15 +1488,15 @@ public function testPreparedCommandWithQuoteInIt()`
`1488`	`1488`	public function testPreparedCommandWithMissingValue()
`1489`	`1489`	`{`
`1490`	`1490`	`$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');`
`1491`		`- $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}".');`
	`1491`	`+ $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}"');`
`1492`	`1492`	`$p = Process::fromShellCommandline('echo "${:abc}"');`
`1493`	`1493`	`$p->run(null, ['bcd' => 'BCD']);`
`1494`	`1494`	`}`
`1495`	`1495`
`1496`	`1496`	`public function testPreparedCommandWithNoValues()`
`1497`	`1497`	`{`
`1498`	`1498`	`$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');`
`1499`		`- $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}".');`
	`1499`	`+ $this->expectExceptionMessage('Command line is missing a value for parameter "abc": echo "${:abc}"');`
`1500`	`1500`	`$p = Process::fromShellCommandline('echo "${:abc}"');`
`1501`	`1501`	`$p->run(null, []);`
`1502`	`1502`	`}`