Skip to content

Commit 2700cba

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

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
@@ -533,6 +533,14 @@ public function load(array $configs, ContainerBuilder $container)
533533

534534
$container->registerForAutoconfiguration(RouteLoaderInterface::class)
535535
->addTag('routing.route_loader');
536+
537+
$container->setParameter('container.behavior_describing_tags', [
538+
'container.service_locator',
539+
'container.service_subscriber',
540+
'kernel.event_subscriber',
541+
'kernel.locale_aware',
542+
'kernel.reset',
543+
]);
536544
}
537545

538546
/**

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,20 @@ public function testHttpClientMockResponseFactory()
16221622
$this->assertSame('my_response_factory', (string) $argument);
16231623
}
16241624

1625+
public function testRegisterParameterCollectingBehaviorDescribingTags()
1626+
{
1627+
$container = $this->createContainerFromFile('default_config');
1628+
1629+
$this->assertTrue($container->hasParameter('container.behavior_describing_tags'));
1630+
$this->assertEquals([
1631+
'container.service_locator',
1632+
'container.service_subscriber',
1633+
'kernel.event_subscriber',
1634+
'kernel.locale_aware',
1635+
'kernel.reset',
1636+
], $container->getParameter('container.behavior_describing_tags'));
1637+
}
1638+
16251639
protected function createContainer(array $data = [])
16261640
{
16271641
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

0 commit comments

Comments
 (0)