skip fcc

TomasVotruba · TomasVotruba · commit fc381ce01901 · 2025-12-22T15:21:36.000+01:00
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_args.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_args.php.inc
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_count.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_count.php.inc
@@ -4,7 +4,7 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstru
 
 use PhpParser\Node\Scalar\String_;
 
-final class SkipDifferntCount extends String_
+final class SkipDifferentCount extends String_
 {
     public function __construct($value)
     {
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_type.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_type.php.inc
@@ -7,7 +7,7 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstru
 use PhpParser\NodeTraverser;
 use Rector\Comments\NodeVisitor\CommentRemovingNodeVisitor;
 
-final class SkipDifferntType extends NodeTraverser
+final class SkipDifferentType extends NodeTraverser
 {
     public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)
     {
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_first_class_callable.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_first_class_callable.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector\Fixture;
+
+use PhpParser\Node\Scalar\String_;
+
+final class SkipFirstClassCallable extends String_
+{
+    public function __construct($value, $attributes)
+    {
+        parent::__construct(...);
+    }
+}
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector.php
@@ -155,6 +155,10 @@ private function matchParentConstructorCallArgs(Stmt $stmt): ?array
         }
 
         $staticCall = $stmt->expr;
+        if ($staticCall->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! $this->isName($staticCall->class, ObjectReference::PARENT)) {
             return null;
         }
@@ -201,7 +205,7 @@ private function isParameterAndArgCountAndOrderIdentical(ClassMethod $classMetho
 
     private function areConstructorAndParentParameterTypesMatching(
         ClassMethod $classMethod,
-        ExtendedMethodReflection $parentMethodReflection
+        ExtendedMethodReflection $extendedMethodReflection
     ): bool {
         foreach ($classMethod->getParams() as $position => $param) {
             $parameterType = $param->type;
@@ -211,7 +215,7 @@ private function areConstructorAndParentParameterTypesMatching(
                 continue;
             }
 
-            $parametersSelector = $parentMethodReflection->getOnlyVariant();
+            $parametersSelector = $extendedMethodReflection->getOnlyVariant();
 
             foreach ($parametersSelector->getParameters() as $index => $parameterReflection) {
                 if ($index !== $position) {
diff --git a/src/Comments/NodeTraverser/CommentRemovingNodeTraverser.php b/src/Comments/NodeTraverser/CommentRemovingNodeTraverser.php
@@ -5,7 +5,12 @@
 namespace Rector\Comments\NodeTraverser;
 
 use PhpParser\NodeTraverser;
+use Rector\Comments\NodeVisitor\CommentRemovingNodeVisitor;
 
 final class CommentRemovingNodeTraverser extends NodeTraverser
 {
+    public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)
+    {
+        parent::__construct($commentRemovingNodeVisitor);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstru`
`4`	`4`
`5`	`5`	`use PhpParser\Node\Scalar\String_;`
`6`	`6`
`7`		`-final class SkipDifferntCount extends String_`
	`7`	`+final class SkipDifferentCount extends String_`
`8`	`8`	`{`
`9`	`9`	`public function __construct($value)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstru`
`7`	`7`	`use PhpParser\NodeTraverser;`
`8`	`8`	`use Rector\Comments\NodeVisitor\CommentRemovingNodeVisitor;`
`9`	`9`
`10`		`-final class SkipDifferntType extends NodeTraverser`
	`10`	`+final class SkipDifferentType extends NodeTraverser`
`11`	`11`	`{`
`12`	`12`	`public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,12 @@`
`5`	`5`	`namespace Rector\Comments\NodeTraverser;`
`6`	`6`
`7`	`7`	`use PhpParser\NodeTraverser;`
	`8`	`+use Rector\Comments\NodeVisitor\CommentRemovingNodeVisitor;`
`8`	`9`
`9`	`10`	`final class CommentRemovingNodeTraverser extends NodeTraverser`
`10`	`11`	`{`
	`12`	`+ public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)`
	`13`	`+ {`
	`14`	`+ parent::__construct($commentRemovingNodeVisitor);`
	`15`	`+ }`
`11`	`16`	`}`