add dead-code set to CI

packages/DeadCode/src/Rector/Stmt/RemoveUnreachableStatementRector.php

@@ -13,6 +13,7 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Nop;
+use PhpParser\Node\Stmt\While_;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Rector\RectorDefinition\CodeSample;
@@ -82,6 +83,11 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($previousNode instanceof While_) {
+            $node->setAttribute(AttributeKey::IS_UNREACHABLE, false);
+            return null;
+        }
+
         if ($this->isAfterMarkTestSkippedMethodCall($node)) {
             $node->setAttribute(AttributeKey::IS_UNREACHABLE, false);
             return null;
@@ -144,6 +150,7 @@ private function isBreakingScopeNode(Node $node): bool
         if ($node instanceof Namespace_) {
             return true;
         }
+
         return $node instanceof Else_;
     }
 }

packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/Fixture/skip_already_array.php.inc

@@ -3,7 +3,7 @@
 namespace Rector\PHPUnit\Tests\Rector\MethodCall\WithConsecutiveArgToArrayRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
-use Rector\PHPUnit\Tests\Rector\MethodCall\WithConsecutiveArgToArrayRector\ClassWithMethodOfTwoArguments;
+use Rector\PHPUnit\Tests\Rector\MethodCall\WithConsecutiveArgToArrayRector\Source\ClassWithMethodOfTwoArguments;
 
 class SkipAlreadyArrayTestCase extends TestCase
 {

packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/ClassWithMethodOfTwoArguments.php → packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/Source/ClassWithMethodOfTwoArguments.php

@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPUnit\Tests\Rector\MethodCall\WithConsecutiveArgToArrayRector;
+namespace Rector\PHPUnit\Tests\Rector\MethodCall\WithConsecutiveArgToArrayRector\Source;
 
 final class ClassWithMethodOfTwoArguments
 {
     public function go(int $one, string $two): void
     {
+        $three = $one + $two;
     }
 }

rector-ci.yaml

@@ -1,6 +1,7 @@
 parameters:
     sets:
         - "code-quality"
+        - "dead-code"
 
     auto_import_names: true
 

src/Console/Application.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Console;
 
+use Composer\XdebugHandler\XdebugHandler;
 use Jean85\PrettyVersions;
 use Rector\Configuration\Configuration;
 use Rector\Console\Output\JsonOutputFormatter;
@@ -55,6 +56,14 @@ public function setDispatcher(EventDispatcherInterface $eventDispatcher): void
 
     public function doRun(InputInterface $input, OutputInterface $output): int
     {
+        // @fixes https://github.com/rectorphp/rector/issues/2205
+        $isXdebugAllowed = $input->hasParameterOption('--xdebug');
+        if (!$isXdebugAllowed) {
+            $xdebug = new XdebugHandler('rector', '--ansi');
+            $xdebug->check();
+            unset($xdebug);
+        }
+
         $this->configuration->setConfigFilePathFromInput($input);
 
         $shouldFollowByNewline = false;

src/Console/Command/AbstractCommand.php

@@ -4,7 +4,6 @@
 
 namespace Rector\Console\Command;
 
-use Composer\XdebugHandler\XdebugHandler;
 use Nette\Utils\Strings;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
@@ -61,12 +60,5 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 
             $this->getApplication()->setCatchExceptions(false);
         }
-
-        // @fixes https://github.com/rectorphp/rector/issues/2205
-        if ($input->getOption('xdebug')) {
-            $xdebug = new XdebugHandler('rector', '--ansi');
-            $xdebug->check();
-            unset($xdebug);
-        }
     }
 }

src/PhpParser/Node/Manipulator/ClassManipulator.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\StaticPropertyFetch;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt;
@@ -487,6 +488,10 @@ private function getClassMethodNames(Class_ $classNode): array
     private function isNonAssignPropertyFetch(Node $node): bool
     {
         if ($node instanceof PropertyFetch) {
+            if (! $node->var instanceof Variable) {
+                return false;
+            }
+
             if (! $this->nameResolver->isName($node->var, 'this')) {
                 return false;
             }

src/PhpParser/Node/Resolver/NameResolver.php

@@ -24,6 +24,7 @@
 use PhpParser\Node\Stmt\Use_;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Symplify\PackageBuilder\FileSystem\SmartFileInfo;
 
 final class NameResolver
 {
@@ -44,8 +45,16 @@ public function isNames(Node $node, array $names): bool
     public function isName(Node $node, string $name): bool
     {
         if ($node instanceof MethodCall) {
+            $debugBacktrace = debug_backtrace();
+
+            $previousCaller = $debugBacktrace[0];
+            $fileInfo = new SmartFileInfo($previousCaller['file']);
+            $location = $fileInfo->getRelativeFilePathFromDirectory(getcwd()) . ':' . $previousCaller['line'];
+
             throw new ShouldNotHappenException(sprintf(
-                'Cannot get name on "%s" node. Use $node->name instead', MethodCall::class
+                'Cannot get name on "%s" node. Use $node->name instead. Called in: %s',
+                MethodCall::class,
+                $location
             ));
         }