[DX] Make PhpDocInfoFactory explicitly required in Rector rule constr…

…uctor, if needed (#5051)

phpstan.neon

@@ -566,3 +566,9 @@ parameters:
             path: rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php
 
         - '#Fetching class constant class of deprecated class Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictConstructorReadonlyClassRector#'
+
+        # dev rule
+        - '#Class "Rector\\Utils\\Rector\\MoveAbstractRectorToChildrenRector" is missing @see annotation with test case class reference#'
+
+        # deprecated parent property
+        - '#Access to deprecated property \$phpDocInfoFactory of class Rector\\Core\\Rector\\AbstractRector#'

rector.php

@@ -11,11 +11,13 @@
 use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenCollectorRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Rector\TypeDeclaration\Collector\ParentClassCollector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
+use Rector\Utils\Rector\MoveAbstractRectorToChildrenRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->sets([
@@ -33,11 +35,11 @@
         PHPUnitSetList::PHPUNIT_100,
     ]);
 
-    // @todo collectors - just for testing purpose
+    // testing collectors
     $rectorConfig->collector(ParentClassCollector::class);
-    $rectorConfig->rule(\Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenCollectorRector::class);
+    $rectorConfig->rule(FinalizeClassesWithoutChildrenCollectorRector::class);
 
-    $rectorConfig->rules([DeclareStrictTypesRector::class]);
+    $rectorConfig->rules([DeclareStrictTypesRector::class, MoveAbstractRectorToChildrenRector::class]);
 
     $rectorConfig->paths([
         __DIR__ . '/bin',

rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php

@@ -13,6 +13,7 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Type\MixedType;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Core\NodeAnalyzer\CallAnalyzer;
 use Rector\Core\NodeAnalyzer\VariableAnalyzer;
@@ -30,7 +31,8 @@ final class SimplifyUselessVariableRector extends AbstractRector
     public function __construct(
         private readonly AssignAndBinaryMap $assignAndBinaryMap,
         private readonly VariableAnalyzer $variableAnalyzer,
-        private readonly CallAnalyzer $callAnalyzer
+        private readonly CallAnalyzer $callAnalyzer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/CodeQuality/Rector/If_/CombineIfRector.php

@@ -11,6 +11,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use Rector\BetterPhpDocParser\Comment\CommentsMerger;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -21,7 +22,8 @@
 final class CombineIfRector extends AbstractRector
 {
     public function __construct(
-        private readonly CommentsMerger $commentsMerger
+        private readonly CommentsMerger $commentsMerger,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php

@@ -16,6 +16,7 @@
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\PropertyProperty;
 use PHPStan\Type\Type;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\CodingStyle\TypeAnalyzer\IterableTypeAnalyzer;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\Rector\AbstractRector;
@@ -34,7 +35,8 @@ public function __construct(
         private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
         private readonly IterableTypeAnalyzer $iterableTypeAnalyzer,
         private readonly VisibilityManipulator $visibilityManipulator,
-        private readonly ConstructorAssignDetector $constructorAssignDetector
+        private readonly ConstructorAssignDetector $constructorAssignDetector,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
@@ -32,6 +33,7 @@ final class RemoveAnnotationRector extends AbstractRector implements Configurabl
     public function __construct(
         private readonly PhpDocTagRemover $phpDocTagRemover,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Rector\AbstractRector;
@@ -29,6 +30,7 @@ public function __construct(
         private readonly UnusedParameterResolver $unusedParameterResolver,
         private readonly PhpDocTagRemover $phpDocTagRemover,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Rector\DeadCode\PhpDoc\TagRemover\ParamTagRemover;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -18,7 +19,8 @@
 final class RemoveUselessParamTagRector extends AbstractRector
 {
     public function __construct(
-        private readonly ParamTagRemover $paramTagRemover
+        private readonly ParamTagRemover $paramTagRemover,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Rector\AbstractRector;
 use Rector\DeadCode\PhpDoc\TagRemover\ReturnTagRemover;
@@ -20,6 +21,7 @@ final class RemoveUselessReturnTagRector extends AbstractRector
     public function __construct(
         private readonly ReturnTagRemover $returnTagRemover,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\Nop;
 use PhpParser\NodeTraverser;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
@@ -27,7 +28,8 @@ final class RemoveDeadStmtRector extends AbstractRector
     public function __construct(
         private readonly LivingCodeManipulator $livingCodeManipulator,
         private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
-        private readonly ReflectionResolver $reflectionResolver
+        private readonly ReflectionResolver $reflectionResolver,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php

@@ -22,6 +22,7 @@
 use PhpParser\Node\Stmt\While_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Core\NodeManipulator\StmtsManipulator;
@@ -55,6 +56,7 @@ final class RemoveNonExistingVarAnnotationRector extends AbstractRector
     public function __construct(
         private readonly StmtsManipulator $stmtsManipulator,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php

@@ -14,6 +14,7 @@
 use PHPStan\Analyser\Scope;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\DeadCode\NodeAnalyzer\PropertyWriteonlyAnalyzer;
@@ -28,6 +29,7 @@ final class RemoveUnusedPrivatePropertyRector extends AbstractScopeAwareRector
     public function __construct(
         private readonly PropertyFetchFinder $propertyFetchFinder,
         private readonly PropertyWriteonlyAnalyzer $propertyWriteonlyAnalyzer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Property;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -18,6 +19,7 @@ final class RemoveUselessVarTagRector extends AbstractRector
 {
     public function __construct(
         private readonly VarTagRemover $varTagRemover,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/EarlyReturn/Rector/StmtsAwareInterface/ReturnEarlyIfVariableRector.php

@@ -14,6 +14,7 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Core\NodeAnalyzer\VariableAnalyzer;
 use Rector\Core\Rector\AbstractRector;
@@ -26,7 +27,8 @@
 final class ReturnEarlyIfVariableRector extends AbstractRector
 {
     public function __construct(
-        private readonly VariableAnalyzer $variableAnalyzer
+        private readonly VariableAnalyzer $variableAnalyzer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector.php

@@ -12,6 +12,7 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Function_;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Naming\Guard\BreakingVariableRenameGuard;
@@ -42,7 +43,8 @@ public function __construct(
         private readonly VarTagValueNodeRenamer $varTagValueNodeRenamer,
         private readonly VariableAndCallAssignMatcher $variableAndCallAssignMatcher,
         private readonly VariableRenamer $variableRenamer,
-        private readonly DocBlockUpdater $docBlockUpdater
+        private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/Php80/Rector/Class_/AnnotationToAttributeRector.php

@@ -20,6 +20,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
@@ -61,6 +62,7 @@ public function __construct(
         private readonly UseImportsResolver $useImportsResolver,
         private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php

@@ -18,6 +18,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\TypeCombinator;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\NodeAnalyzer\ParamAnalyzer;
 use Rector\Core\Rector\AbstractRector;
@@ -67,7 +68,8 @@ public function __construct(
         private readonly MakePropertyPromotionGuard $makePropertyPromotionGuard,
         private readonly TypeComparator $typeComparator,
         private readonly ReflectionResolver $reflectionResolver,
-        private readonly PropertyPromotionRenamer $propertyPromotionRenamer
+        private readonly PropertyPromotionRenamer $propertyPromotionRenamer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/Php80/Rector/FunctionLike/MixedTypeRector.php

@@ -14,6 +14,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\PhpVersionFeature;
@@ -34,7 +35,8 @@ final class MixedTypeRector extends AbstractRector implements MinPhpVersionInter
     public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
         private readonly ClassChildAnalyzer $classChildAnalyzer,
-        private readonly ParamTagRemover $paramTagRemover
+        private readonly ParamTagRemover $paramTagRemover,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/Php80/Rector/Property/NestedAnnotationToAttributeRector.php

@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
@@ -49,6 +50,7 @@ public function __construct(
         private readonly NestedAttrGroupsFactory $nestedAttrGroupsFactory,
         private readonly UseNodesToAddCollector $useNodesToAddCollector,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Rector\AbstractRector;
@@ -33,6 +34,7 @@ final class RenameAnnotationRector extends AbstractRector implements Configurabl
     public function __construct(
         private readonly DocBlockTagReplacer $docBlockTagReplacer,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }
 

rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php

@@ -19,6 +19,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -46,7 +47,8 @@ final class AddParamTypeBasedOnPHPUnitDataProviderRector extends AbstractRector
 
     public function __construct(
         private readonly TypeFactory $typeFactory,
-        private readonly TestsNodeAnalyzer $testsNodeAnalyzer
+        private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php

@@ -23,6 +23,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Core\ValueObject\PhpVersion;
@@ -40,7 +41,8 @@ final class ReturnTypeFromStrictNewArrayRector extends AbstractScopeAwareRector
     public function __construct(
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
         private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard,
-        private readonly ReturnTypeInferer $returnTypeInferer
+        private readonly ReturnTypeInferer $returnTypeInferer,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 

rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php

@@ -21,6 +21,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -33,6 +34,7 @@ final class StrictStringParamConcatRector extends AbstractRector
 {
     public function __construct(
         private readonly ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }