[Validator] [WIP] remove support for generic constraint option handling #61063
+193
−3,309
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b8ba9e7 to
0c03730
Compare
stof
reviewed
Jul 8, 2025
| @@ -32,26 +32,9 @@ class Callback extends Constraint | |||
| * @param string[]|null $groups | |||
| */ | |||
| #[HasNamedArguments] | |||
| public function __construct(array|string|callable|null $callback = null, ?array $groups = null, mixed $payload = null, ?array $options = null) | |||
| public function __construct(array|string|callable|null $callback = null, ?array $groups = null, mixed $payload = null) | |||
There was a problem hiding this comment.
array and null should be removed from the type (and the default value as well)
| } | ||
|
|
||
| parent::__construct($options, $groups, $payload); | ||
| parent::__construct(null, $groups, $payload); | ||
|
|
||
| $this->callback = $callback ?? $this->callback; |
There was a problem hiding this comment.
should be simplified as $this->callback = $callback instead, as it won't be assigned by the parent constructor anymore
| @@ -53,21 +53,9 @@ class CardScheme extends Constraint | |||
| * @param array<string,mixed>|null $options | |||
| @@ -53,21 +53,9 @@ class CardScheme extends Constraint | |||
| * @param array<string,mixed>|null $options | |||
| */ | |||
| #[HasNamedArguments] | |||
| public function __construct(array|string|null $schemes, ?string $message = null, ?array $groups = null, mixed $payload = null, ?array $options = null) | |||
| public function __construct(array|string|null $schemes, ?string $message = null, ?array $groups = null, mixed $payload = null) | |||
There was a problem hiding this comment.
array<string,mixed> should be removed from the phpdoc type of $schemes, as that's the part referring to passing options as a positional argument.
There was a problem hiding this comment.
same in most classes (with the appropriate name for the first argument of course)
| @@ -32,7 +32,7 @@ public function __construct(mixed $options = null, ?array $groups = null, mixed | |||
| throw new ConstraintDefinitionException(\sprintf('You can\'t redefine the "%s" option. Use the "%s::getConstraints()" method instead.', $this->getCompositeOption(), __CLASS__)); | |||
| } | |||
|
|
|||
| $this->constraints = $this->getConstraints($this->normalizeOptions($options)); | |||
| $this->constraints = $this->getConstraints($options ?? []); | |||
There was a problem hiding this comment.
We probably need to deprecate using options in this Compound abstract class first, to be able to remove support properly.
| public function getDefaultOption(): ?string | ||
| { | ||
| return 'constraints'; | ||
| parent::__construct(null, $groups, $payload); | ||
| } | ||
|
|
||
| protected function getCompositeOption(): string |
There was a problem hiding this comment.
this method should also be removed, as it does not make sense anymore once the parent does not handle an array of options anymore.
| } | ||
|
|
||
| parent::__construct($options, $groups, $payload); | ||
| parent::__construct(null, $groups, $payload); | ||
|
|
||
| $this->minScore = $minScore ?? $this->minScore; |
There was a problem hiding this comment.
Suggested change
| $this->minScore = $minScore ?? $this->minScore; | |
| $this->minScore = $minScore; |
5428b30 to
e934b07
Compare
924d748 to
7d0f7f6
Compare
7d0f7f6 to
f4c40e1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
opening the PR already even if some polishing needs to be done (and not all tests pass yet) to avoid someone else wasting their time on this topic