flip excluded properties with keys with Doctrine-style constraint config

xabbuh · xabbuh · commit 5815a823fca2 · 2025-06-12T23:44:12.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/Cascade.php b/src/Symfony/Component/Validator/Constraints/Cascade.php
@@ -29,6 +29,10 @@ public function __construct(array|string|null $exclude = null, ?array $options =
     {
         if (\is_array($exclude) && !array_is_list($exclude)) {
             $options = array_merge($exclude, $options ?? []);
+
+            if (isset($options['exclude'])) {
+                $options['exclude'] = array_flip((array) $options['exclude']);
+            }
         } else {
             $this->exclude = array_flip((array) $exclude);
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CascadeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CascadeTest.php
@@ -27,6 +27,20 @@ public function testCascadeAttribute()
         self::assertTrue($loader->loadClassMetadata($metadata));
         self::assertSame(CascadingStrategy::CASCADE, $metadata->getCascadingStrategy());
     }
+
+    public function testExcludeProperties()
+    {
+        $constraint = new Cascade(['foo', 'bar']);
+
+        self::assertSame(['foo' => 0, 'bar' => 1], $constraint->exclude);
+    }
+
+    public function testExcludePropertiesDoctrineStyle()
+    {
+        $constraint = new Cascade(['exclude' => ['foo', 'bar']]);
+
+        self::assertSame(['foo' => 0, 'bar' => 1], $constraint->exclude);
+    }
 }
 
 #[Cascade]

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ public function __construct(array\|string\|null $exclude = null, ?array $options =`
`29`	`29`	`{`
`30`	`30`	`if (\is_array($exclude) && !array_is_list($exclude)) {`
`31`	`31`	`$options = array_merge($exclude, $options ?? []);`
	`32`	`+`
	`33`	`+ if (isset($options['exclude'])) {`
	`34`	`+ $options['exclude'] = array_flip((array) $options['exclude']);`
	`35`	`+ }`
`32`	`36`	`} else {`
`33`	`37`	`$this->exclude = array_flip((array) $exclude);`
`34`	`38`	`}`