Merge branch '7.4' into 8.0

* 7.4:
  [Serializer] Fix mixed-typed constructor parameters overriding getter-inferred type
  Fix tests
  [Cache] Ensure compatibility with Relay extension 0.21.0
  [Mime][TwigBridge] Fix merge conflict resolution
  [Ldap] Make the Adapter resettable
  [Serializer] Remove needless line in changelog
  [MonologBridge] Fix ConsoleHandler losing output after nested command terminates
  [Cache] Fix tests
  [EventDispatcher] Fix memory leak in TraceableEventDispatcher for long-running processes
  [TwigBridge][Mime] Add missing tests
  [TwigBridge] Refactor image method to use DataPart content ID
  [Cache] Fix undefined property access
  [Console] Fix performance regression in OutputFormatter for ASCII content
  [Serializer] Fix can*() prefix support in GetSetMethodNormalizer
  [Cache] Fix Psr16Cache::getMultiple() returning ValueWrapper with TagAwareAdapter
  Configure deprecation triggers

Author: nicolas-grekas

DependencyInjection/Compiler/RegisterLdapLocatorPass.php

@@ -30,8 +30,9 @@ public function process(ContainerBuilder $container): void
         $definition = $container->setDefinition('security.ldap_locator', new Definition(ServiceLocator::class));
 
         $locators = [];
-        foreach ($container->findTaggedServiceIds('ldap') as $serviceId => $tags) {
-            $locators[$serviceId] = new ServiceClosureArgument(new Reference($serviceId));
+        foreach ($container->findTaggedServiceIds('ldap') as $id => $tags) {
+            $locators[$id] = new ServiceClosureArgument(new Reference($id));
+            $container->getDefinition($id)->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore']);
         }
 
         $definition->addArgument($locators);

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
@@ -20,6 +20,11 @@
     </testsuites>
 
     <source ignoreSuppressionOfDeprecations="true">
+        <deprecationTrigger>
+            <function>trigger_deprecation</function>
+            <method>Doctrine\Deprecations\Deprecation::trigger</method>
+            <method>Doctrine\Deprecations\Deprecation::triggerIfCalledFromOutside</method>
+        </deprecationTrigger>
         <include>
             <directory>./</directory>
         </include>