Setup test for order of optional parameters in InvokableCommandInputAttributeRector

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/DefaultValue/match_scalar_type.php.inc

@@ -46,14 +46,14 @@ use Symfony\Component\Console\Output\OutputInterface;
 class MatchScalarType
 {
     public function __invoke(
-        #[\Symfony\Component\Console\Attribute\Argument(name: 'first')]
-        ?int $first = 100,
         #[\Symfony\Component\Console\Attribute\Argument(name: 'second')]
         float $second = 200.5,
-        #[\Symfony\Component\Console\Attribute\Option(name: 'third')]
-        int $third = 200,
         #[\Symfony\Component\Console\Attribute\Option(name: 'fourth')]
-        float $fourth = 400.5
+        float $fourth = 400.5,
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'first')]
+        ?int $first = 100,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'third')]
+        int $third = 200
     ): int
     {
     }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/DefaultValue/option_with_array_type.php.inc

@@ -42,9 +42,12 @@ use Symfony\Component\Console\Output\OutputInterface;
 )]
 class OptionWithOptionalValue
 {
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Option(name: 'some-array', mode: InputOption::VALUE_IS_ARRAY)]
-    array $someArray = ['third value'], #[\Symfony\Component\Console\Attribute\Option(name: 'no-default-array', mode: InputOption::VALUE_IS_ARRAY)]
-    array $noDefaultArray): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Option(name: 'no-default-array', mode: InputOption::VALUE_IS_ARRAY)]
+        array $noDefaultArray,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'some-array', mode: InputOption::VALUE_IS_ARRAY)]
+        array $someArray = ['third value']
+    ): int
     {
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/command_with_io.php.inc

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 #[AsCommand('app:my-command')]
 final class MyCommand
 {
-    public function __invoke(\Symfony\Component\Console\Style\SymfonyStyle $io): int
+    public function __invoke(OutputInterface $output, \Symfony\Component\Console\Style\SymfonyStyle $io): int
     {
         $io->info('Great success!');
         return 1;

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/name_from_constant.php.inc

@@ -51,14 +51,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 class NameFromConstant
 {
     private const string ARGUMENT_NAME = 'name';
-
     public function __invoke(
         #[\Symfony\Component\Console\Attribute\Argument(name: self::ARGUMENT_NAME, description: 'The name of the person to greet.')]
         ?string $name,
         OutputInterface $output
     ): int
     {
-        $name = $name;
+        $name = $input->getArgument(self::ARGUMENT_NAME);
         $output->writeln("Hello {$name}!");
         return Command::SUCCESS;
     }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/name_with_hyphen.php.inc

@@ -43,12 +43,15 @@ use Symfony\Component\Console\Output\OutputInterface;
 )]
 class NameWithHyphen
 {
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument-with-hyphen', description: 'Argument description')]
-    ?string $argumentWithHyphen, #[\Symfony\Component\Console\Attribute\Option(name: 'option-with-hyphen')]
-    $optionWithHyphen): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'argument-with-hyphen', description: 'Argument description')]
+        ?string $argumentWithHyphen,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option-with-hyphen')]
+        $optionWithHyphen
+    ): int
     {
-        $argument = $argument_with_hyphen;
-        $option = $option_with_hyphen;
+        $argument = $input->getArgument('argument-with-hyphen');
+        $option = $input->getOption('option-with-hyphen');
         return Command::SUCCESS;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/option_name_constant.php.inc

@@ -53,17 +53,16 @@ final class OptionNameConstant
     private const ARGUMENT_NAME = 'some-argument';
 
     private const OPTION_NAME = 'some-option';
-
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: self::ARGUMENT_NAME)]
-    ?string $someArgument, #[\Symfony\Component\Console\Attribute\Option(name: self::OPTION_NAME)]
-    $someOption): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: self::ARGUMENT_NAME)]
+        ?string $someArgument,
+        #[\Symfony\Component\Console\Attribute\Option(name: self::OPTION_NAME)]
+        $someOption
+    ): int
     {
-        $someArgument = $some_argument;
-
-        $someOption = $some_option;
-
+        $someArgument = $input->getArgument(self::ARGUMENT_NAME);
+        $someOption = $input->getOption(self::OPTION_NAME);
         // ...
-
         return 1;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command.php.inc

@@ -45,15 +45,16 @@ use Symfony\Component\Console\Input\InputOption;
 #[AsCommand(name: 'some_name')]
 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', mode: InputOption::VALUE_NONE, description: 'Option description')]
-    bool $option = false): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
+        string $argument,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
+        bool $option = false
+    ): int
     {
-        $someArgument = $argument;
-        $someOption = $option;
-
+        $someArgument = $input->getArgument('argument');
+        $someOption = $input->getOption('option');
         // ...
-
         return 1;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_method_chaining.php.inc

@@ -46,15 +46,16 @@ use Symfony\Component\Console\Input\InputOption;
 #[AsCommand(name: 'some_name')]
 final class SomeCommandWithMethodChaining
 {
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
-    bool $option = false): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
+        string $argument,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
+        bool $option = false
+    ): int
     {
-        $someArgument = $argument;
-        $someOption = $option;
-
+        $someArgument = $input->getArgument('argument');
+        $someOption = $input->getOption('option');
         // ...
-
         return 1;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/some_command_with_set_help.php.inc

@@ -51,15 +51,16 @@ final class SomeCommandWithSetHelp
         $this->setHelp('argument');
     }
 
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
-    bool $option = false): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
+        string $argument,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
+        bool $option = false
+    ): int
     {
         $someArgument = $argument;
         $someOption = $option;
-
         // ...
-
         return 1;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_default_and_without_default_value.php.inc

@@ -0,0 +1,66 @@
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+#[AsCommand(name: 'some_name')]
+final class WithDefaultAndWithoutDefaultValue extends Command
+{
+    protected function configure()
+    {
+        $this->addOption('option', 'o', InputOption::VALUE_NONE, 'Option description', false);
+        $this->addOption('another', 'a', InputOption::VALUE_REQUIRED, 'No default value');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $someOption = $input->getOption('option');
+        $another = $input->getOption('another');
+        $output->writeln('Using output too');
+
+        // ...
+
+        return 1;
+    }
+}
+
+?>
+    -----
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+#[AsCommand(name: 'some_name')]
+final class WithDefaultAndWithoutDefaultValue
+{
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Option(name: 'another', shortcut: 'a', mode: InputOption::VALUE_REQUIRED, description: 'No default value')]
+        $another,
+        OutputInterface $output,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
+        bool $option = false
+    ): int
+    {
+        $someOption = $input->getOption('option');
+        $another = $input->getOption('another');
+        $output->writeln('Using output too');
+        // ...
+        return 1;
+    }
+}
+
+?>
+

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_fluent.php.inc

@@ -62,10 +62,10 @@ final class WithMultipleArgumentsOptionsFluent
         bool $option2 = false
     ): int
     {
-        $arg1 = $argument1;
-        $arg2 = $argument2;
-        $opt1 = $option1;
-        $opt2 = $option2;
+        $arg1 = $input->getArgument('argument1');
+        $arg2 = $input->getArgument('argument2');
+        $opt1 = $input->getOption('option1');
+        $opt2 = $input->getOption('option2');
         // ...
         return 1;
     }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_multiple_arguments_options_no_fluent.php.inc

@@ -67,10 +67,10 @@ final class WithMultipleArgumentsOptionsNotFluent
         bool $option2 = false
     ): int
     {
-        $arg1 = $argument1;
-        $arg2 = $argument2;
-        $opt1 = $option1;
-        $opt2 = $option2;
+        $arg1 = $input->getArgument('argument1');
+        $arg2 = $input->getArgument('argument2');
+        $opt1 = $input->getOption('option1');
+        $opt2 = $input->getOption('option2');
         // ...
         return 1;
     }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_optional_argument.php.inc

@@ -45,15 +45,16 @@ use Symfony\Component\Console\Input\InputOption;
 #[AsCommand(name: 'some_name')]
 final class WithOptionalArgument
 {
-    public function __invoke(#[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
-    ?string $argument, #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
-    bool $option = false): int
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'argument', description: 'Argument description')]
+        ?string $argument,
+        #[\Symfony\Component\Console\Attribute\Option(name: 'option', shortcut: 'o', mode: InputOption::VALUE_NONE, description: 'Option description')]
+        bool $option = false
+    ): int
     {
-        $someArgument = $argument;
-        $someOption = $option;
-
+        $someArgument = $input->getArgument('argument');
+        $someOption = $input->getOption('option');
         // ...
-
         return 1;
     }
 }

rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/with_override.php.inc

@@ -54,8 +54,8 @@ final class WithOverride
         bool $option = false
     ): int
     {
-        $someArgument = $argument;
-        $someOption = $option;
+        $someArgument = $input->getArgument('argument');
+        $someOption = $input->getOption('option');
         // ...
         return 1;
     }

rules/CodeQuality/NodeAnalyzer/ParamConverterClassesResolver.php

@@ -10,7 +10,7 @@
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Symfony\Enum\SensioAttribute;
 
-final class ParamConverterClassesResolver
+final readonly class ParamConverterClassesResolver
 {
     public function __construct(
         private AttributeFinder $attributeFinder,

rules/CodeQuality/Rector/Class_/ControllerMethodInjectionToConstructorRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Symfony\CodeQuality\Rector\Class_;
 
+use Exception;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -26,6 +27,7 @@
 use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Throwable;
 
 /**
  * @see \Rector\Symfony\Tests\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector\ControllerMethodInjectionToConstructorRectorTest
@@ -154,8 +156,8 @@ public function refactor(Node $node): ?Node
                         SymfonyClass::REQUEST,
                         FosClass::PARAM_FETCHER,
                         SymfonyClass::UUID,
-                        \Throwable::class,
-                        \Exception::class,
+                        Throwable::class,
+                        Exception::class,
                         ...$entityClasses,
                     ]
                 )) {