bug #46244 [Validator] Fix traverse option on Valid constraint when used as Attribute (tobias-93)

fabpot · fabpot · commit 550e4cc26949 · 2022-07-15T11:01:54.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Validator] Fix traverse option on Valid constraint when used as Attribute | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46243 | License | MIT | Doc PR | n.a. Fix Valid constraint when using as Attribute. Commits ------- ebbe722 [Validator] Fix traverse option on Valid constraint when used as Attribute
diff --git a/src/Symfony/Component/Validator/Constraints/Valid.php b/src/Symfony/Component/Validator/Constraints/Valid.php
@@ -24,6 +24,13 @@ class Valid extends Constraint
 {
     public $traverse = true;
 
+    public function __construct(array $options = null, array $groups = null, $payload = null, bool $traverse = null)
+    {
+        parent::__construct($options ?? [], $groups, $payload);
+
+        $this->traverse = $traverse ?? $this->traverse;
+    }
+
     public function __get(string $option)
     {
         if ('groups' === $option) {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -32,4 +34,34 @@ public function testGroupsAreNullByDefault()
 
         $this->assertNull($constraint->groups);
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testAttributes()
+    {
+        $metadata = new ClassMetaData(ValidDummy::class);
+        $loader = new AnnotationLoader();
+        self::assertTrue($loader->loadClassMetadata($metadata));
+
+        [$bConstraint] = $metadata->properties['b']->getConstraints();
+        self::assertFalse($bConstraint->traverse);
+        self::assertSame(['traverse_group'], $bConstraint->groups);
+
+        [$cConstraint] = $metadata->properties['c']->getConstraints();
+        self::assertSame(['my_group'], $cConstraint->groups);
+        self::assertSame('some attached data', $cConstraint->payload);
+    }
+}
+
+class ValidDummy
+{
+    #[Valid]
+    private $a;
+
+    #[Valid(groups: ['traverse_group'], traverse: false)] // Needs a group to work at all for this test
+    private $b;
+
+    #[Valid(groups: ['my_group'], payload: 'some attached data')]
+    private $c;
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@ class Valid extends Constraint`
`24`	`24`	`{`
`25`	`25`	`public $traverse = true;`
`26`	`26`
	`27`	`+ public function __construct(array $options = null, array $groups = null, $payload = null, bool $traverse = null)`
	`28`	`+ {`
	`29`	`+ parent::__construct($options ?? [], $groups, $payload);`
	`30`	`+`
	`31`	`+ $this->traverse = $traverse ?? $this->traverse;`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`public function __get(string $option)`
`28`	`35`	`{`
`29`	`36`	`if ('groups' === $option) {`