misc

Author: TomasVotruba

…ture/argument_with_default_value.php.inc …alue/argument_with_default_value.php.incrules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/argument_with_default_value.php.inc renamed to rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/DefaultValue/argument_with_default_value.php.inc rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/argument_with_default_value.php.inc renamed to rules-tests/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector/Fixture/DefaultValue/argument_with_default_value.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -28,7 +28,7 @@ class ArgumentWithDefaultValue extends Command
 -----
 <?php
 
-namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture\DefaultValue;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;

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

@@ -0,0 +1,51 @@
+<?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\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+class IterableTypeWithDefaultValue extends Command
+{
+    protected function configure(): void
+    {
+        $this->addArgument('iterable', InputArgument::REQUIRED | InputArgument::IS_ARRAY, null, ['many values']);
+    }
+
+    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\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'app:hello',
+)]
+class IterableTypeWithDefaultValue
+{
+    public function __invoke(
+        #[\Symfony\Component\Console\Attribute\Argument(name: 'iterable')]
+        array $iterable = ['many values']
+    ): int
+    {
+    }
+}
+
+?>

rules/Symfony73/NodeFactory/CommandInvokeParamsFactory.php

@@ -63,7 +63,7 @@ private function createArgumentParams(array $commandArguments): array
 
             $argumentArgs = [new Arg(value: $commandArgument->getName(), name: new Identifier('name'))];
 
-            if ($this->hasUsefulDescription($commandArgument)) {
+            if ($this->isNonEmptyExpr($commandArgument->getDescription())) {
                 $argumentArgs[] = new Arg(value: $commandArgument->getDescription(), name: new Identifier(
                     'description'
                 ));
@@ -97,19 +97,15 @@ private function createOptionParams(array $commandOptions): array
 
             $optionArgs = [new Arg(value: $commandOption->getName(), name: new Identifier('name'))];
 
-            if ($commandOption->getShortcut() instanceof Expr && ! $this->valueResolver->isNull(
-                $commandOption->getShortcut()
-            )) {
+            if ($this->isNonEmptyExpr($commandOption->getShortcut())) {
                 $optionArgs[] = new Arg(value: $commandOption->getShortcut(), name: new Identifier('shortcut'));
             }
 
-            if ($commandOption->getMode() instanceof Expr && ! $this->valueResolver->isNull(
-                $commandOption->getMode()
-            )) {
+            if ($this->isNonEmptyExpr($commandOption->getMode())) {
                 $optionArgs[] = new Arg(value: $commandOption->getMode(), name: new Identifier('mode'));
             }
 
-            if ($this->hasUsefulDescription($commandOption)) {
+            if ($this->isNonEmptyExpr($commandOption->getDescription())) {
                 $optionArgs[] = new Arg(value: $commandOption->getDescription(), name: new Identifier('description'));
             }
 
@@ -135,26 +131,25 @@ private function createCamelCase(string $value): string
         return lcfirst($value);
     }
 
-    private function hasUsefulDescription(CommandArgument|CommandOption $commandArgumentOrOption): bool
+    private function isOptionalArgument(CommandArgument $commandArgument): bool
+    {
+        if (! $commandArgument->getMode() instanceof Expr) {
+            return true;
+        }
+
+        return $this->valueResolver->isValue($commandArgument->getMode(), 2);
+    }
+
+    private function isNonEmptyExpr(?Expr $expr): bool
     {
-        if (! $commandArgumentOrOption->getDescription() instanceof Expr) {
+        if (! $expr instanceof Expr) {
             return false;
         }
 
-        $expr = $commandArgumentOrOption->getDescription();
         if ($this->valueResolver->isNull($expr)) {
             return false;
         }
 
         return ! $this->valueResolver->isValue($expr, '');
     }
-
-    private function isOptionalArgument(CommandArgument $commandArgument): bool
-    {
-        if (! $commandArgument->getMode() instanceof Expr) {
-            return true;
-        }
-
-        return $this->valueResolver->isValue($commandArgument->getMode(), 2);
-    }
 }