Skip to content

Commit aa8701d

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: prevent hash collisions caused by reused object hashes autoconfigure behavior describing tags on decorators [Validator][RecursiveContextualValidator] Prevent validated hash collisions
2 parents 1451b4b + 3af71db commit aa8701d

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,14 @@ public function load(array $configs, ContainerBuilder $container)
493493

494494
$container->registerForAutoconfiguration(RouteLoaderInterface::class)
495495
->addTag('routing.route_loader');
496+
497+
$container->setParameter('container.behavior_describing_tags', [
498+
'container.service_locator',
499+
'container.service_subscriber',
500+
'kernel.event_subscriber',
501+
'kernel.locale_aware',
502+
'kernel.reset',
503+
]);
496504
}
497505

498506
/**

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,20 @@ public function testMailerWithSpecificMessageBus(): void
14771477
$this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('mailer.mailer')->getArgument(1));
14781478
}
14791479

1480+
public function testRegisterParameterCollectingBehaviorDescribingTags()
1481+
{
1482+
$container = $this->createContainerFromFile('default_config');
1483+
1484+
$this->assertTrue($container->hasParameter('container.behavior_describing_tags'));
1485+
$this->assertEquals([
1486+
'container.service_locator',
1487+
'container.service_subscriber',
1488+
'kernel.event_subscriber',
1489+
'kernel.locale_aware',
1490+
'kernel.reset',
1491+
], $container->getParameter('container.behavior_describing_tags'));
1492+
}
1493+
14801494
protected function createContainer(array $data = [])
14811495
{
14821496
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

0 commit comments

Comments
 (0)