bug #57405 [DoctrineBridge] fix handling of special "value" constraint option (xabbuh)

fabpot · fabpot · commit 7abc1068fce1 · 2024-06-15T10:11:28.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [DoctrineBridge] fix handling of special "value" constraint option | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57396 | License | MIT Commits ------- c2f71af fix handling of special "value" constraint option
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityTest.php
@@ -60,6 +60,13 @@ public function testAttributeWithGroupsAndPaylod()
         self::assertSame('some attached data', $constraint->payload);
         self::assertSame(['some_group'], $constraint->groups);
     }
+
+    public function testValueOptionConfiguresFields()
+    {
+        $constraint = new UniqueEntity(['value' => 'email']);
+
+        $this->assertSame('email', $constraint->fields);
+    }
 }
 
 #[UniqueEntity(['email'], message: 'myMessage')]
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -60,7 +60,7 @@ public function __construct(
         $payload = null,
         array $options = [],
     ) {
-        if (\is_array($fields) && \is_string(key($fields)) && [] === array_diff(array_keys($fields), array_keys(get_class_vars(static::class)))) {
+        if (\is_array($fields) && \is_string(key($fields)) && [] === array_diff(array_keys($fields), array_merge(array_keys(get_class_vars(static::class)), ['value']))) {
             $options = array_merge($fields, $options);
         } else {
             $options['fields'] = $fields;

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,13 @@ public function testAttributeWithGroupsAndPaylod()`
`60`	`60`	`self::assertSame('some attached data', $constraint->payload);`
`61`	`61`	`self::assertSame(['some_group'], $constraint->groups);`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ public function testValueOptionConfiguresFields()`
	`65`	`+ {`
	`66`	`+ $constraint = new UniqueEntity(['value' => 'email']);`
	`67`	`+`
	`68`	`+ $this->assertSame('email', $constraint->fields);`
	`69`	`+ }`
`63`	`70`	`}`
`64`	`71`
`65`	`72`	`#[UniqueEntity(['email'], message: 'myMessage')]`