Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
}
}

?>
11 changes: 11 additions & 0 deletions rules/Symfony73/NodeAnalyzer/CommandArgumentsResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Rector\Symfony\Symfony73\NodeAnalyzer;

use PhpParser\Node\Expr;
use PhpParser\Node\Stmt\ClassMethod;
use Rector\PhpParser\Node\Value\ValueResolver;
use Rector\Symfony\Symfony73\NodeFinder\MethodCallFinder;
Expand All @@ -30,12 +31,22 @@ 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);
}

$commandArguments[] = new CommandArgument(
$argumentName,
$addArgumentArgs[0]->value,
$addArgumentArgs[1]->value ?? null,
$addArgumentArgs[2]->value ?? null,
$addArgumentArgs[3]->value ?? null,
$isArray
);
}

Expand Down
42 changes: 21 additions & 21 deletions rules/Symfony73/NodeFactory/CommandInvokeParamsFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ private function createArgumentParams(array $commandArguments): array
foreach ($commandArguments as $commandArgument) {
$variableName = $this->createCamelCase($commandArgument->getNameValue());
$argumentParam = new Param(new Variable($variableName));
$argumentParam->type = new Identifier('string');

if ($commandArgument->isArray()) {
$argumentParam->type = new Identifier('array');
} else {
$argumentParam->type = new Identifier('string');
}

if ($commandArgument->getDefault() instanceof Expr) {
$argumentParam->default = $commandArgument->getDefault();
Expand All @@ -63,7 +68,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'
));
Expand Down Expand Up @@ -97,19 +102,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'));
}

Expand All @@ -135,26 +136,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);
}
}
6 changes: 6 additions & 0 deletions rules/Symfony73/ValueObject/CommandArgument.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public function __construct(
private ?Expr $mode,
private ?Expr $description,
private ?Expr $default,
private bool $isArray
) {
}

Expand Down Expand Up @@ -41,4 +42,9 @@ public function getDefault(): ?Expr
{
return $this->default;
}

public function isArray(): bool
{
return $this->isArray;
}
}