8000 [FrameworkBundle] Fix auto-discovering validator constraints · symfony/symfony@bcc8dca · GitHub
[go: up one dir, main page]
Skip to content

Commit bcc8dca

Browse files
nicolas-grekasnicolas-grekas
committed
[FrameworkBundle] Fix auto-discovering validator constraints
1 parent eb9f258 commit bcc8dca

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
abstract_arg('Constraint validators locator'),
6666
])
6767

68+
->load('Symfony\Component\Validator\Constraints\\', \dirname((new \ReflectionClass(WhenValidator::class))->getFileName()).'/*Validator.php')
69+
->abstract()
70+
->tag('container.excluded')
71+
->tag('validator.constraint_validator')
72+
6873
->set('validator.expression', ExpressionValidator::class)
6974
->args([service('validator.expression_language')->nullOnInvalid()])
7075
->tag('validator.constraint_validator', [

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"symfony/serializer": "^6.1",
5959
"symfony/stopwatch": "^5.4|^6.0",
6060
"symfony/string": "^5.4|^6.0",
61-
"symfony/translation": "^5.4|^6.0",
61+
"symfony/translation": "^6.2.8",
6262
"symfony/twig-bundle": "^5.4|^6.0",
63-
"symfony/validator": "^5.4|^6.0",
63+
"symfony/validator": "^6.2.8",
6464
"symfony/workflow": "^5.4|^6.0",
6565
"symfony/yaml": "^5.4|^6.0",
6666
"symfony/property-info": "^5.4|^6.0",
@@ -91,10 +91,10 @@
9191
"symfony/security-csrf": "<5.4",
9292
"symfony/security-core": "<5.4",
9393
"symfony/stopwatch": "<5.4",
94-
"symfony/translation": "<5.4",
94+
"symfony/translation": "<6.2.8",
9595
"symfony/twig-bridge": "<5.4",
9696
"symfony/twig-bundle": "<5.4",
97-
"symfony/validator": "<5.4",
97+
"symfony/validator": "<6.2.8",
9898
"symfony/web-profiler-bundle": "<5.4",
9999
"symfony/workflow": "<5.4"
100100
},

‎src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ public function process(ContainerBuilder $container)
5353
$constraintVisitorDefinition = $container->getDefinition('translation.extractor.visitor.constraint');
5454
$constraintClassNames = [];
5555

56-
foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {
56+
foreach ($container->findTaggedServiceIds('validator.constraint_validator') as $id => $attributes) {
5757
$serviceDefinition = $container->getDefinition($id);
58+
5859
// Resolve constraint validator FQCN even if defined as %foo.validator.class% parameter
5960
$className = $container->getParameterBag()->resolveValue($serviceDefinition->getClass());
6061
// Extraction of the constraint class name from the Constraint Validator FQCN

‎src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ public function process(ContainerBuilder $container)
2929
}
3030

3131
$validators = [];
32-
foreach ($container->findTaggedServiceIds('validator.constraint_validator', true) as $id => $attributes) {
32+
foreach ($container->findTaggedServiceIds('validator.constraint_validator') as $id => $attributes) {
3333
$definition = $container->getDefinition($id);
3434

35+
if ($definition->isAbstract()) {
36+
continue;
37+
}
38+
3539
if (isset($attributes[0]['alias'])) {
3640
$validators[$attributes[0]['alias']] = new Reference($id);
3741
}

0 commit comments

Comments
 (0)
0