[FrameworkBundle] Fix auto-discovering validator constraints

symfony · nicolas-grekas · Mar 30, 2023 · Mar 28, 2023 · Mar 30, 2023 · f60218c2519c82df82cd8633197daf0bc528247b
commit f60218c2519c82df82cd8633197daf0bc528247b
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -100,6 +100,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $previousId = '-';
         $serviceIdsNb = 0;
         foreach ($serviceIds as $serviceId) {
+            if ($builder->hasDefinition($serviceId) && $builder->getDefinition($serviceId)->hasTag('container.excluded')) {
+                continue;
+            }
             $text = [];
             $resolvedServiceId = $serviceId;
             if (!str_starts_with($serviceId, $previousId)) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -28,6 +28,8 @@
     $container->parameters()
         ->set('validator.mapping.cache.file', param('kernel.cache_dir').'/validation.php');
 
+    $validatorsDir = \dirname((new \ReflectionClass(WhenValidator::class))->getFileName());
+
     $container->services()
         ->set('validator', ValidatorInterface::class)
             ->factory([service('validator.builder'), 'getValidator'])
@@ -65,11 +67,15 @@
                 abstract_arg('Constraint validators locator'),
             ])
 
+        ->load('Symfony\Component\Validator\Constraints\\', $validatorsDir.'/*Validator.php')
+            ->exclude($validatorsDir.'/ExpressionLanguageSyntaxValidator.php')
+            ->abstract()
+            ->tag('container.excluded')
+            ->tag('validator.constraint_validator')
+
         ->set('validator.expression', ExpressionValidator::class)
             ->args([service('validator.expression_language')->nullOnInvalid()])
-            ->tag('validator.constraint_validator', [
-                'alias' => 'validator.expression',
-            ])
+            ->tag('validator.constraint_validator')
 
         ->set('validator.expression_language', ExpressionLanguage::class)
             ->args([service('cache.validator_expression_language')->nullOnInvalid()])
@@ -82,25 +88,19 @@
             ->args([
                 abstract_arg('Default mode'),
             ])
-            ->tag('validator.constraint_validator', [
-                'alias' => EmailValidator::class,
-            ])
+            ->tag('validator.constraint_validator')
 
         ->set('validator.not_compromised_password', NotCompromisedPasswordValidator::class)
             ->args([
                 service('http_client')->nullOnInvalid(),
                 param('kernel.charset'),
                 false,
             ])
-            ->tag('validator.constraint_validator', [
-                'alias' => NotCompromisedPasswordValidator::class,
-            ])
+            ->tag('validator.constraint_validator')
 
         ->set('validator.when', WhenValidator::class)
             ->args([service('validator.expression_language')->nullOnInvalid()])
-            ->tag('validator.constraint_validator', [
-                'alias' => WhenValidator::class,
-            ])
+            ->tag('validator.constraint_validator')
 
         ->set('validator.property_info_loader', PropertyInfoLoader::class)
             ->args([

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -21,7 +21,7 @@
         "ext-xml": "*",
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^6.1",
-        "symfony/dependency-injection": "^6.2",
+        "symfony/dependency-injection": "^6.2.8",
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
@@ -58,7 +58,7 @@
         "symfony/serializer": "^6.1",
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/string": "^5.4|^6.0",
-        "symfony/translation": "^5.4|^6.0",
+        "symfony/translation": "^6.2.8",
         "symfony/twig-bundle": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0",
         "symfony/workflow": "^5.4|^6.0",
@@ -91,7 +91,7 @@
         "symfony/security-csrf": "<5.4",
         "symfony/security-core": "<5.4",
         "symfony/stopwatch": "<5.4",
-        "symfony/translation": "<5.4",
+        "symfony/translation": "<6.2.8",
         "symfony/twig-bridge": "<5.4",
         "symfony/twig-bundle": "<5.4",
         "symfony/validator": "<5.4",

diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -53,10 +53,12 @@ public function process(ContainerBuilder $container)
             $constraintVisitorDefinition = $container->getDefinition('translation.extractor.visitor.constraint');
             $constraintClassNames = [];
 
-            foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {
-                $serviceDefinition = $container->getDefinition($id);
+            foreach ($container->getDefinitions() as $definition) {
+                if (!$definition->hasTag('validator.constraint_validator')) {
+                    continue;
+                }
                 // Resolve constraint validator FQCN even if defined as %foo.validator.class% parameter
-                $className = $container->getParameterBag()->resolveValue($serviceDefinition->getClass());
+                $className = $container->getParameterBag()->resolveValue($definition->getClass());
                 // Extraction of the constraint class name from the Constraint Validator FQCN
                 $constraintClassNames[] = str_replace('Validator', '', substr(strrchr($className, '\\'), 1));
             }