Skip to content

Commit 6f73fdf

Browse files
Merge branch '6.4' into 7.4
* 6.4: [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 # Conflicts: # src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php # src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php # src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php # src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php # src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
2 parents 25efdec + 00ce723 commit 6f73fdf

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

DependencyInjection/Compiler/RegisterLdapLocatorPass.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ public function process(ContainerBuilder $container): void
3030
$definition = $container->setDefinition('security.ldap_locator', new Definition(ServiceLocator::class));
3131

3232
$locators = [];
33-
foreach ($container->findTaggedServiceIds('ldap') as $serviceId => $tags) {
34-
$locators[$serviceId] = new ServiceClosureArgument(new Reference($serviceId));
33+
foreach ($container->findTaggedServiceIds('ldap') as $id => $tags) {
34+
$locators[$id] = new ServiceClosureArgument(new Reference($id));
35+
$container->getDefinition($id)->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore']);
3536
}
3637

3738
$definition->addArgument($locators);

0 commit comments

Comments
 (0)