Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit b93755750b9e · 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/ExpressionLanguageTest.php b/Tests/ExpressionLanguageTest.php
@@ -231,7 +231,7 @@ public function testRegisterAfterEval($registerCallback)
     public function testCallBadCallable()
     {
         $this->expectException('RuntimeException');
-        $this->expectExceptionMessageRegExp('/Unable to call method "\w+" of object "\w+"./');
+        $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');
         $el = new ExpressionLanguage();
         $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
     }

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public function testRegisterAfterEval($registerCallback)`
`231`	`231`	`public function testCallBadCallable()`
`232`	`232`	`{`
`233`	`233`	`$this->expectException('RuntimeException');`
`234`		`- $this->expectExceptionMessageRegExp('/Unable to call method "\w+" of object "\w+"./');`
	`234`	`+ $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');`
`235`	`235`	`$el = new ExpressionLanguage();`
`236`	`236`	`$el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);`
`237`	`237`	`}`