diff --git a/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php b/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php index 1fb171cd175..2ff77733b54 100644 --- a/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php @@ -16,6 +16,7 @@ use Rector\Core\ValueObject\MethodName; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use ReflectionMethod; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -27,6 +28,11 @@ */ final class MakeInheritedMethodVisibilitySameAsParentRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Make method visibility same as parent one', [ diff --git a/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php b/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php index a8ca9963fb7..de7a41c39b2 100644 --- a/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php +++ b/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php @@ -7,6 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Stmt\ClassConst; use Rector\Core\Rector\AbstractRector; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -17,6 +18,11 @@ */ final class DowngradeClassConstantVisibilityRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition( diff --git a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector.php b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector.php index 2b4efc4526e..707962d6197 100644 --- a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector.php +++ b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector.php @@ -9,6 +9,7 @@ use PhpParser\Node\Stmt\Trait_; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -17,6 +18,11 @@ */ final class DowngradeAbstractPrivateMethodInTraitRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition( diff --git a/rules/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector.php b/rules/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector.php index b7f7d7ecb92..1d945c292eb 100644 --- a/rules/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector.php +++ b/rules/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector.php @@ -7,6 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Stmt\ClassConst; use Rector\Core\Rector\AbstractRector; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -17,6 +18,11 @@ */ final class DowngradeFinalizePublicClassConstantRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Remove final from class constants', [ diff --git a/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php b/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php index c2e70b87a97..c10e46e6502 100644 --- a/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php +++ b/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php @@ -10,6 +10,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode; use Rector\Core\Rector\AbstractRector; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -25,6 +26,11 @@ final class DowngradeReadonlyPropertyRector extends AbstractRector */ private const TAGNAME = 'readonly'; + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + /** * @return array> */ diff --git a/rules/Generics/Rector/ClassMethod/GenericClassMethodParamRector.php b/rules/Generics/Rector/ClassMethod/GenericClassMethodParamRector.php index d98083fc2c5..9b55d7201b7 100644 --- a/rules/Generics/Rector/ClassMethod/GenericClassMethodParamRector.php +++ b/rules/Generics/Rector/ClassMethod/GenericClassMethodParamRector.php @@ -18,6 +18,7 @@ use Rector\Generics\ValueObject\GenericClassMethodParam; use Rector\Naming\Naming\PropertyNaming; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; use Webmozart\Assert\Assert; @@ -39,7 +40,8 @@ final class GenericClassMethodParamRector extends AbstractRector implements Conf public function __construct( private PhpDocTypeChanger $phpDocTypeChanger, - private PropertyNaming $propertyNaming + private PropertyNaming $propertyNaming, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/Php52/Rector/Property/VarToPublicPropertyRector.php b/rules/Php52/Rector/Property/VarToPublicPropertyRector.php index 37dbf524124..beef6289301 100644 --- a/rules/Php52/Rector/Property/VarToPublicPropertyRector.php +++ b/rules/Php52/Rector/Property/VarToPublicPropertyRector.php @@ -8,6 +8,7 @@ use PhpParser\Node\Stmt\Property; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -17,6 +18,11 @@ */ final class VarToPublicPropertyRector extends AbstractRector implements MinPhpVersionInterface { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function provideMinPhpVersion(): int { return PhpVersionFeature::PROPERTY_MODIFIER; diff --git a/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php b/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php index 4b99e1e5acd..709d7324add 100644 --- a/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php +++ b/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php @@ -8,6 +8,7 @@ use PhpParser\Node\Stmt\ClassConst; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -19,6 +20,11 @@ */ final class PublicConstantVisibilityRector extends AbstractRector implements MinPhpVersionInterface { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition( diff --git a/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php b/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php index d901c2b72c3..69d95a9af9e 100644 --- a/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php +++ b/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php @@ -8,6 +8,7 @@ use PhpParser\Node\Stmt\ClassMethod; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -17,6 +18,11 @@ */ final class FinalPrivateToPrivateVisibilityRector extends AbstractRector implements MinPhpVersionInterface { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function provideMinPhpVersion(): int { return PhpVersionFeature::NO_FINAL_PRIVATE; diff --git a/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php b/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php index 0679e2ed2c3..9b642a3e143 100644 --- a/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php +++ b/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php @@ -9,6 +9,7 @@ use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\MethodName; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -18,6 +19,11 @@ */ final class SetStateToStaticRector extends AbstractRector implements MinPhpVersionInterface { + public function __construct( + private VisibilityManipulator $visibilityManipulator + ) { + } + public function provideMinPhpVersion(): int { return PhpVersionFeature::STATIC_VISIBILITY_SET_STATE; diff --git a/rules/Php81/Rector/ClassConst/FinalizePublicClassConstantRector.php b/rules/Php81/Rector/ClassConst/FinalizePublicClassConstantRector.php index ee29b375ce2..6f6f0a3d2ba 100644 --- a/rules/Php81/Rector/ClassConst/FinalizePublicClassConstantRector.php +++ b/rules/Php81/Rector/ClassConst/FinalizePublicClassConstantRector.php @@ -8,6 +8,7 @@ use PhpParser\Node\Stmt\ClassConst; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -19,6 +20,11 @@ */ final class FinalizePublicClassConstantRector extends AbstractRector implements MinPhpVersionInterface { + public function __construct( + private VisibilityManipulator $visibilityManipulator + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Add final to constants that', [ diff --git a/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php b/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php index a4c3291e657..db8318b5751 100644 --- a/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php +++ b/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php @@ -10,6 +10,7 @@ use Rector\Core\NodeManipulator\PropertyManipulator; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -22,7 +23,8 @@ final class ReadOnlyPropertyRector extends AbstractRector implements MinPhpVersionInterface { public function __construct( - private PropertyManipulator $propertyManipulator + private PropertyManipulator $propertyManipulator, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php b/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php index 1870bd12c10..8e92d34daac 100644 --- a/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php @@ -11,6 +11,7 @@ use Rector\PhpSpecToPHPUnit\Naming\PhpSpecRenaming; use Rector\PhpSpecToPHPUnit\PHPUnitTypeDeclarationDecorator; use Rector\PhpSpecToPHPUnit\Rector\AbstractPhpSpecToPHPUnitRector; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; /** * @see \Rector\Tests\PhpSpecToPHPUnit\Rector\Variable\PhpSpecToPHPUnitRector\PhpSpecToPHPUnitRectorTest @@ -19,7 +20,8 @@ final class PhpSpecMethodToPHPUnitMethodRector extends AbstractPhpSpecToPHPUnitR { public function __construct( private PHPUnitTypeDeclarationDecorator $phpUnitTypeDeclarationDecorator, - private PhpSpecRenaming $phpSpecRenaming + private PhpSpecRenaming $phpSpecRenaming, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php index 804f0c666d1..d240b931cc0 100644 --- a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php +++ b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php @@ -10,6 +10,7 @@ use PHPStan\Reflection\ClassReflection; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Privatization\VisibilityGuard\ClassMethodVisibilityGuard; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -20,7 +21,8 @@ final class PrivatizeFinalClassMethodRector extends AbstractRector { public function __construct( - private ClassMethodVisibilityGuard $classMethodVisibilityGuard + private ClassMethodVisibilityGuard $classMethodVisibilityGuard, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php b/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php index 867d594c09c..ea67f6cbf9c 100644 --- a/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php +++ b/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php @@ -13,6 +13,7 @@ use Rector\Core\Rector\AbstractRector; use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -39,7 +40,8 @@ final class FinalizeClassesWithoutChildrenRector extends AbstractRector public function __construct( private ClassAnalyzer $classAnalyzer, - private FamilyRelationsAnalyzer $familyRelationsAnalyzer + private FamilyRelationsAnalyzer $familyRelationsAnalyzer, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php b/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php index 1ac5a79f1db..0e9999c8e5f 100644 --- a/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php +++ b/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php @@ -11,6 +11,7 @@ use PHPStan\Reflection\ClassReflection; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -19,6 +20,11 @@ */ final class PrivatizeFinalClassPropertyRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Change property to private if possible', [ diff --git a/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php b/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php index 14f9f0ac15f..7d5e145ca10 100644 --- a/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php +++ b/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php @@ -14,6 +14,7 @@ use PHPStan\Type\ObjectType; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Privatization\VisibilityGuard\ClassMethodVisibilityGuard; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -24,7 +25,8 @@ final class LocallyCalledStaticMethodToNonStaticRector extends AbstractRector { public function __construct( - private ClassMethodVisibilityGuard $classMethodVisibilityGuard + private ClassMethodVisibilityGuard $classMethodVisibilityGuard, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php b/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php index 7a31aeac3c8..ea718ac7825 100644 --- a/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php +++ b/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php @@ -13,6 +13,7 @@ use Rector\Core\Configuration\Option; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\PackageBuilder\Parameter\ParameterProvider; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -27,8 +28,10 @@ final class DesiredPropertyClassMethodTypeToDynamicRector extends AbstractRector */ private array $staticObjectTypes = []; - public function __construct(ParameterProvider $parameterProvider) - { + public function __construct( + ParameterProvider $parameterProvider, + private VisibilityManipulator $visibilityManipulator, + ) { $typesToRemoveStaticFrom = $parameterProvider->provideArrayParameter(Option::TYPES_TO_REMOVE_STATIC_FROM); foreach ($typesToRemoveStaticFrom as $typeToRemoveStaticFrom) { $this->staticObjectTypes[] = new ObjectType($typeToRemoveStaticFrom); diff --git a/rules/Restoration/Rector/Class_/RemoveFinalFromEntityRector.php b/rules/Restoration/Rector/Class_/RemoveFinalFromEntityRector.php index b334a6395ec..c4323b40a9e 100644 --- a/rules/Restoration/Rector/Class_/RemoveFinalFromEntityRector.php +++ b/rules/Restoration/Rector/Class_/RemoveFinalFromEntityRector.php @@ -7,6 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Stmt\Class_; use Rector\Core\Rector\AbstractRector; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -15,6 +16,11 @@ */ final class RemoveFinalFromEntityRector extends AbstractRector { + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Remove final from Doctrine entities', [ diff --git a/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php b/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php index eecfab3beed..c1fe2459552 100644 --- a/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php +++ b/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php @@ -10,6 +10,7 @@ use Rector\Core\NodeAnalyzer\ClassAnalyzer; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\MethodName; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Transform\NodeAnalyzer\SingletonClassMethodAnalyzer; use Rector\Transform\ValueObject\PropertyAndClassMethodName; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; @@ -25,7 +26,8 @@ final class ChangeSingletonToServiceRector extends AbstractRector { public function __construct( private SingletonClassMethodAnalyzer $singletonClassMethodAnalyzer, - private ClassAnalyzer $classAnalyzer + private ClassAnalyzer $classAnalyzer, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php b/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php index fa8185c140f..2e7edc554da 100644 --- a/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php +++ b/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php @@ -9,6 +9,7 @@ use Rector\Core\Contract\Rector\ConfigurableRectorInterface; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\Visibility; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Visibility\ValueObject\ChangeConstantVisibility; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -29,6 +30,11 @@ final class ChangeConstantVisibilityRector extends AbstractRector implements Con */ private array $classConstantVisibilityChanges = []; + public function __construct( + private VisibilityManipulator $visibilityManipulator, + ) { + } + public function getRuleDefinition(): RuleDefinition { return new RuleDefinition( diff --git a/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php b/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php index 728cbe51a9c..08b36bc407a 100644 --- a/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php +++ b/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php @@ -12,6 +12,7 @@ use Rector\Core\ValueObject\Visibility; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Visibility\ValueObject\ChangeMethodVisibility; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -33,7 +34,8 @@ final class ChangeMethodVisibilityRector extends AbstractRector implements Confi private array $methodVisibilities = []; public function __construct( - private ParentClassScopeResolver $parentClassScopeResolver + private ParentClassScopeResolver $parentClassScopeResolver, + private VisibilityManipulator $visibilityManipulator, ) { } diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php index c97ba65a993..eddd606776f 100644 --- a/src/Rector/AbstractRector.php +++ b/src/Rector/AbstractRector.php @@ -88,8 +88,6 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn protected NodeFactory $nodeFactory; - protected VisibilityManipulator $visibilityManipulator; - protected ValueResolver $valueResolver; protected BetterNodeFinder $betterNodeFinder; @@ -172,7 +170,6 @@ public function autowireAbstractRector( $this->nodeNameResolver = $nodeNameResolver; $this->nodeTypeResolver = $nodeTypeResolver; $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->visibilityManipulator = $visibilityManipulator; $this->nodeFactory = $nodeFactory; $this->phpDocInfoFactory = $phpDocInfoFactory; $this->symfonyStyle = $symfonyStyle;