diff --git a/rules-tests/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector/Fixture/with_allow_extra_fields_false.php.inc b/rules-tests/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector/Fixture/with_allow_extra_fields_false.php.inc new file mode 100644 index 00000000..acff6fa6 --- /dev/null +++ b/rules-tests/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector/Fixture/with_allow_extra_fields_false.php.inc @@ -0,0 +1,41 @@ + [new Assert\NotBlank(), new Assert\Type('string')], + 'example2' => [new Assert\Type('string')], + 'example3' => [new Assert\NotBlank(), new Assert\Type('string')], + 'example4' => [new Assert\NotBlank(), new Assert\Type('string')], + ], allowExtraFields: false); + } +} + +?> +----- + [new Assert\NotBlank(), new Assert\Type('string')], + 'example2' => [new Assert\Type('string')], + 'example3' => [new Assert\NotBlank(), new Assert\Type('string')], + 'example4' => [new Assert\NotBlank(), new Assert\Type('string')], + ]); + } +} + +?> diff --git a/rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php b/rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php index 8e58dc5b..9becf04e 100644 --- a/rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php +++ b/rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php @@ -96,15 +96,30 @@ public function refactor(Node $node): ?Node } $args = $node->getArgs(); - if ($className === SymfonyClass::SYMFONY_VALIDATOR_CONSTRAINTS_COLLECTION - && count($args) === 1 - && $args[0]->value instanceof Array_) { - + if ($className === SymfonyClass::SYMFONY_VALIDATOR_CONSTRAINTS_COLLECTION && $args[0]->value instanceof Array_) { if ($args[0]->name instanceof Identifier) { return null; } $args[0]->name = new Identifier('fields'); + + foreach ($args as $key => $arg) { + if (! $arg->name instanceof Identifier) { + continue; + } + + if ($arg->name->toString() !== 'allowExtraFields') { + continue; + } + + if (! $this->valueResolver->isFalse($arg->value)) { + continue; + } + + unset($args[$key]); + } + + $node->args = array_values($args); return $node; }