bug #44448 [Validator] Allow Sequence constraint to be applied onto class as an attribute (sidz)

nicolas-grekas · nicolas-grekas · commit 8f591c315a22 · 2021-12-15T12:09:15.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Validator] Allow Sequence constraint to be applied onto class as an attribute | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #44531 | License | MIT | Doc PR | N/A This PR allows to apply `Sequentially` constraint as an attribute onto class target. Looks like it was missed on translating annotations to attributes. ![image](https://user-images.githubusercontent.com/1302230/144623891-98bde6b2-2376-4ac0-93fc-58b43a0b0f94.png) ![image](https://user-images.githubusercontent.com/1302230/144623958-7d5fe384-771a-4711-8c28-0e9bddfc4c41.png) Commits ------- 8c1e746 [Validator] Allow Sequence constraint to be applied onto class as an attribute
diff --git a/src/Symfony/Component/Validator/Constraints/Sequentially.php b/src/Symfony/Component/Validator/Constraints/Sequentially.php
@@ -20,7 +20,7 @@
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Sequentially extends Composite
 {
     public $constraints = [];
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Annotation/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Annotation/Entity.php
@@ -19,6 +19,9 @@
  * @Symfony\Component\Validator\Tests\Fixtures\ConstraintA
  * @Assert\GroupSequence({"Foo", "Entity"})
  * @Assert\Callback({"Symfony\Component\Validator\Tests\Fixtures\CallbackClass", "callback"})
+ * @Assert\Sequentially({
+ *     @Assert\Expression("this.getFirstName() != null")
+ * })
  */
 class Entity extends EntityParent implements EntityInterfaceB
 {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Attribute/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Attribute/Entity.php
@@ -22,6 +22,11 @@
     Assert\GroupSequence(['Foo', 'Entity']),
     Assert\Callback([CallbackClass::class, 'callback']),
 ]
+/**
+ * @Assert\Sequentially({
+ *     @Assert\Expression("this.getFirstName() != null")
+ * })
+ */
 class Entity extends EntityParent implements EntityInterfaceB
 {
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php
@@ -22,6 +22,9 @@
     ConstraintA,
     Assert\GroupSequence(['Foo', 'Entity']),
     Assert\Callback([CallbackClass::class, 'callback']),
+    Assert\Sequentially([
+        new Assert\Expression('this.getFirstName() != null')
+    ])
 ]
 class Entity extends EntityParent implements EntityInterfaceB
 {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\Constraints\Expression;
 use Symfony\Component\Validator\Constraints\IsTrue;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\NotNull;
@@ -65,6 +66,9 @@ public function testLoadClassMetadata(string $namespace)
         $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
+        $expected->addConstraint(new Sequentially([
+            new Expression('this.getFirstName() != null'),
+        ]));
         $expected->addConstraint(new Callback(['callback' => 'validateMe', 'payload' => 'foo']));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());
@@ -151,6 +155,9 @@ public function testLoadClassMetadataAndMerge(string $namespace)
         $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
+        $expected->addConstraint(new Sequentially([
+            new Expression('this.getFirstName() != null'),
+        ]));
         $expected->addConstraint(new Callback(['callback' => 'validateMe', 'payload' => 'foo']));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>`
`22`	`22`	`*/`
`23`		`-#[\Attribute(\Attribute::TARGET_PROPERTY \| \Attribute::TARGET_METHOD \| \Attribute::IS_REPEATABLE)]`
	`23`	`+#[\Attribute(\Attribute::TARGET_CLASS \| \Attribute::TARGET_PROPERTY \| \Attribute::TARGET_METHOD \| \Attribute::IS_REPEATABLE)]`
`24`	`24`	`class Sequentially extends Composite`
`25`	`25`	`{`
`26`	`26`	`public $constraints = [];`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@`
`22`	`22`	`Assert\GroupSequence(['Foo', 'Entity']),`
`23`	`23`	`Assert\Callback([CallbackClass::class, 'callback']),`
`24`	`24`	`]`
	`25`	`+/**`
	`26`	`+ * @Assert\Sequentially({`
	`27`	`+ * @Assert\Expression("this.getFirstName() != null")`
	`28`	`+ * })`
	`29`	`+ */`
`25`	`30`	`class Entity extends EntityParent implements EntityInterfaceB`
`26`	`31`	`{`
`27`	`32`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`ConstraintA,`
`23`	`23`	`Assert\GroupSequence(['Foo', 'Entity']),`
`24`	`24`	`Assert\Callback([CallbackClass::class, 'callback']),`
	`25`	`+ Assert\Sequentially([`
	`26`	`+ new Assert\Expression('this.getFirstName() != null')`
	`27`	`+ ])`
`25`	`28`	`]`
`26`	`29`	`class Entity extends EntityParent implements EntityInterfaceB`
`27`	`30`	`{`