From c5659985b7de0eadee07d0c667df3a9ea7647083 Mon Sep 17 00:00:00 2001 From: "Roland Franssen :)" Date: Sat, 18 Dec 2021 11:15:31 +0100 Subject: [PATCH 1/3] Update AddAutoMappingConfigurationPass.php --- .../DependencyInjection/AddAutoMappingConfigurationPass.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php index 4d23b2ebb79df..4a60bfc3ff7c7 100644 --- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php +++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php @@ -27,12 +27,12 @@ class AddAutoMappingConfigurationPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - if (!$container->hasParameter('validator.auto_mapping') || !$container->hasDefinition('validator.builder')) { + $config = $container->getParameter('validator.auto_mapping'); + + if (!$config || !$container->hasDefinition('validator.builder')) { return; } - $config = $container->getParameter('validator.auto_mapping'); - $globalNamespaces = []; $servicesToNamespaces = []; foreach ($config as $namespace => $value) { From fabebc57ce4d8ccf8909490083cf8ebf00b18dad Mon Sep 17 00:00:00 2001 From: "Roland Franssen :)" Date: Sat, 18 Dec 2021 11:31:02 +0100 Subject: [PATCH 2/3] Update AddAutoMappingConfigurationPass.php --- .../DependencyInjection/AddAutoMappingConfigurationPass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php index 4a60bfc3ff7c7..87368db9ba4a4 100644 --- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php +++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php @@ -27,7 +27,7 @@ class AddAutoMappingConfigurationPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - $config = $container->getParameter('validator.auto_mapping'); + $config = $container->hasParameter('validator.auto_mapping') ? $container->getParameter('validator.auto_mapping') : null; if (!$config || !$container->hasDefinition('validator.builder')) { return; From 9d0c770ef3ac2a521f2a0c7a58c890efed58fdaf Mon Sep 17 00:00:00 2001 From: "Roland Franssen :)" Date: Tue, 21 Dec 2021 11:32:30 +0100 Subject: [PATCH 3/3] Update src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php Co-authored-by: Maxime Steinhausser --- .../DependencyInjection/AddAutoMappingConfigurationPass.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php index 87368db9ba4a4..16e536da229b1 100644 --- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php +++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php @@ -30,6 +30,8 @@ public function process(ContainerBuilder $container) $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; }