fix moving option metadata

TomasVotruba · TomasVotruba · commit b73e4adbe884 · 2025-09-10T11:59:05.000+02:00
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/name_with_hyphen.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/name_with_hyphen.php.inc
@@ -44,7 +44,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 class NameWithHyphen
 {
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument-with-hyphen', description: 'Argument description')]
-    ?string $argument_with_hyphen, #[\Symfony\Component\Console\Attribute\Option]
+    ?string $argument_with_hyphen, #[\Symfony\Component\Console\Attribute\Option(name: 'option-with-hyphen')]
     $option_with_hyphen): int
     {
         $argument = $argument_with_hyphen;
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command.php.inc
@@ -46,7 +46,7 @@ use Symfony\Component\Console\Input\InputOption;
 final class SomeCommand
 {
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option]
+    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
     $option): int
     {
         $someArgument = $argument;
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_method_chaining.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_method_chaining.php.inc
@@ -47,7 +47,7 @@ use Symfony\Component\Console\Input\InputOption;
 final class SomeCommandWithMethodChaining
 {
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option]
+    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
     $option): int
     {
         $someArgument = $argument;
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_set_help.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_set_help.php.inc
@@ -52,7 +52,7 @@ final class SomeCommandWithSetHelp
     }
 
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option]
+    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
     $option): int
     {
         $someArgument = $argument;
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_fluent.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_fluent.php.inc
@@ -56,9 +56,9 @@ final class WithMultipleArgumentsOptionsFluent
         string $argument1,
         #[\Symfony\Component\Console\Attribute\Argument(name: 'argument2', description: 'Argument2 description')]
         string $argument2,
-        #[\Symfony\Component\Console\Attribute\Option]
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option1', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option1 description')]
         $option1,
-        #[\Symfony\Component\Console\Attribute\Option]
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option2', shortcut: 'p', mode: InputOption::VALUE_NONE, description: 'Option2 description')]
         $option2
     ): int
     {
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_no_fluent.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_no_fluent.php.inc
@@ -61,9 +61,9 @@ final class WithMultipleArgumentsOptionsNotFluent
         string $argument1,
         #[\Symfony\Component\Console\Attribute\Argument(name: 'argument2', description: 'Argument2 description')]
         string $argument2,
-        #[\Symfony\Component\Console\Attribute\Option]
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option1', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option1 description')]
         $option1,
-        #[\Symfony\Component\Console\Attribute\Option]
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option2', shortcut: 'p', mode: InputOption::VALUE_NONE, description: 'Option2 description')]
         $option2
     ): int
     {
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_optional_argument.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_optional_argument.php.inc
@@ -46,7 +46,7 @@ use Symfony\Component\Console\Input\InputOption;
 final class WithOptionalArgument
 {
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    ?string $argument, #[\Symfony\Component\Console\Attribute\Option]
+    ?string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
     $option): int
     {
         $someArgument = $argument;
diff --git a/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_override.php.inc b/rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_override.php.inc
@@ -50,7 +50,7 @@ final class WithOverride
     public function __invoke(
         #[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
         string $argument,
-        #[\Symfony\Component\Console\Attribute\Option]
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
         $option
     ): int
     {
diff --git a/rules/Symfony73/NodeAnalyzer/CommandOptionsResolver.php b/rules/Symfony73/NodeAnalyzer/CommandOptionsResolver.php
@@ -24,7 +24,8 @@ public function resolve(ClassMethod $configureClassMethod): array
     {
         $addOptionMethodCalls = $this->methodCallFinder->find($configureClassMethod, 'addOption');
 
-        $commandOptionMetadatas = [];
+        $commandOptions = [];
+
         foreach ($addOptionMethodCalls as $addOptionMethodCall) {
             $addOptionArgs = $addOptionMethodCall->getArgs();
 
@@ -34,9 +35,13 @@ public function resolve(ClassMethod $configureClassMethod): array
                 throw new ShouldNotHappenException('Option name is required');
             }
 
-            $commandOptionMetadatas[] = new CommandOption($nameArgValue);
+            $shortcutExpr = $addOptionArgs[1]?->value ?? null;
+            $modeExpr = $addOptionArgs[2]?->value ?? null;
+            $descriptionExpr = $addOptionArgs[3]?->value ?? null;
+
+            $commandOptions[] = new CommandOption($nameArgValue, $shortcutExpr, $modeExpr, $descriptionExpr);
         }
 
-        return $commandOptionMetadatas;
+        return $commandOptions;
     }
 }
diff --git a/rules/Symfony73/NodeFactory/CommandInvokeParamsFactory.php b/rules/Symfony73/NodeFactory/CommandInvokeParamsFactory.php
@@ -7,6 +7,7 @@
 use PhpParser\Node\Arg;
 use PhpParser\Node\Attribute;
 use PhpParser\Node\AttributeGroup;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
@@ -93,6 +94,18 @@ private function createOptionParams(array $commandOptions): array
 
             $optionArgs = [new Arg(value: $commandOption->getName(), name: new Identifier('name'))];
 
+            if ($commandOption->getShortcut() instanceof Expr) {
+                $optionArgs[] = new Arg(value: $commandOption->getShortcut(), name: new Identifier('shortcut'));
+            }
+
+            if ($commandOption->getMode() instanceof Expr) {
+                $optionArgs[] = new Arg(value: $commandOption->getMode(), name: new Identifier('mode'));
+            }
+
+            if ($commandOption->getDescription() instanceof Expr) {
+                $optionArgs[] = new Arg(value: $commandOption->getDescription(), name: new Identifier('description'));
+            }
+
             $optionParam->attrGroups[] = new AttributeGroup([
                 new Attribute(new FullyQualified(SymfonyAttribute::COMMAND_OPTION), $optionArgs),
             ]);
diff --git a/rules/Symfony73/ValueObject/CommandOption.php b/rules/Symfony73/ValueObject/CommandOption.php
@@ -12,6 +12,9 @@
 {
     public function __construct(
         private Expr $name,
+        private ?Expr $shortcut,
+        private ?Expr $mode,
+        private ?Expr $description,
     ) {
     }
 
@@ -20,6 +23,21 @@ public function getName(): Expr
         return $this->name;
     }
 
+    public function getShortcut(): ?Expr
+    {
+        return $this->shortcut;
+    }
+
+    public function getMode(): ?Expr
+    {
+        return $this->mode;
+    }
+
+    public function getDescription(): ?Expr
+    {
+        return $this->description;
+    }
+
     public function getStringName(): string
     {
         if ($this->name instanceof String_) {
diff --git a/tests/Set/Symfony73/Fixture/command_remove_config.php.inc b/tests/Set/Symfony73/Fixture/command_remove_config.php.inc
@@ -57,7 +57,7 @@ TXT)]
 final class SomeCommand
 {
     public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', description: 'Option description', mode: \Symfony\Component\Console\Input\InputOption::VALUE_NONE)]
+    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
     $option): int
     {
         $someArgument = $argument;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ use Symfony\Component\Console\Output\OutputInterface;`
`44`	`44`	`class NameWithHyphen`
`45`	`45`	`{`
`46`	`46`	`public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument-with-hyphen', description: 'Argument description')]`
`47`		`- ?string $argument_with_hyphen, #[\Symfony\Component\Console\Attribute\Option]`
	`47`	`+ ?string $argument_with_hyphen, #[\Symfony\Component\Console\Attribute\Option(name: 'option-with-hyphen')]`
`48`	`48`	`$option_with_hyphen): int`
`49`	`49`	`{`
`50`	`50`	`$argument = $argument_with_hyphen;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ use Symfony\Component\Console\Input\InputOption;`
`46`	`46`	`final class SomeCommand`
`47`	`47`	`{`
`48`	`48`	`public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]`
`49`		`- string $argument, #[\Symfony\Component\Console\Attribute\Option]`
	`49`	`+ string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]`
`50`	`50`	`$option): int`
`51`	`51`	`{`
`52`	`52`	`$someArgument = $argument;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ use Symfony\Component\Console\Input\InputOption;`
`47`	`47`	`final class SomeCommandWithMethodChaining`
`48`	`48`	`{`
`49`	`49`	`public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]`
`50`		`- string $argument, #[\Symfony\Component\Console\Attribute\Option]`
	`50`	`+ string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]`
`51`	`51`	`$option): int`
`52`	`52`	`{`
`53`	`53`	`$someArgument = $argument;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final class SomeCommandWithSetHelp`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]`
`55`		`- string $argument, #[\Symfony\Component\Console\Attribute\Option]`
	`55`	`+ string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]`
`56`	`56`	`$option): int`
`57`	`57`	`{`
`58`	`58`	`$someArgument = $argument;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ final class WithOverride`
`50`	`50`	`public function __invoke(`
`51`	`51`	`#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]`
`52`	`52`	`string $argument,`
`53`		`- #[\Symfony\Component\Console\Attribute\Option]`
	`53`	`+ #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]`
`54`	`54`	`$option`
`55`	`55`	`): int`
`56`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ public function resolve(ClassMethod $configureClassMethod): array`
`24`	`24`	`{`
`25`	`25`	`$addOptionMethodCalls = $this->methodCallFinder->find($configureClassMethod, 'addOption');`
`26`	`26`
`27`		`- $commandOptionMetadatas = [];`
	`27`	`+ $commandOptions = [];`
	`28`	`+`
`28`	`29`	`foreach ($addOptionMethodCalls as $addOptionMethodCall) {`
`29`	`30`	`$addOptionArgs = $addOptionMethodCall->getArgs();`
`30`	`31`
`@@ -34,9 +35,13 @@ public function resolve(ClassMethod $configureClassMethod): array`
`34`	`35`	`throw new ShouldNotHappenException('Option name is required');`
`35`	`36`	`}`
`36`	`37`
`37`		`- $commandOptionMetadatas[] = new CommandOption($nameArgValue);`
	`38`	`+ $shortcutExpr = $addOptionArgs[1]?->value ?? null;`
	`39`	`+ $modeExpr = $addOptionArgs[2]?->value ?? null;`
	`40`	`+ $descriptionExpr = $addOptionArgs[3]?->value ?? null;`
	`41`	`+`
	`42`	`+ $commandOptions[] = new CommandOption($nameArgValue, $shortcutExpr, $modeExpr, $descriptionExpr);`
`38`	`43`	`}`
`39`	`44`
`40`		`- return $commandOptionMetadatas;`
	`45`	`+ return $commandOptions;`
`41`	`46`	`}`
`42`	`47`	`}`