Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 3179f68dff5b · 2020-04-15T17:59:10.000+02:00
* 4.4:
  [PhpUnitBridge] add PolyfillTestCaseTrait::expectExceptionMessageMatches to provide FC with recent phpunit versions
  [Messenger] Make sure redis transports are initialized correctly
  Remove return type for Twig function workflow_metadata()
  [DI] fix typo
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -50,7 +50,7 @@ protected function tearDown(): void
     public function testInvalidCwd()
     {
         $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
-        $this->expectExceptionMessageRegExp('/The provided cwd ".*" does not exist\./');
+        $this->expectExceptionMessageMatches('/The provided cwd ".*" does not exist\./');
         try {
             // Check that it works fine if the CWD exists
             $cmd = new Process(['echo', 'test'], __DIR__);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected function tearDown(): void`
`50`	`50`	`public function testInvalidCwd()`
`51`	`51`	`{`
`52`	`52`	`$this->expectException('Symfony\Component\Process\Exception\RuntimeException');`
`53`		`- $this->expectExceptionMessageRegExp('/The provided cwd ".*" does not exist\./');`
	`53`	`+ $this->expectExceptionMessageMatches('/The provided cwd ".*" does not exist\./');`
`54`	`54`	`try {`
`55`	`55`	`// Check that it works fine if the CWD exists`
`56`	`56`	`$cmd = new Process(['echo', 'test'], __DIR__);`