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

Tests/IdGenerator/UlidGeneratorTest.php

@@ -29,9 +29,6 @@ public function testUlidCanBeGenerated()
         $this->assertTrue(Ulid::isValid($ulid));
     }
 
-    /**
-     * @requires function \Symfony\Component\Uid\Factory\UlidFactory::create
-     */
     public function testUlidFactory()
     {
         $ulid = new Ulid('00000000000000000000000000');

Tests/IdGenerator/UuidGeneratorTest.php

@@ -18,9 +18,6 @@
 use Symfony\Component\Uid\UuidV4;
 use Symfony\Component\Uid\UuidV6;
 
-/**
- * @requires function \Symfony\Component\Uid\Factory\UuidFactory::create
- */
 class UuidGeneratorTest extends TestCase
 {
     public function testUuidCanBeGenerated()

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "doctrine/event-manager": "~1.0",
-        "doctrine/persistence": "^2",
+        "doctrine/persistence": "^2|^3",
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",