enable rule

Author: TomasVotruba

rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_different_type.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector\Fixture;
+
+use PhpParser\NodeTraverser;
+use Rector\Comments\NodeVisitor\CommentRemovingNodeVisitor;
+
+final class SkipDifferntType extends NodeTraverser
+{
+    public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)
+    {
+        parent::__construct($commentRemovingNodeVisitor);
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_differnt_args.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector\Fixture;
+
+use PhpParser\Node\Scalar\String_;
+
+final class SomeDifferentArgs extends String_
+{
+    public function __construct($value, $attributes)
+    {
+        parent::__construct($value, []);
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector/Fixture/skip_differnt_count.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector\Fixture;
+
+use PhpParser\Node\Scalar\String_;
+
+final class SkipDifferntCount extends String_
+{
+    public function __construct($value)
+    {
+        parent::__construct($value, []);
+    }
+}

rules/DeadCode/Rector/ClassMethod/RemoveParentDelegatingConstructorRector.php

@@ -5,16 +5,17 @@
 namespace Rector\DeadCode\Rector\ClassMethod;
 
 use PhpParser\Node;
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\NodeVisitor;
 use PHPStan\Reflection\ClassReflection;
 use Rector\Enum\ObjectReference;
-use Rector\NodeAnalyzer\ArgsAnalyzer;
-use Rector\NodeAnalyzer\ExprAnalyzer;
-use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
-use Rector\Reflection\ReflectionResolver;
 use Rector\ValueObject\MethodName;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -24,14 +25,6 @@
  */
 final class RemoveParentDelegatingConstructorRector extends AbstractRector
 {
-    public function __construct(
-        private readonly ReflectionResolver $reflectionResolver,
-        private readonly ArgsAnalyzer $argsAnalyzer,
-        private readonly ValueResolver $valueResolver,
-        private readonly ExprAnalyzer $exprAnalyzer
-    ) {
-    }
-
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -89,48 +82,89 @@ public function refactor(Node $node): ?int
             return null;
         }
 
-        if (count($node->stmts) !== 1) {
+        if ($node->stmts === null || count($node->stmts) !== 1) {
             return null;
         }
 
-        $scope = ScopeFetcher::fetch($node);
-        $classReflection = $scope->getClassReflection();
-        if (! $classReflection->getParentClass() instanceof ClassReflection) {
+        if (! $this->hasParentClassWithConstructor($node)) {
             return null;
         }
 
-        $parentClassReflection = $classReflection->getParentClass();
-        if (! $parentClassReflection->hasConstructor()) {
+        $soleStmt = $node->stmts[0];
+        $parentCallArgs = $this->matchParentConstructorCallArgs($soleStmt);
+        if ($parentCallArgs === null) {
             return null;
         }
 
-        // $parentClassReflectionConstructor = $parentClassReflection->getConstructor();
-
-        $soleStmt = $node->stmts[0];
-        if (! $soleStmt instanceof Node\Stmt\Expression) {
+        $constructorParams = $node->getParams();
+        if (count($constructorParams) !== count($parentCallArgs)) {
             return null;
         }
 
-        if (! $soleStmt->expr instanceof Node\Expr\StaticCall) {
+        // match passed names in the same order
+        $paramNames = [];
+        foreach ($constructorParams as $constructorParam) {
+            $paramNames[] = $this->getName($constructorParam->var);
+        }
+
+        $argNames = [];
+        foreach ($parentCallArgs as $parentCallArg) {
+            $argValue = $parentCallArg->value;
+            if (! $argValue instanceof Variable) {
+                return null;
+            }
+
+            $argNames[] = $this->getName($argValue);
+        }
+
+        if ($paramNames !== $argNames) {
             return null;
         }
 
-        $staticCall = $soleStmt->expr;
-        if (! $this->isName($staticCall->class, ObjectReference::PARENT)) {
+        return NodeVisitor::REMOVE_NODE;
+    }
+
+    private function hasParentClassWithConstructor(ClassMethod $classMethod): bool
+    {
+        $scope = ScopeFetcher::fetch($classMethod);
+
+        $classReflection = $scope->getClassReflection();
+        if (! $classReflection instanceof ClassReflection) {
+            return false;
+        }
+
+        $parentClassReflection = $classReflection->getParentClass();
+        if (! $parentClassReflection instanceof ClassReflection) {
+            return false;
+        }
+
+        return $parentClassReflection->hasConstructor();
+    }
+
+    /**
+     * Looking for parent::__construct()
+     *
+     * @return Arg[]|null
+     */
+    private function matchParentConstructorCallArgs(Stmt $stmt): ?array
+    {
+        if (! $stmt instanceof Expression) {
             return null;
         }
 
-        if (! $this->isName($staticCall->name, MethodName::CONSTRUCT)) {
+        if (! $stmt->expr instanceof StaticCall) {
             return null;
         }
 
-        $constructorParams = $node->getParams();
-        $parentCallArgs = $staticCall->getArgs();
+        $staticCall = $stmt->expr;
+        if (! $this->isName($staticCall->class, ObjectReference::PARENT)) {
+            return null;
+        }
 
-        if (count($constructorParams) !== count($parentCallArgs)) {
+        if (! $this->isName($staticCall->name, MethodName::CONSTRUCT)) {
             return null;
         }
 
-        return NodeVisitor::REMOVE_NODE;
+        return $staticCall->getArgs();
     }
 }

src/Comments/NodeTraverser/CommentRemovingNodeTraverser.php

@@ -5,12 +5,7 @@
 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);
-    }
 }

src/Config/Level/DeadCodeLevel.php

@@ -17,6 +17,7 @@
 use Rector\DeadCode\Rector\ClassMethod\RemoveArgumentFromDefaultParentCallRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveNullTagValueNodeRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
@@ -132,7 +133,10 @@ final class DeadCodeLevel
         RemoveConditionExactReturnRector::class,
         RemoveDeadStmtRector::class,
         UnwrapFutureCompatibleIfPhpVersionRector::class,
+
         RemoveParentCallWithoutParentRector::class,
+        RemoveParentDelegatingConstructorRector::class,
+
         RemoveDeadConditionAboveReturnRector::class,
         RemoveDeadLoopRector::class,