bug #62716 [Validator] fix handling named arguments in Existence constraint (xabbuh)

nicolas-grekas · nicolas-grekas · commit f55381885331 · 2025-12-10T11:27:44.000+01:00
This PR was merged into the 7.4 branch. Discussion ---------- [Validator] fix handling named arguments in `Existence` constraint | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #62705 | License | MIT Commits ------- c495750 fix handling named arguments in Existence constraint
diff --git a/src/Symfony/Component/Validator/Constraints/Existence.php b/src/Symfony/Component/Validator/Constraints/Existence.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\Validator\Attribute\HasNamedArguments;
 use Symfony\Component\Validator\Constraint;
 
 /**
@@ -20,6 +21,7 @@ abstract class Existence extends Composite
 {
     public array|Constraint $constraints = [];
 
+    #[HasNamedArguments]
     public function __construct(mixed $constraints = null, ?array $groups = null, mixed $payload = null)
     {
         if (!$constraints instanceof Constraint && !\is_array($constraints) || \is_array($constraints) && !array_is_list($constraints)) {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -18,11 +18,15 @@
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\IsTrue;
 use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\Optional;
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\Regex;
+use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Traverse;
 use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Exception\MappingException;
@@ -83,6 +87,8 @@ public function testLoadClassMetadata()
         $expected->addPropertyConstraint('firstName', new Collection(fields: [
             'foo' => [new NotNull(), new Range(min: 3)],
             'bar' => [new Range(min: 5)],
+            'baz' => new Required([new Email()]),
+            'qux' => new Optional([new NotBlank()]),
         ]));
         $expected->addPropertyConstraint('firstName', new Choice(
             message: 'Must be one of %choices%',
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -19,9 +19,13 @@
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\IsTrue;
+use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\Optional;
 use Symfony\Component\Validator\Constraints\Range;
+use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\YamlFileLoader;
@@ -125,6 +129,8 @@ public function testLoadClassMetadata()
         $expected->addPropertyConstraint('firstName', new Collection(fields: [
             'foo' => [new NotNull(), new Range(min: 3)],
             'bar' => [new Range(min: 5)],
+            'baz' => new Required([new Email()]),
+            'qux' => new Optional([new NotBlank()]),
         ]));
         $expected->addPropertyConstraint('firstName', new Choice(
             message: 'Must be one of %choices%',
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml b/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml
@@ -97,6 +97,20 @@
                <option name="min">5</option>
             </constraint>
           </value>
+          <value key="baz">
+            <constraint name="Required">
+               <option name="constraints">
+                   <constraint name="Email" />
+               </option>
+            </constraint>
+          </value>
+          <value key="qux">
+            <constraint name="Optional">
+               <option name="constraints">
+                   <constraint name="NotBlank" />
+               </option>
+            </constraint>
+          </value>
         </option>
       </constraint>
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.yml b/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.yml
@@ -53,6 +53,14 @@ Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity:
             bar:
               - Range:
                   min: 5
+            baz:
+              - Required:
+                  constraints:
+                    - Email: ~
+            qux:
+              - Optional:
+                  constraints:
+                    - NotBlank: ~
       # Constraint with options
       - Choice: { choices: [A, B], message: Must be one of %choices% }
     dummy:

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Constraints;`
`13`	`13`
	`14`	`+use Symfony\Component\Validator\Attribute\HasNamedArguments;`
`14`	`15`	`use Symfony\Component\Validator\Constraint;`
`15`	`16`
`16`	`17`	`/**`
`@@ -20,6 +21,7 @@ abstract class Existence extends Composite`
`20`	`21`	`{`
`21`	`22`	`public array\|Constraint $constraints = [];`
`22`	`23`
	`24`	`+ #[HasNamedArguments]`
`23`	`25`	`public function __construct(mixed $constraints = null, ?array $groups = null, mixed $payload = null)`
`24`	`26`	`{`
`25`	`27`	`if (!$constraints instanceof Constraint && !\is_array($constraints) \|\| \is_array($constraints) && !array_is_list($constraints)) {`