[console] [7.3] Add type declaration based on default value type in InvokableCommandInputAttributeRector

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

@@ -47,7 +47,7 @@ class ArgumentWithDefaultValue
         #[\Symfony\Component\Console\Attribute\Argument(name: 'second')]
         string $second = 'required value',
         #[\Symfony\Component\Console\Attribute\Option(name: 'third')]
-        $third = 'third value'
+        string $third = 'third value'
     ): int
     {
     }

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

@@ -0,0 +1,62 @@
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+class MatchScalarType extends Command
+{
+    protected function configure(): void
+    {
+        $this->addArgument('first', InputArgument::OPTIONAL, null, 100);
+        $this->addArgument('second', InputArgument::REQUIRED, null, 200.5);
+
+        $this->addOption('third', '', null, null, 200);
+        $this->addOption('fourth', '', null, null, 400.5);
+    }
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+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
+    ): int
+    {
+    }
+}
+
+?>

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

@@ -0,0 +1,52 @@
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+class OptionWithOptionalValue extends Command
+{
+    protected function configure(): void
+    {
+        $this->addOption('some-array', null, InputOption::VALUE_IS_ARRAY, '', ['third value']);
+        $this->addOption('no-default-array', null, InputOption::VALUE_IS_ARRAY);
+    }
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+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
+    {
+    }
+}
+
+?>

rules/Symfony73/NodeAnalyzer/CommandArgumentsResolver.php

@@ -4,8 +4,11 @@
 
 namespace Rector\Symfony\Symfony73\NodeAnalyzer;
 
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Type\Type;
+use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Symfony\Symfony73\NodeFinder\MethodCallFinder;
 use Rector\Symfony\Symfony73\ValueObject\CommandArgument;
@@ -14,7 +17,8 @@
 {
     public function __construct(
         private MethodCallFinder $methodCallFinder,
-        private ValueResolver $valueResolver
+        private ValueResolver $valueResolver,
+        private NodeTypeResolver $nodeTypeResolver
     ) {
     }
 
@@ -31,25 +35,47 @@ public function resolve(ClassMethod $configureClassMethod): array
 
             $argumentName = $this->valueResolver->getValue($addArgumentArgs[0]->value);
 
-            $modeExpr = $addArgumentArgs[1]->value ?? null;
-
-            $isArray = false;
-            if ($modeExpr instanceof Expr) {
-                $modeValue = $this->valueResolver->getValue($modeExpr);
-                // binary check for InputArgument::IS_ARRAY
-                $isArray = (bool) ($modeValue & 4);
-            }
+            $isArray = $this->isArrayMode($addArgumentArgs);
 
             $commandArguments[] = new CommandArgument(
                 $argumentName,
                 $addArgumentArgs[0]->value,
                 $addArgumentArgs[1]->value ?? null,
                 $addArgumentArgs[2]->value ?? null,
                 $addArgumentArgs[3]->value ?? null,
-                $isArray
+                $isArray,
+                $this->resolveDefaultType($addArgumentArgs)
             );
         }
 
         return $commandArguments;
     }
+
+    /**
+     * @param Arg[] $args
+     */
+    private function resolveDefaultType(array $args): ?Type
+    {
+        $defaultArg = $args[3] ?? null;
+        if (! $defaultArg instanceof Arg) {
+            return null;
+        }
+
+        return $this->nodeTypeResolver->getType($defaultArg->value);
+    }
+
+    /**
+     * @param Arg[] $args
+     */
+    private function isArrayMode(array $args): bool
+    {
+        $modeExpr = $args[1]->value ?? null;
+        if (! $modeExpr instanceof Expr) {
+            return false;
+        }
+
+        $modeValue = $this->valueResolver->getValue($modeExpr);
+        // binary check for InputArgument::IS_ARRAY
+        return (bool) ($modeValue & 4);
+    }
 }

rules/Symfony73/NodeAnalyzer/CommandOptionsResolver.php

@@ -4,7 +4,11 @@
 
 namespace Rector\Symfony\Symfony73\NodeAnalyzer;
 
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Type\Type;
+use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Symfony\Symfony73\NodeFinder\MethodCallFinder;
 use Rector\Symfony\Symfony73\ValueObject\CommandOption;
@@ -13,7 +17,8 @@
 {
     public function __construct(
         private MethodCallFinder $methodCallFinder,
-        private ValueResolver $valueResolver
+        private ValueResolver $valueResolver,
+        private NodeTypeResolver $nodeTypeResolver
     ) {
     }
 
@@ -37,10 +42,40 @@ public function resolve(ClassMethod $configureClassMethod): array
                 $addOptionArgs[1]->value ?? null,
                 $addOptionArgs[2]->value ?? null,
                 $addOptionArgs[3]->value ?? null,
-                $addOptionArgs[4]->value ?? null
+                $addOptionArgs[4]->value ?? null,
+                $this->isArrayMode($addOptionArgs),
+                $this->resolveDefaultType($addOptionArgs)
             );
         }
 
         return $commandOptions;
     }
+
+    /**
+     * @param Arg[] $args
+     */
+    private function resolveDefaultType(array $args): ?Type
+    {
+        $defaultArg = $args[4] ?? null;
+        if (! $defaultArg instanceof Arg) {
+            return null;
+        }
+
+        return $this->nodeTypeResolver->getType($defaultArg->value);
+    }
+
+    /**
+     * @param Arg[] $args
+     */
+    private function isArrayMode(array $args): bool
+    {
+        $modeExpr = $args[2]->value ?? null;
+        if (! $modeExpr instanceof Expr) {
+            return false;
+        }
+
+        $modeValue = $this->valueResolver->getValue($modeExpr);
+        // binary check for InputOptions::VALUE_IS_ARRAY
+        return (bool) ($modeValue & 8);
+    }
 }

rules/Symfony73/NodeFactory/CommandInvokeParamsFactory.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Symfony\Symfony73\NodeFactory;
 
+use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Attribute;
 use PhpParser\Node\AttributeGroup;
@@ -13,7 +14,10 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
+use PHPStan\Type\Type;
 use Rector\PhpParser\Node\Value\ValueResolver;
+use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\Symfony\Enum\SymfonyAttribute;
 use Rector\Symfony\Symfony73\ValueObject\CommandArgument;
 use Rector\Symfony\Symfony73\ValueObject\CommandOption;
@@ -22,6 +26,7 @@
 {
     public function __construct(
         private ValueResolver $valueResolver,
+        private StaticTypeMapper $staticTypeMapper
     ) {
     }
 
@@ -50,11 +55,7 @@ private function createArgumentParams(array $commandArguments): array
             $variableName = $this->createCamelCase($commandArgument->getNameValue());
             $argumentParam = new Param(new Variable($variableName));
 
-            if ($commandArgument->isArray()) {
-                $argumentParam->type = new Identifier('array');
-            } else {
-                $argumentParam->type = new Identifier('string');
-            }
+            $this->decorateParamType($argumentParam, $commandArgument);
 
             if ($commandArgument->getDefault() instanceof Expr) {
                 $argumentParam->default = $commandArgument->getDefault();
@@ -100,6 +101,8 @@ private function createOptionParams(array $commandOptions): array
                 $optionParam->default = $commandOption->getDefault();
             }
 
+            $this->decorateParamType($optionParam, $commandOption);
+
             $optionArgs = [new Arg(value: $commandOption->getName(), name: new Identifier('name'))];
 
             if ($this->isNonEmptyExpr($commandOption->getShortcut())) {
@@ -157,4 +160,31 @@ private function isNonEmptyExpr(?Expr $expr): bool
 
         return ! $this->valueResolver->isValue($expr, '');
     }
+
+    private function decorateParamType(
+        Param $argumentParam,
+        CommandArgument|CommandOption $commandArgumentOrOption
+    ): void {
+        if ($commandArgumentOrOption->isArray()) {
+            $argumentParam->type = new Identifier('array');
+            return;
+        }
+
+        $defaultType = $commandArgumentOrOption->getDefaultType();
+        if ($defaultType instanceof Type) {
+            $paramType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($defaultType, TypeKind::PARAM);
+
+            if ($paramType instanceof Node) {
+                $argumentParam->type = $paramType;
+                return;
+            }
+        }
+
+        // fallback
+        if ($commandArgumentOrOption instanceof CommandOption) {
+            return;
+        }
+
+        $argumentParam->type = new Identifier('string');
+    }
 }

rules/Symfony73/ValueObject/CommandArgument.php

@@ -5,6 +5,7 @@
 namespace Rector\Symfony\Symfony73\ValueObject;
 
 use PhpParser\Node\Expr;
+use PHPStan\Type\Type;
 
 final readonly class CommandArgument
 {
@@ -14,7 +15,8 @@ public function __construct(
         private ?Expr $mode,
         private ?Expr $description,
         private ?Expr $default,
-        private bool $isArray
+        private bool $isArray,
+        private ?Type $defaultType
     ) {
     }
 
@@ -47,4 +49,9 @@ public function isArray(): bool
     {
         return $this->isArray;
     }
+
+    public function getDefaultType(): ?Type
+    {
+        return $this->defaultType;
+    }
 }