Updated Rector to commit 184dd0296b2bdcb7165a0879b0a830f5c77bcc44

rectorphp/rector-src@184dd02 [dead-code] Add RemoveVoidDocblockFromMagicMethodRector (#7822)

Author: TomasVotruba

rules/DeadCode/Rector/ClassMethod/RemoveVoidDocblockFromMagicMethodRector.php

@@ -0,0 +1,97 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\DeadCode\Rector\ClassMethod;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
+use Rector\Comments\NodeDocBlock\DocBlockUpdater;
+use Rector\Rector\AbstractRector;
+use Rector\ValueObject\MethodName;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+/**
+ * @see \Rector\Tests\DeadCode\Rector\ClassMethod\RemoveVoidDocblockFromMagicMethodRector\RemoveVoidDocblockFromMagicMethodRectorTest
+ */
+final class RemoveVoidDocblockFromMagicMethodRector extends AbstractRector
+{
+    /**
+     * @readonly
+     */
+    private DocBlockUpdater $docBlockUpdater;
+    /**
+     * @readonly
+     */
+    private PhpDocInfoFactory $phpDocInfoFactory;
+    public function __construct(DocBlockUpdater $docBlockUpdater, PhpDocInfoFactory $phpDocInfoFactory)
+    {
+        $this->docBlockUpdater = $docBlockUpdater;
+        $this->phpDocInfoFactory = $phpDocInfoFactory;
+    }
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Remove useless @return void docblock from magic methods __construct, __destruct, and __clone', [new CodeSample(<<<'CODE_SAMPLE'
+class SomeClass
+{
+    /**
+     * @return void
+     */
+    public function __construct() {}
+
+    /**
+     * @return void
+     */
+    public function __destruct() {}
+
+    /**
+     * @return void
+     */
+    public function __clone() {}
+}
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function __construct() {}
+
+    public function __destruct() {}
+
+    public function __clone() {}
+}
+CODE_SAMPLE
+)]);
+    }
+    public function getNodeTypes(): array
+    {
+        return [ClassMethod::class];
+    }
+    /**
+     * @param ClassMethod $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if ($node->returnType instanceof Node) {
+            return null;
+        }
+        if (!$this->isNames($node, [MethodName::CONSTRUCT, MethodName::DESTRUCT, MethodName::CLONE])) {
+            return null;
+        }
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
+        $returnTagValueNode = $phpDocInfo->getReturnTagValue();
+        if (!$returnTagValueNode instanceof ReturnTagValueNode) {
+            return null;
+        }
+        if ($returnTagValueNode->description !== '') {
+            return null;
+        }
+        if (!$returnTagValueNode->type instanceof IdentifierTypeNode || $returnTagValueNode->type->name !== 'void') {
+            return null;
+        }
+        $phpDocInfo->removeByType(ReturnTagValueNode::class);
+        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
+        return $node;
+    }
+}

rules/DeadCode/Rector/If_/RemoveDeadIfBlockRector.php

@@ -6,6 +6,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Stmt\Else_;
+use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\NodeVisitor;
 use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
@@ -95,13 +96,11 @@ public function refactor(Node $node)
             $node->else = null;
             return $this->refactor($node) ?? $node;
         }
-        if ($node->elseifs !== []) {
-            foreach ($node->elseifs as $elseif) {
-                $keep_elseifs = array_filter($node->elseifs, fn($elseif) => $elseif->stmts !== [] || $this->sideEffectNodeDetector->detect($elseif->cond));
-                if (count($node->elseifs) !== count($keep_elseifs)) {
-                    $node->elseifs = $keep_elseifs;
-                    return $this->refactor($node) ?? $node;
-                }
+        foreach ($node->elseifs as $elseif) {
+            $keep_elseifs = array_filter($node->elseifs, fn(ElseIf_ $elseif): bool => $elseif->stmts !== [] || $this->sideEffectNodeDetector->detect($elseif->cond));
+            if (count($node->elseifs) !== count($keep_elseifs)) {
+                $node->elseifs = $keep_elseifs;
+                return $this->refactor($node) ?? $node;
             }
         }
         if ($node->stmts !== []) {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '7891d874ac7cc0f7b3a0dc2dc128085f9038bfa9';
+    public const PACKAGE_VERSION = '184dd0296b2bdcb7165a0879b0a830f5c77bcc44';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-13 15:14:53';
+    public const RELEASE_DATE = '2026-01-13 14:52:03';
     /**
      * @var int
      */

src/Config/Level/DeadCodeLevel.php

@@ -26,6 +26,7 @@
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnExprInConstructRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveVoidDocblockFromMagicMethodRector;
 use Rector\DeadCode\Rector\Closure\RemoveUnusedClosureVariableUseRector;
 use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
@@ -104,6 +105,7 @@ final class DeadCodeLevel
         SimplifyUselessVariableRector::class,
         RemoveDeadZeroAndOneOperationRector::class,
         // docblock
+        RemoveVoidDocblockFromMagicMethodRector::class,
         RemoveUselessParamTagRector::class,
         RemoveUselessReturnTagRector::class,
         RemoveUselessReadOnlyTagRector::class,

src/PhpParser/Node/BetterNodeFinder.php

@@ -3,14 +3,14 @@
 declare (strict_types=1);
 namespace Rector\PhpParser\Node;
 
-use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Expr\Yield_;
 use PhpParser\Node\Expr\YieldFrom;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\NodeFinder;
 use PhpParser\NodeVisitor;

vendor/composer/autoload_classmap.php

@@ -1410,6 +1410,7 @@
     'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessParamTagRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php',
     'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnExprInConstructRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnExprInConstructRector.php',
     'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnTagRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php',
+    'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveVoidDocblockFromMagicMethodRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveVoidDocblockFromMagicMethodRector.php',
     'Rector\\DeadCode\\Rector\\Closure\\RemoveUnusedClosureVariableUseRector' => $baseDir . '/rules/DeadCode/Rector/Closure/RemoveUnusedClosureVariableUseRector.php',
     'Rector\\DeadCode\\Rector\\Concat\\RemoveConcatAutocastRector' => $baseDir . '/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php',
     'Rector\\DeadCode\\Rector\\ConstFetch\\RemovePhpVersionIdCheckRector' => $baseDir . '/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php',

vendor/composer/autoload_static.php

@@ -1670,6 +1670,7 @@ class ComposerStaticInit7001fb5f7b9b8dbb950c02836c7af51c
         'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessParamTagRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php',
         'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnExprInConstructRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnExprInConstructRector.php',
         'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnTagRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php',
+        'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveVoidDocblockFromMagicMethodRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveVoidDocblockFromMagicMethodRector.php',
         'Rector\\DeadCode\\Rector\\Closure\\RemoveUnusedClosureVariableUseRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Closure/RemoveUnusedClosureVariableUseRector.php',
         'Rector\\DeadCode\\Rector\\Concat\\RemoveConcatAutocastRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php',
         'Rector\\DeadCode\\Rector\\ConstFetch\\RemovePhpVersionIdCheckRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php',