Skip to content

Commit e9d3eba

Browse files
[FrameworkBundle] Don't exclude classes with constraint/serialization attributes from being registered as services
1 parent 1ee5cfe commit e9d3eba

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,8 +1855,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
18551855
if (class_exists(ValidatorAttributeMetadataPass::class) && (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug')) && trait_exists(ArgumentTrait::class)) {
18561856
// The $reflector argument hints at where the attribute could be used
18571857
$container->registerAttributeForAutoconfiguration(Constraint::class, static function (ChildDefinition $definition, Constraint $attribute, \ReflectionClass|\ReflectionMethod|\ReflectionProperty $reflector) {
1858-
$definition->addTag('validator.attribute_metadata')
1859-
->addTag('container.excluded', ['source' => 'because it\'s a validator constraint extension']);
1858+
$definition->addTag('validator.attribute_metadata');
18601859
});
18611860
}
18621861

@@ -2121,24 +2120,21 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
21212120
if (class_exists(SerializerAttributeMetadataPass::class) && (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug'))) {
21222121
// The $reflector argument hints at where the attribute could be used
21232122
$configurator = static function (ChildDefinition $definition, object $attribute, \ReflectionClass|\ReflectionMethod|\ReflectionProperty $reflector) {
2124-
$definition->addTag('serializer.attribute_metadata')
2125-
->addTag('container.excluded', ['source' => 'because it\'s a serializer metadata extension']);
2123+
$definition->addTag('serializer.attribute_metadata');
21262124
};
21272125
$container->registerAttributeForAutoconfiguration(SerializerMapping\Context::class, $configurator);
21282126
$container->registerAttributeForAutoconfiguration(SerializerMapping\Groups::class, $configurator);
21292127

21302128
$configurator = static function (ChildDefinition $definition, object $attribute, \ReflectionMethod|\ReflectionProperty $reflector) {
2131-
$definition->addTag('serializer.attribute_metadata')
2132-
->addTag('container.excluded', ['source' => 'because it\'s a serializer metadata extension']);
2129+
$definition->addTag('serializer.attribute_metadata');
21332130
};
21342131
$container->registerAttributeForAutoconfiguration(SerializerMapping\Ignore::class, $configurator);
21352132
$container->registerAttributeForAutoconfiguration(SerializerMapping\MaxDepth::class, $configurator);
21362133
$container->registerAttributeForAutoconfiguration(SerializerMapping\SerializedName::class, $configurator);
21372134
$container->registerAttributeForAutoconfiguration(SerializerMapping\SerializedPath::class, $configurator);
21382135

21392136
$container->registerAttributeForAutoconfiguration(SerializerMapping\DiscriminatorMap::class, static function (ChildDefinition $definition) {
2140-
$definition->addTag('serializer.attribute_metadata')
2141-
->addTag('container.excluded', ['source' => 'because it\'s a serializer metadata extension']);
2137+
$definition->addTag('serializer.attribute_metadata');
21422138
});
21432139
}
21442140

0 commit comments

Comments
 (0)