Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit d6caf7edcafe · 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/Extension/Core/Type/CheckboxTypeTest.php b/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -197,7 +197,7 @@ public function provideCustomFalseValues()
     public function testDontAllowNonArrayFalseValues()
     {
         $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
-        $this->expectExceptionMessageRegExp('/"false_values" with value "invalid" is expected to be of type "array"/');
+        $this->expectExceptionMessageMatches('/"false_values" with value "invalid" is expected to be of type "array"/');
         $this->factory->create(static::TESTED_TYPE, null, [
             'false_values' => 'invalid',
         ]);

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function provideCustomFalseValues()`
`197`	`197`	`public function testDontAllowNonArrayFalseValues()`
`198`	`198`	`{`
`199`	`199`	`$this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');`
`200`		`- $this->expectExceptionMessageRegExp('/"false_values" with value "invalid" is expected to be of type "array"/');`
	`200`	`+ $this->expectExceptionMessageMatches('/"false_values" with value "invalid" is expected to be of type "array"/');`
`201`	`201`	`$this->factory->create(static::TESTED_TYPE, null, [`
`202`	`202`	`'false_values' => 'invalid',`
`203`	`203`	`]);`