Merge branch '6.0' into 6.1

derrabus · derrabus · commit b73358716551 · 2022-04-22T10:18:23.000+02:00
* 6.0: Use mb_convert_encoding instead of utf8_decode [SecurityBundle] Remove forgotten unused code Minor @requires function tests cleanup [FrameworkBundle] Always add CacheCollectorPass Fix "Notice: Undefined index: headers" in messenger with Oracle [String] Fix ansi escape sequences regex Indicate support for doctrine/persistence 3 [Routing] fix router base url when default uri has trailing slash Replace deprecated String.prototype.substr()
diff --git a/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -759,9 +759,6 @@ function ($object, $key, $value) {
         $this->assertFlatViewWithAttr($view);
     }
 
-    /**
-     * @requires function Symfony\Component\Translation\TranslatableMessage::__construct
-     */
     public function testPassTranslatableMessageAsLabelDoesntCastItToString()
     {
         $view = $this->factory->createView(

Original file line number	Diff line number	Diff line change
`@@ -759,9 +759,6 @@ function ($object, $key, $value) {`
`759`	`759`	`$this->assertFlatViewWithAttr($view);`
`760`	`760`	`}`
`761`	`761`
`762`		`- /**`
`763`		`- * @requires function Symfony\Component\Translation\TranslatableMessage::__construct`
`764`		`- */`
`765`	`762`	`public function testPassTranslatableMessageAsLabelDoesntCastItToString()`
`766`	`763`	`{`
`767`	`764`	`$view = $this->factory->createView(`