[FrameworkBundle] Fix auto-discovering validator constraints

nicolas-grekas · nicolas-grekas · commit f9ac1e3c9a66 · 2023-03-29T15:39:59.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -65,11 +65,14 @@
                 abstract_arg('Constraint validators locator'),
             ])
 
+        ->load('Symfony\Component\Validator\Constraints\\', \dirname((new \ReflectionClass(WhenValidator::class))->getFileName()).'/*Validator.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', ['alias' => 'validator.expression'])
 
         ->set('validator.expression_language', ExpressionLanguage::class)
             ->args([service('cache.validator_expression_language')->nullOnInvalid()])
@@ -82,25 +85,19 @@
             ->args([
                 abstract_arg('Default mode'),
             ])
-            ->tag('validator.constraint_validator', [
-                'alias' => EmailValidator::class,
-            ])
+            ->tag('validator.constraint_validator', ['alias' => 'validator.email'])
 
         ->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', ['alias' => 'validator.not_compromised_password'])
 
         ->set('validator.when', WhenValidator::class)
             ->args([service('validator.expression_language')->nullOnInvalid()])
-            ->tag('validator.constraint_validator', [
-                'alias' => WhenValidator::class,
-            ])
+            ->tag('validator.constraint_validator', ['alias' => 'validator.when'])
 
         ->set('validator.property_info_loader', PropertyInfoLoader::class)
             ->args([
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -58,9 +58,9 @@
         "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/validator": "^6.2.8",
         "symfony/workflow": "^5.4|^6.0",
         "symfony/yaml": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
@@ -91,10 +91,10 @@
         "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",
+        "symfony/validator": "<6.2.8",
         "symfony/web-profiler-bundle": "<5.4",
         "symfony/workflow": "<5.4"
     },
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -53,8 +53,9 @@ public function process(ContainerBuilder $container)
             $constraintVisitorDefinition = $container->getDefinition('translation.extractor.visitor.constraint');
             $constraintClassNames = [];
 
-            foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {
+            foreach ($container->findTaggedServiceIds('validator.constraint_validator') as $id => $attributes) {
                 $serviceDefinition = $container->getDefinition($id);
+
                 // Resolve constraint validator FQCN even if defined as %foo.validator.class% parameter
                 $className = $container->getParameterBag()->resolveValue($serviceDefinition->getClass());
                 // Extraction of the constraint class name from the Constraint Validator FQCN
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
@@ -29,9 +29,13 @@ public function process(ContainerBuilder $container)
         }
 
         $validators = [];
-        foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('validator.constraint_validator') as $id => $attributes) {
             $definition = $container->getDefinition($id);
 
+            if ($definition->isAbstract()) {
+                continue;
+            }
+
             if (isset($attributes[0]['alias'])) {
                 $validators[$attributes[0]['alias']] = new Reference($id);
             }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,13 @@ public function process(ContainerBuilder $container)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`$validators = [];`
`32`		`- foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {`
	`32`	`+ foreach ($container->findTaggedServiceIds('validator.constraint_validator') as $id => $attributes) {`
`33`	`33`	`$definition = $container->getDefinition($id);`
`34`	`34`
	`35`	`+ if ($definition->isAbstract()) {`
	`36`	`+ continue;`
	`37`	`+ }`
	`38`	`+`
`35`	`39`	`if (isset($attributes[0]['alias'])) {`
`36`	`40`	`$validators[$attributes[0]['alias']] = new Reference($id);`
`37`	`41`	`}`