pass symfony style via execute() if created inside

Author: TomasVotruba

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Symfony\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -11,7 +11,6 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 #[AsCommand('app:my-command')]
 final class MyCommand extends Command
 {
-    #[\Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
@@ -24,18 +23,20 @@ final class MyCommand extends Command
 -----
 <?php
 
-namespace Rector\Tests\Symfony\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector\Fixture;
+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\Style\SymfonyStyle;
+
 #[AsCommand('app:my-command')]
 final class MyCommand
 {
-    #[\Override]
     public function __invoke(\Symfony\Component\Console\Style\SymfonyStyle $io): int
     {
         $io->info('Great success!');
-        
         return 1;
     }
 }

rules/Symfony73/NodeTransformer/CommandUnusedInputOutputRemover.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Symfony\Symfony73\NodeTransformer;
+
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt\ClassMethod;
+use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\PhpParser\Node\BetterNodeFinder;
+
+final readonly class CommandUnusedInputOutputRemover
+{
+    /**
+     * @var string[]
+     */
+    private const VARIABLE_NAMES = ['input', 'output'];
+
+    public function __construct(
+        private NodeNameResolver $nodeNameResolver,
+        private BetterNodeFinder $betterNodeFinder
+    ) {
+
+    }
+
+    public function remove(ClassMethod $executeClassMethod): void
+    {
+        foreach (self::VARIABLE_NAMES as $variableName) {
+            $inputVariable = $this->betterNodeFinder->findVariableOfName($executeClassMethod->stmts, $variableName);
+
+            // is used → skip
+            if ($inputVariable instanceof Variable) {
+                continue;
+            }
+
+            $this->removeParameterByName($executeClassMethod, $variableName);
+        }
+    }
+
+    private function removeParameterByName(ClassMethod $classMethod, string $paramName): void
+    {
+        foreach ($classMethod->getParams() as $key => $param) {
+            if (! $this->nodeNameResolver->isName($param->var, $paramName)) {
+                continue;
+            }
+
+            unset($classMethod->params[$key]);
+        }
+    }
+}

rules/Symfony73/NodeTransformer/OutputInputSymfonyStyleReplacer.php

@@ -4,21 +4,94 @@
 
 namespace Rector\Symfony\Symfony73\NodeTransformer;
 
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\New_;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Expression;
+use PhpParser\NodeVisitor;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\PhpParser\Node\Value\ValueResolver;
+use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\PhpParser\Node\BetterNodeFinder;
+use Rector\Symfony\Enum\SymfonyClass;
 
 final readonly class OutputInputSymfonyStyleReplacer
 {
     public function __construct(
         private NodeNameResolver $nodeNameResolver,
-        private ValueResolver $valueResolver,
+        private BetterNodeFinder $betterNodeFinder,
+        private SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
     ) {
     }
 
     public function replace(ClassMethod $executeClassMethod): void
     {
-        dump(123);
-        die;
+        $symfonyStyleVariableName = $this->matchSymfonyStyleNewVariableName($executeClassMethod);
+
+        // nothing to update here
+        if ($symfonyStyleVariableName === null) {
+            return;
+        }
+
+        // 1. add symfony style param
+        $executeClassMethod->params[] = new Param(
+            new Variable($symfonyStyleVariableName),
+            null,
+            new FullyQualified(SymfonyClass::SYMFONY_STYLE)
+        );
+
+        // 2. remove new symfony style inside
+        $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
+            $executeClassMethod,
+            function (\PhpParser\Node $node) {
+                if (! $node instanceof Expression) {
+                    return null;
+                }
+
+                if (! $node->expr instanceof Assign) {
+                    return null;
+                }
+
+                $assign = $node->expr;
+                if (! $this->isSymfonyStyleNewAssign($assign)) {
+                    return null;
+                }
+
+                return NodeVisitor::REMOVE_NODE;
+            }
+        );
+    }
+
+    private function matchSymfonyStyleNewVariableName(ClassMethod $executeClassMethod): ?string
+    {
+        /** @var Assign[] $assigns */
+        $assigns = $this->betterNodeFinder->findInstancesOfScoped($executeClassMethod->stmts, Assign::class);
+
+        foreach ($assigns as $assign) {
+            if (! $this->isSymfonyStyleNewAssign($assign)) {
+                continue;
+            }
+
+            if (! $assign->var instanceof Variable) {
+                continue;
+            }
+
+            return $this->nodeNameResolver->getName($assign->var);
+        }
+
+        return null;
+    }
+
+    private function isSymfonyStyleNewAssign(Assign $assign): bool
+    {
+        if (! $assign->expr instanceof New_) {
+            return false;
+        }
+
+        $new = $assign->expr;
+
+        return $this->nodeNameResolver->isName($new->class, SymfonyClass::SYMFONY_STYLE);
     }
 }

rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php

@@ -6,10 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
-<<<<<<< HEAD
 use PhpParser\Node\ArrayItem;
-=======
->>>>>>> cf6f011c (fixup! fixup! apply rector)
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\New_;
@@ -91,8 +88,6 @@ public function refactor(Node $node): ?Node
         $namedArgs = [];
 
         foreach ($array->items as $item) {
-<<<<<<< HEAD
-<<<<<<< HEAD
             if (! $item instanceof ArrayItem) {
                 continue;
             }
@@ -103,12 +98,6 @@ public function refactor(Node $node): ?Node
                     return null;
                 }
 
-=======
-            if (! $item instanceof ArrayItem || !$item->key instanceof Expr) {
->>>>>>> 80213bcd (apply rector)
-=======
-            if (! $item instanceof ArrayItem || ! $item->key instanceof Expr) {
->>>>>>> cf6f011c (fixup! fixup! apply rector)
                 continue;
             }
 

rules/Symfony73/Rector/Class_/InvokableCommandInputAttributeRector.php

@@ -20,6 +20,7 @@
 use Rector\Symfony\Enum\SymfonyClass;
 use Rector\Symfony\Symfony73\NodeAnalyzer\CommandArgumentsAndOptionsResolver;
 use Rector\Symfony\Symfony73\NodeFactory\CommandInvokeParamsFactory;
+use Rector\Symfony\Symfony73\NodeTransformer\CommandUnusedInputOutputRemover;
 use Rector\Symfony\Symfony73\NodeTransformer\ConsoleOptionAndArgumentMethodCallVariableReplacer;
 use Rector\Symfony\Symfony73\NodeTransformer\OutputInputSymfonyStyleReplacer;
 use Rector\ValueObject\MethodName;
@@ -44,7 +45,8 @@ public function __construct(
         private readonly CommandInvokeParamsFactory $commandInvokeParamsFactory,
         private readonly ConsoleOptionAndArgumentMethodCallVariableReplacer $consoleOptionAndArgumentMethodCallVariableReplacer,
         private readonly VisibilityManipulator $visibilityManipulator,
-        private readonly OutputInputSymfonyStyleReplacer $outputInputSymfonyStyleReplacer
+        private readonly OutputInputSymfonyStyleReplacer $outputInputSymfonyStyleReplacer,
+        private readonly CommandUnusedInputOutputRemover $commandUnusedInputOutputRemover
     ) {
     }
 
@@ -189,6 +191,9 @@ public function refactor(Node $node): ?Class_
             $this->consoleOptionAndArgumentMethodCallVariableReplacer->replace($executeClassMethod);
         }
 
+        $this->outputInputSymfonyStyleReplacer->replace($executeClassMethod);
+        $this->commandUnusedInputOutputRemover->remove($executeClassMethod);
+
         return $node;
     }
 

src/Enum/SymfonyClass.php

@@ -140,4 +140,9 @@ final class SymfonyClass
      * @var string
      */
     public const PARAMETER_BAG = 'Symfony\Component\HttpFoundation\ParameterBag';
+
+    /**
+     * @var string
+     */
+    public const SYMFONY_STYLE = 'Symfony\Component\Console\Style\SymfonyStyle';
 }