bug #52194 [Validator] Handle null case (OskarStark)

fabpot · fabpot · commit e2336db36a07 · 2023-10-20T13:57:24.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [Validator] Handle `null` case | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | -- | License | MIT Commits ------- 3c6c130 [Validator] Handle `null` case
diff --git a/src/Symfony/Component/Validator/Constraints/Cascade.php b/src/Symfony/Component/Validator/Constraints/Cascade.php
@@ -28,7 +28,7 @@ class Cascade extends Constraint
     public function __construct(array|string|null $exclude = null, array $options = null)
     {
         if (\is_array($exclude) && !array_is_list($exclude)) {
-            $options = array_merge($exclude, $options);
+            $options = array_merge($exclude, $options ?? []);
         } else {
             $this->exclude = array_flip((array) $exclude);
         }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Cascade extends Constraint`
`28`	`28`	`public function __construct(array\|string\|null $exclude = null, array $options = null)`
`29`	`29`	`{`
`30`	`30`	`if (\is_array($exclude) && !array_is_list($exclude)) {`
`31`		`- $options = array_merge($exclude, $options);`
	`31`	`+ $options = array_merge($exclude, $options ?? []);`
`32`	`32`	`} else {`
`33`	`33`	`$this->exclude = array_flip((array) $exclude);`
`34`	`34`	`}`