diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php index 4d23b2ebb79df..16e536da229b1 100644 --- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php +++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php @@ -27,12 +27,14 @@ class AddAutoMappingConfigurationPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - if (!$container->hasParameter('validator.auto_mapping') || !$container->hasDefinition('validator.builder')) { + $config = $container->hasParameter('validator.auto_mapping') ? $container->getParameter('validator.auto_mapping') : null; + + if (!$config || !$container->hasDefinition('validator.builder')) { + $container->getParameterBag()->remove('validator.auto_mapping'); + return; } - $config = $container->getParameter('validator.auto_mapping'); - $globalNamespaces = []; $servicesToNamespaces = []; foreach ($config as $namespace => $value) {