Merge branch '6.0' into 6.1

* 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()

Author: derrabus

FrameworkBundle.php

@@ -163,12 +163,12 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RemoveUnusedSessionMarshallingHandlerPass());
+        $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);
             $container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);
-            $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
         }
     }
 

Tests/Routing/RedirectableCompiledUrlMatcherTest.php

@@ -18,9 +18,6 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-/**
- * @requires function \Symfony\Component\Routing\Matcher\CompiledUrlMatcher::match
- */
 class RedirectableCompiledUrlMatcherTest extends TestCase
 {
     public function testRedirectWhenNoSlash()

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.13.1",
-        "doctrine/persistence": "^1.3|^2.0",
+        "doctrine/persistence": "^1.3|^2|^3",
         "symfony/asset": "^5.4|^6.0",
         "symfony/browser-kit": "^5.4|^6.0",
         "symfony/console": "^5.4|^6.0",