From 76f411989335943502ddfafa3c869a76b4c55ce4 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 10 May 2021 02:05:20 +0200 Subject: [PATCH 1/6] bump workflow version to PHP 8 --- phpstan.neon | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/phpstan.neon b/phpstan.neon index 6bfd903c6e4..c13df8f7a25 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -494,6 +494,15 @@ parameters: - message: '#Function "function_exists\(\)" cannot be used/left in the code#' path: src/functions/node_helper.php +<<<<<<< HEAD +<<<<<<< HEAD # temporary out of order after rector-src extract - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' +======= +>>>>>>> 5288d92bc (bump workflow version to PHP 8) +======= + + # temporary out of order after rector-src extract + - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' +>>>>>>> 8f4d07170 (skip static error) From 2ae6ab2c2fdd8775c944cb2846b654a2b7a70c07 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 10 May 2021 12:07:44 +0200 Subject: [PATCH 2/6] [PHP 8] Use promoted properties --- .../Comment/CommentsMerger.php | 11 +-- .../PhpDoc/DoctrineAnnotationTagValueNode.php | 9 +-- .../PhpDocInfo/PhpDocInfo.php | 57 ++------------- .../PhpDocInfo/PhpDocInfoFactory.php | 57 ++------------- .../PhpDocInfo/TokenIteratorFactory.php | 18 ++--- .../PhpDocManipulator/PhpDocClassRenamer.php | 11 +-- .../PhpDocManipulator/PhpDocTypeChanger.php | 24 +------ .../PropertyDocBlockManipulator.php | 11 +-- .../VarAnnotationManipulator.php | 18 ++--- .../BetterPhpDocParser/PhpDocNodeMapper.php | 33 ++------- .../ChangedPhpDocNodeTraverserFactory.php | 11 +-- .../ArrayTypePhpDocNodeVisitor.php | 11 +-- .../CallableTypePhpDocNodeVisitor.php | 11 +-- .../IntersectionTypeNodePhpDocNodeVisitor.php | 11 +-- .../ParamPhpDocNodeVisitor.php | 11 +-- .../TemplatePhpDocNodeVisitor.php | 16 +---- .../UnionTypeNodePhpDocNodeVisitor.php | 16 +---- .../PhpDocParser/BetterPhpDocParser.php | 16 +---- .../PhpDocParser/BetterTypeParser.php | 8 +-- .../PhpDocParser/ClassAnnotationMatcher.php | 11 +-- .../DoctrineAnnotationDecorator.php | 40 ++--------- .../StaticDoctrineAnnotationParser.php | 18 ++--- .../ArrayParser.php | 11 +-- .../PlainValueParser.php | 16 +---- .../ValueObject/AroundSpaces.php | 18 ++--- .../AbstractValuesAwareNode.php | 25 ++----- .../SpacingAwareTemplateTagValueNode.php | 14 ++-- .../Type/BracketsAwareUnionTypeNode.php | 13 ++-- .../CachedFileInfoFilterAndReporter.php | 24 +------ packages/Caching/Cache/NetteCacheFactory.php | 18 ++--- .../Caching/Detector/ChangedFilesDetector.php | 18 ++--- .../Caching/FileSystem/DependencyResolver.php | 32 ++------- packages/Caching/UnchangedFilesFilter.php | 11 +-- .../Annotation/RectorsChangelogResolver.php | 11 +-- .../Collector/RectorChangeCollector.php | 16 +---- .../Output/ConsoleOutputFormatter.php | 24 +------ .../Output/JsonOutputFormatter.php | 24 +------ .../ValueObject/RectorWithLineChange.php | 18 ++--- .../ValueObjectFactory/ErrorFactory.php | 11 +-- .../ValueObjectFactory/FileDiffFactory.php | 18 ++--- packages/Comments/CommentRemover.php | 11 +-- .../Comments/NodeDocBlock/DocBlockUpdater.php | 11 +-- .../NodeAnalyzer/ClassChildAnalyzer.php | 11 +-- .../NodeAnalyzer/PropertyUsageAnalyzer.php | 32 ++------- .../Reflection/FamilyRelationsAnalyzer.php | 18 ++--- .../EditorConfigIdiosyncraticParser.php | 11 +-- packages/FileFormatter/FileFormatter.php | 27 ++----- .../Formatter/JsonFileFormatter.php | 11 +-- .../Formatter/XmlFileFormatter.php | 11 +-- .../ValueObject/EditorConfigConfiguration.php | 25 ++----- .../Parser/FileInfoParser.php | 18 ++--- .../ValueObject/AddedFileWithNodes.php | 18 ++--- .../AddedFileWithNodesFactory.php | 40 ++--------- .../ArrayCallableMethodReferenceAnalyzer.php | 11 +-- .../NodeCollector/NodeRepository.php | 56 ++------------- .../NodeCollector/ParsedNodeCollector.php | 24 +------ .../ParsedPropertyFetchNodeCollector.php | 18 ++--- .../NodeVisitor/NodeCollectorNodeVisitor.php | 24 +------ .../Reflection/MethodReflectionProvider.php | 24 +------ packages/NodeCollector/StaticAnalyzer.php | 18 ++--- .../ValueObject/ArrayCallable.php | 18 ++--- .../Error/InvalidNameNodeReporter.php | 16 +---- .../NodeNameResolver/NodeNameResolver.php | 35 ++------- .../NodeNameResolver/FuncCallNameResolver.php | 11 +-- .../NodeNameResolver/NameNameResolver.php | 11 +-- packages/NodeNestingScope/ContextAnalyzer.php | 18 ++--- .../NodeFinder/ScopeAwareNodeFinder.php | 11 +-- .../NodeNestingScope/ParentScopeFinder.php | 11 +-- .../ScopeNestingComparator.php | 18 ++--- packages/NodeRemoval/AssignRemover.php | 32 ++------- packages/NodeRemoval/ClassMethodRemover.php | 24 +------ packages/NodeRemoval/NodeRemover.php | 16 +---- .../NodeScopeAndMetadataDecorator.php | 64 +++-------------- .../GenericClassStringTypeCorrector.php | 11 +-- .../PregMatchTypeCorrector.php | 32 ++------- .../NodeTypeResolver/NodeTypeResolver.php | 57 ++------------- .../NodeTypeResolver/NameTypeResolver.php | 11 +-- .../NodeTypeResolver/NewTypeResolver.php | 24 +------ .../NodeTypeResolver/ParamTypeResolver.php | 24 +------ .../PropertyFetchTypeResolver.php | 24 +------ .../StaticCallMethodCallTypeResolver.php | 18 ++--- .../NodeTypeResolver/TraitTypeResolver.php | 11 +-- .../NodeTypeResolver/VariableTypeResolver.php | 24 +------ .../NodeVisitor/FileNodeVisitor.php | 11 +-- .../NodeVisitor/NamespaceNodeVisitor.php | 11 +-- .../Collector/TraitNodeScopeCollector.php | 11 +-- .../RemoveDeepChainMethodCallNodeVisitor.php | 12 ++-- .../Scope/PHPStanNodeScopeResolver.php | 72 +++---------------- .../PHPStan/Scope/ScopeFactory.php | 11 +-- .../PHPStan/Type/TypeFactory.php | 11 +-- .../NodeAnalyzer/DocBlockClassRenamer.php | 16 +---- .../NodeAnalyzer/DocBlockNameImporter.php | 16 +---- .../NodeAnalyzer/DocBlockTagReplacer.php | 11 +-- .../ImportingPhpDocNodeTraverserFactory.php | 11 +-- .../RenamingPhpDocNodeVisitorFactory.php | 11 +-- .../UnderscorePhpDocNodeTraverserFactory.php | 11 +-- .../PhpDoc/PhpDocTypeRenamer.php | 16 +---- .../ClassRenamePhpDocNodeVisitor.php | 18 ++--- .../NameImportingPhpDocNodeVisitor.php | 32 ++------- .../UnderscoreRenamePhpDocNodeVisitor.php | 11 +-- ...orBetterReflectionSourceLocatorFactory.php | 16 +---- .../TypeAnalyzer/ArrayTypeAnalyzer.php | 24 +------ .../TypeAnalyzer/CountableTypeAnalyzer.php | 25 +------ .../TypeAnalyzer/StringTypeAnalyzer.php | 11 +-- .../TypeComparator/ArrayTypeComparator.php | 11 +-- .../TypeComparator/TypeComparator.php | 48 ++----------- .../ValueObject/OldToNewType.php | 18 ++--- .../UnionTypeCommonTypeNarrower.php | 16 +---- .../TypeMapper/BooleanTypeMapper.php | 11 +-- .../TypeMapper/ClosureTypeMapper.php | 11 +-- .../TypeMapper/FloatTypeMapper.php | 11 +-- .../TypeMapper/IntegerTypeMapper.php | 11 +-- .../ObjectWithoutClassTypeMapper.php | 11 +-- .../TypeMapper/StaticTypeMapper.php | 11 +-- .../TypeMapper/StringTypeMapper.php | 11 +-- .../TypeWithClassNameTypeMapper.php | 11 +-- .../TypeMapper/UnionTypeMapper.php | 40 ++--------- .../TypeMapper/VoidTypeMapper.php | 11 +-- .../Utils/TypeUnwrapper.php | 11 +-- .../ValueObject/UnionTypeAnalysis.php | 25 ++----- .../Application/PostFileProcessor.php | 24 +------ .../Collector/NodesToAddCollector.php | 24 +------ .../Collector/NodesToRemoveCollector.php | 40 ++--------- .../Collector/PropertyToAddCollector.php | 18 ++--- .../Collector/UseNodesToAddCollector.php | 11 +-- .../DependencyInjection/PropertyAdder.php | 40 ++--------- .../NodeAnalyzer/NetteInjectDetector.php | 24 +------ .../Rector/ClassRenamingPostRector.php | 18 ++--- .../Rector/NameImportingPostRector.php | 56 ++------------- .../Rector/NodeAddingPostRector.php | 11 +-- .../Rector/NodeRemovingPostRector.php | 24 +------ .../Rector/NodeToReplacePostRector.php | 11 +-- .../Rector/PropertyAddingPostRector.php | 40 ++--------- .../PostRector/Rector/UseAddingPostRector.php | 48 ++----------- .../ValueObject/PropertyMetadata.php | 25 ++----- .../Guard/VariableToConstantGuard.php | 24 +------ .../NodeAnalyzer/ReadExprAnalyzer.php | 11 +-- .../ReadWritePropertyAnalyzer.php | 32 ++------- .../ReadWrite/NodeFinder/NodeUsageFinder.php | 40 ++--------- .../PropertyFetchReadNodeAnalyzer.php | 18 ++--- .../VariableReadNodeAnalyzer.php | 24 +------ .../Mapper/PhpParserNodeMapper.php | 11 +-- .../PhpDoc/PhpDocTypeMapper.php | 18 ++--- .../PhpDocParser/IdentifierTypeMapper.php | 24 +------ .../PhpDocParser/UnionTypeMapper.php | 11 +-- .../PhpParser/IdentifierNodeMapper.php | 11 +-- .../PhpParser/NameNodeMapper.php | 16 +---- .../PhpParser/NullableTypeNodeMapper.php | 11 +-- .../PhpParser/UnionTypeNodeMapper.php | 11 +-- .../StaticTypeMapper/StaticTypeMapper.php | 33 ++------- .../ValueObject/Type/AliasedObjectType.php | 13 ++-- .../ValueObject/Type/ShortenedObjectType.php | 13 ++-- .../Testing/TestingParser/TestingParser.php | 32 ++------- .../InputFilePathWithExpectedFile.php | 18 ++--- .../ClassMethodParamVendorLockResolver.php | 11 +-- .../ClassMethodReturnTypeOverrideGuard.php | 32 ++------- .../ClassMethodReturnVendorLockResolver.php | 16 +---- .../ClassMethodVendorLockResolver.php | 16 +---- .../PropertyTypeVendorLockResolver.php | 16 +---- .../PropertyVisibilityVendorLockResolver.php | 18 ++--- packages/VendorLocker/VendorLockResolver.php | 32 ++------- phpstan.neon | 8 +++ rector.php | 3 + .../NodeAnalyzer/ArgumentAddingScope.php | 11 +-- .../ClassMethod/ArgumentAdderRector.php | 11 +-- rules/Arguments/ValueObject/ArgumentAdder.php | 56 ++------------- .../ArgumentDefaultValueReplacer.php | 39 ++-------- .../ValueObject/SwapFuncCallArguments.php | 18 ++--- .../ValueObject/ValueObjectWrapArg.php | 32 ++------- .../Analyzer/ValueObjectClassAnalyzer.php | 40 ++--------- .../MoveEntitiesToEntityDirectoryRector.php | 16 +---- .../MoveServicesBySuffixToDirectoryRector.php | 16 +---- ...lueObjectsToValueObjectDirectoryRector.php | 16 +---- ...acesToContractNamespaceDirectoryRector.php | 16 +---- rules/CodeQuality/CompactConverter.php | 11 +-- .../MethodCallToVariableNameResolver.php | 18 ++--- .../CallableClassMethodMatcher.php | 32 ++------- .../NodeAnalyzer/ClassLikeAnalyzer.php | 11 +-- .../CodeQuality/NodeAnalyzer/ForAnalyzer.php | 32 ++------- .../NodeAnalyzer/ForeachAnalyzer.php | 40 ++--------- .../NodeAnalyzer/LocalPropertyAnalyzer.php | 64 +++-------------- .../NodeFactory/AnonymousFunctionFactory.php | 24 +------ .../NodeFactory/MissingPropertiesFactory.php | 18 ++--- .../NodeFactory/PropertyTypeDecorator.php | 32 ++------- .../NodeManipulator/ExprBoolCaster.php | 32 ++------- .../ArrayThisCallToThisMethodCallRector.php | 16 +---- ...ableThisArrayToAnonymousFunctionRector.php | 16 +---- .../Rector/Assign/CombinedAssignRector.php | 11 +-- .../SimplifyEmptyArrayCheckRector.php | 11 +-- .../SimplifyDeMorganBinaryRector.php | 11 +-- .../ThrowWithPreviousExceptionRector.php | 11 +-- .../DateTimeToDateTimeInterfaceRector.php | 11 +-- .../ClassMethod/NarrowUnionTypeDocRector.php | 11 +-- .../CompleteDynamicPropertiesRector.php | 40 ++--------- .../Expression/InlineIfToExplicitIfRector.php | 11 +-- .../ForRepeatedCountToOwnVariableRector.php | 11 +-- .../Rector/For_/ForToForeachRector.php | 32 ++------- ...hItemsAssignToEmptyArrayToAssignRector.php | 18 ++--- .../Foreach_/ForeachToInArrayRector.php | 18 ++--- .../SimplifyForeachToCoalescingRector.php | 11 +-- ...serFuncWithArrowFunctionToInlineRector.php | 11 +-- .../FuncCall/CompactToVariablesRector.php | 24 +------ .../FuncCall/SimplifyRegexPatternRector.php | 11 +-- 203 files changed, 727 insertions(+), 3407 deletions(-) diff --git a/packages/BetterPhpDocParser/Comment/CommentsMerger.php b/packages/BetterPhpDocParser/Comment/CommentsMerger.php index a1fcb1dbddf..acc40af4bda 100644 --- a/packages/BetterPhpDocParser/Comment/CommentsMerger.php +++ b/packages/BetterPhpDocParser/Comment/CommentsMerger.php @@ -11,14 +11,9 @@ final class CommentsMerger { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser) - { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; + public function __construct( + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser + ) { } /** diff --git a/packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php b/packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php index 57bd4a9b42d..a9b7261f442 100644 --- a/packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php +++ b/packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php @@ -8,23 +8,16 @@ final class DoctrineAnnotationTagValueNode extends AbstractValuesAwareNode { - /** - * @var string - */ - private $annotationClass; - /** * @param array $values */ public function __construct( - // values - string $annotationClass, + private string $annotationClass, ?string $originalContent = null, array $values = [], ?string $silentKey = null ) { $this->hasChanged = true; - $this->annotationClass = $annotationClass; parent::__construct($values, $originalContent, $silentKey); } diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php index 17db248dc84..5a49f4a7c1a 100644 --- a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php +++ b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php @@ -53,73 +53,30 @@ final class PhpDocInfo */ private $isSingleLine = false; - /** - * @var PhpDocNode - */ - private $phpDocNode; - /** * @var PhpDocNode */ private $originalPhpDocNode; - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var \PhpParser\Node - */ - private $node; - /** * @var bool */ private $hasChanged = false; - /** - * @var AnnotationNaming - */ - private $annotationNaming; - - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - /** - * @var BetterTokenIterator - */ - private $betterTokenIterator; - public function __construct( - PhpDocNode $phpDocNode, - BetterTokenIterator $betterTokenIterator, - StaticTypeMapper $staticTypeMapper, - \PhpParser\Node $node, - AnnotationNaming $annotationNaming, - CurrentNodeProvider $currentNodeProvider, - RectorChangeCollector $rectorChangeCollector + private PhpDocNode $phpDocNode, + private BetterTokenIterator $betterTokenIterator, + private StaticTypeMapper $staticTypeMapper, + private \PhpParser\Node $node, + private AnnotationNaming $annotationNaming, + private CurrentNodeProvider $currentNodeProvider, + private RectorChangeCollector $rectorChangeCollector ) { - $this->phpDocNode = $phpDocNode; - $this->betterTokenIterator = $betterTokenIterator; $this->originalPhpDocNode = clone $phpDocNode; if (! $betterTokenIterator->containsTokenType(Lexer::TOKEN_PHPDOC_EOL)) { $this->isSingleLine = true; } - - $this->staticTypeMapper = $staticTypeMapper; - $this->node = $node; - $this->annotationNaming = $annotationNaming; - $this->currentNodeProvider = $currentNodeProvider; - $this->rectorChangeCollector = $rectorChangeCollector; } public function addPhpDocTagNode(PhpDocChildNode $phpDocChildNode): void diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php index df39fb8b288..e59cdc3bff4 100644 --- a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php +++ b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php @@ -8,7 +8,6 @@ use PhpParser\Node; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode; use PHPStan\PhpDocParser\Lexer\Lexer; -use PHPStan\PhpDocParser\Parser\PhpDocParser; use Rector\BetterPhpDocParser\Annotation\AnnotationNaming; use Rector\BetterPhpDocParser\Contract\PhpDocNodeFactoryInterface; use Rector\BetterPhpDocParser\PhpDocNodeMapper; @@ -23,62 +22,20 @@ final class PhpDocInfoFactory { - /** - * @var PhpDocParser - */ - private $betterPhpDocParser; - - /** - * @var Lexer - */ - private $lexer; - - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocNodeMapper - */ - private $phpDocNodeMapper; - - /** - * @var AnnotationNaming - */ - private $annotationNaming; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - /** * @var array */ private $phpDocInfosByObjectHash = []; public function __construct( - PhpDocNodeMapper $phpDocNodeMapper, - CurrentNodeProvider $currentNodeProvider, - Lexer $lexer, - BetterPhpDocParser $betterPhpDocParser, - StaticTypeMapper $staticTypeMapper, - AnnotationNaming $annotationNaming, - RectorChangeCollector $rectorChangeCollector + private PhpDocNodeMapper $phpDocNodeMapper, + private CurrentNodeProvider $currentNodeProvider, + private Lexer $lexer, + private BetterPhpDocParser $betterPhpDocParser, + private StaticTypeMapper $staticTypeMapper, + private AnnotationNaming $annotationNaming, + private RectorChangeCollector $rectorChangeCollector ) { - $this->betterPhpDocParser = $betterPhpDocParser; - $this->lexer = $lexer; - $this->currentNodeProvider = $currentNodeProvider; - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocNodeMapper = $phpDocNodeMapper; - $this->annotationNaming = $annotationNaming; - $this->rectorChangeCollector = $rectorChangeCollector; } public function createFromNodeOrEmpty(Node $node): PhpDocInfo diff --git a/packages/BetterPhpDocParser/PhpDocInfo/TokenIteratorFactory.php b/packages/BetterPhpDocParser/PhpDocInfo/TokenIteratorFactory.php index 06a7ce90d2d..b3360d12f58 100644 --- a/packages/BetterPhpDocParser/PhpDocInfo/TokenIteratorFactory.php +++ b/packages/BetterPhpDocParser/PhpDocInfo/TokenIteratorFactory.php @@ -16,20 +16,10 @@ final class TokenIteratorFactory */ private const INDEX = 'index'; - /** - * @var Lexer - */ - private $lexer; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - - public function __construct(Lexer $lexer, PrivatesAccessor $privatesAccessor) - { - $this->lexer = $lexer; - $this->privatesAccessor = $privatesAccessor; + public function __construct( + private Lexer $lexer, + private PrivatesAccessor $privatesAccessor + ) { } public function create(string $content): BetterTokenIterator diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php index eff9045fbfd..8a9cbcf1677 100644 --- a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php +++ b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php @@ -12,14 +12,9 @@ final class PhpDocClassRenamer { - /** - * @var ClassAnnotationMatcher - */ - private $classAnnotationMatcher; - - public function __construct(ClassAnnotationMatcher $classAnnotationMatcher) - { - $this->classAnnotationMatcher = $classAnnotationMatcher; + public function __construct( + private ClassAnnotationMatcher $classAnnotationMatcher + ) { } /** diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php index 9ff8b421e87..c450e26f88e 100644 --- a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php +++ b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php @@ -18,29 +18,11 @@ final class PhpDocTypeChanger { - /** - * @var TypeComparator - */ - private $typeComparator; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var ParamPhpDocNodeFactory - */ - private $paramPhpDocNodeFactory; - public function __construct( - StaticTypeMapper $staticTypeMapper, - TypeComparator $typeComparator, - ParamPhpDocNodeFactory $paramPhpDocNodeFactory + private StaticTypeMapper $staticTypeMapper, + private TypeComparator $typeComparator, + private ParamPhpDocNodeFactory $paramPhpDocNodeFactory ) { - $this->typeComparator = $typeComparator; - $this->staticTypeMapper = $staticTypeMapper; - $this->paramPhpDocNodeFactory = $paramPhpDocNodeFactory; } public function changeVarType(PhpDocInfo $phpDocInfo, Type $newType): void diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php b/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php index 931fca23861..b27681a63a9 100644 --- a/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php +++ b/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php @@ -12,14 +12,9 @@ final class PropertyDocBlockManipulator { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory + ) { } /** diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php b/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php index 0264035684b..a0996f004cf 100644 --- a/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php +++ b/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php @@ -17,20 +17,10 @@ final class VarAnnotationManipulator { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory, PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory, + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function decorateNodeWithInlineVarType( diff --git a/packages/BetterPhpDocParser/PhpDocNodeMapper.php b/packages/BetterPhpDocParser/PhpDocNodeMapper.php index 075dbcda9cd..538586e9160 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeMapper.php +++ b/packages/BetterPhpDocParser/PhpDocNodeMapper.php @@ -8,7 +8,6 @@ use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface; use Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider; use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator; -use Symplify\SimplePhpDocParser\Contract\PhpDocNodeVisitorInterface; use Symplify\SimplePhpDocParser\PhpDocNodeTraverser; use Symplify\SimplePhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor; use Symplify\SimplePhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor; @@ -18,39 +17,15 @@ */ final class PhpDocNodeMapper { - /** - * @var PhpDocNodeVisitorInterface[] - */ - private $phpDocNodeVisitors = []; - - /** - * @var CurrentTokenIteratorProvider - */ - private $currentTokenIteratorProvider; - - /** - * @var ParentConnectingPhpDocNodeVisitor - */ - private $parentConnectingPhpDocNodeVisitor; - - /** - * @var CloningPhpDocNodeVisitor - */ - private $cloningPhpDocNodeVisitor; - /** * @param BasePhpDocNodeVisitorInterface[] $phpDocNodeVisitors */ public function __construct( - CurrentTokenIteratorProvider $currentTokenIteratorProvider, - ParentConnectingPhpDocNodeVisitor $parentConnectingPhpDocNodeVisitor, - CloningPhpDocNodeVisitor $cloningPhpDocNodeVisitor, - array $phpDocNodeVisitors + private CurrentTokenIteratorProvider $currentTokenIteratorProvider, + private ParentConnectingPhpDocNodeVisitor $parentConnectingPhpDocNodeVisitor, + private CloningPhpDocNodeVisitor $cloningPhpDocNodeVisitor, + private array $phpDocNodeVisitors ) { - $this->phpDocNodeVisitors = $phpDocNodeVisitors; - $this->currentTokenIteratorProvider = $currentTokenIteratorProvider; - $this->parentConnectingPhpDocNodeVisitor = $parentConnectingPhpDocNodeVisitor; - $this->cloningPhpDocNodeVisitor = $cloningPhpDocNodeVisitor; } public function transform(PhpDocNode $phpDocNode, BetterTokenIterator $betterTokenIterator): void diff --git a/packages/BetterPhpDocParser/PhpDocNodeTraverser/ChangedPhpDocNodeTraverserFactory.php b/packages/BetterPhpDocParser/PhpDocNodeTraverser/ChangedPhpDocNodeTraverserFactory.php index 04a69328c6f..a8fa2c1ca11 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeTraverser/ChangedPhpDocNodeTraverserFactory.php +++ b/packages/BetterPhpDocParser/PhpDocNodeTraverser/ChangedPhpDocNodeTraverserFactory.php @@ -9,14 +9,9 @@ final class ChangedPhpDocNodeTraverserFactory { - /** - * @var ChangedPhpDocNodeVisitor - */ - private $changedPhpDocNodeVisitor; - - public function __construct(ChangedPhpDocNodeVisitor $changedPhpDocNodeVisitor) - { - $this->changedPhpDocNodeVisitor = $changedPhpDocNodeVisitor; + public function __construct( + private ChangedPhpDocNodeVisitor $changedPhpDocNodeVisitor + ) { } public function create(): PhpDocNodeTraverser diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/ArrayTypePhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/ArrayTypePhpDocNodeVisitor.php index 9c6ad74cb73..81c0bcd9022 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/ArrayTypePhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/ArrayTypePhpDocNodeVisitor.php @@ -13,14 +13,9 @@ final class ArrayTypePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - - public function __construct(AttributeMirrorer $attributeMirrorer) - { - $this->attributeMirrorer = $attributeMirrorer; + public function __construct( + private AttributeMirrorer $attributeMirrorer + ) { } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/CallableTypePhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/CallableTypePhpDocNodeVisitor.php index fa5f3badcb1..450bdb1beb7 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/CallableTypePhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/CallableTypePhpDocNodeVisitor.php @@ -13,14 +13,9 @@ final class CallableTypePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - - public function __construct(AttributeMirrorer $attributeMirrorer) - { - $this->attributeMirrorer = $attributeMirrorer; + public function __construct( + private AttributeMirrorer $attributeMirrorer + ) { } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/IntersectionTypeNodePhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/IntersectionTypeNodePhpDocNodeVisitor.php index ce3442c11e1..a8261d817b0 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/IntersectionTypeNodePhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/IntersectionTypeNodePhpDocNodeVisitor.php @@ -13,14 +13,9 @@ final class IntersectionTypeNodePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - - public function __construct(AttributeMirrorer $attributeMirrorer) - { - $this->attributeMirrorer = $attributeMirrorer; + public function __construct( + private AttributeMirrorer $attributeMirrorer + ) { } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php index f781146fd50..20ce7a4693b 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php @@ -13,14 +13,9 @@ final class ParamPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - - public function __construct(AttributeMirrorer $attributeMirrorer) - { - $this->attributeMirrorer = $attributeMirrorer; + public function __construct( + private AttributeMirrorer $attributeMirrorer + ) { } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/TemplatePhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/TemplatePhpDocNodeVisitor.php index a8ce93aebe4..d4f9b740bc2 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/TemplatePhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/TemplatePhpDocNodeVisitor.php @@ -19,22 +19,10 @@ final class TemplatePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var CurrentTokenIteratorProvider - */ - private $currentTokenIteratorProvider; - - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - public function __construct( - CurrentTokenIteratorProvider $currentTokenIteratorProvider, - AttributeMirrorer $attributeMirrorer + private CurrentTokenIteratorProvider $currentTokenIteratorProvider, + private AttributeMirrorer $attributeMirrorer ) { - $this->currentTokenIteratorProvider = $currentTokenIteratorProvider; - $this->attributeMirrorer = $attributeMirrorer; } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/UnionTypeNodePhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/UnionTypeNodePhpDocNodeVisitor.php index d30bc2796c8..3064b1b29a5 100644 --- a/packages/BetterPhpDocParser/PhpDocNodeVisitor/UnionTypeNodePhpDocNodeVisitor.php +++ b/packages/BetterPhpDocParser/PhpDocNodeVisitor/UnionTypeNodePhpDocNodeVisitor.php @@ -19,22 +19,10 @@ final class UnionTypeNodePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface { - /** - * @var CurrentTokenIteratorProvider - */ - private $currentTokenIteratorProvider; - - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - public function __construct( - CurrentTokenIteratorProvider $currentTokenIteratorProvider, - AttributeMirrorer $attributeMirrorer + private CurrentTokenIteratorProvider $currentTokenIteratorProvider, + private AttributeMirrorer $attributeMirrorer ) { - $this->currentTokenIteratorProvider = $currentTokenIteratorProvider; - $this->attributeMirrorer = $attributeMirrorer; } public function enterNode(Node $node): ?Node diff --git a/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php b/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php index c19233965d6..e0ea0381d07 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php @@ -30,27 +30,15 @@ final class BetterPhpDocParser extends PhpDocParser */ private $privatesCaller; - /** - * @var DoctrineAnnotationDecorator - */ - private $doctrineAnnotationDecorator; - - /** - * @var TokenIteratorFactory - */ - private $tokenIteratorFactory; - public function __construct( TypeParser $typeParser, ConstExprParser $constExprParser, - TokenIteratorFactory $tokenIteratorFactory, - DoctrineAnnotationDecorator $doctrineAnnotationDecorator + private TokenIteratorFactory $tokenIteratorFactory, + private DoctrineAnnotationDecorator $doctrineAnnotationDecorator ) { parent::__construct($typeParser, $constExprParser); $this->privatesCaller = new PrivatesCaller(); - $this->doctrineAnnotationDecorator = $doctrineAnnotationDecorator; - $this->tokenIteratorFactory = $tokenIteratorFactory; } public function parse(TokenIterator $tokenIterator): PhpDocNode diff --git a/packages/BetterPhpDocParser/PhpDocParser/BetterTypeParser.php b/packages/BetterPhpDocParser/PhpDocParser/BetterTypeParser.php index 781ca697ecd..2f45c0039b8 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/BetterTypeParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/BetterTypeParser.php @@ -14,17 +14,11 @@ final class BetterTypeParser extends TypeParser { - /** - * @var TokenIteratorFactory - */ - private $tokenIteratorFactory; - public function __construct( - TokenIteratorFactory $tokenIteratorFactory, + private TokenIteratorFactory $tokenIteratorFactory, ?ConstExprParser $constExprParser = null ) { parent::__construct($constExprParser); - $this->tokenIteratorFactory = $tokenIteratorFactory; } public function parse(TokenIterator $tokenIterator): TypeNode diff --git a/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php b/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php index c1741da8d5f..f5e0e544888 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php +++ b/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php @@ -22,14 +22,9 @@ final class ClassAnnotationMatcher */ private $fullyQualifiedNameByHash = []; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function resolveTagFullyQualifiedName(string $tag, Node $node): string diff --git a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php index f4981bc1f81..0b24df9609e 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php +++ b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php @@ -22,43 +22,13 @@ final class DoctrineAnnotationDecorator { - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - - /** - * @var ClassAnnotationMatcher - */ - private $classAnnotationMatcher; - - /** - * @var StaticDoctrineAnnotationParser - */ - private $staticDoctrineAnnotationParser; - - /** - * @var TokenIteratorFactory - */ - private $tokenIteratorFactory; - - /** - * @var AttributeMirrorer - */ - private $attributeMirrorer; - public function __construct( - CurrentNodeProvider $currentNodeProvider, - ClassAnnotationMatcher $classAnnotationMatcher, - StaticDoctrineAnnotationParser $staticDoctrineAnnotationParser, - TokenIteratorFactory $tokenIteratorFactory, - AttributeMirrorer $attributeMirrorer + private CurrentNodeProvider $currentNodeProvider, + private ClassAnnotationMatcher $classAnnotationMatcher, + private StaticDoctrineAnnotationParser $staticDoctrineAnnotationParser, + private TokenIteratorFactory $tokenIteratorFactory, + private AttributeMirrorer $attributeMirrorer ) { - $this->currentNodeProvider = $currentNodeProvider; - $this->classAnnotationMatcher = $classAnnotationMatcher; - $this->staticDoctrineAnnotationParser = $staticDoctrineAnnotationParser; - $this->tokenIteratorFactory = $tokenIteratorFactory; - $this->attributeMirrorer = $attributeMirrorer; } public function decorate(PhpDocNode $phpDocNode): void diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php index ef3bb2bbdc2..34d1495f0e9 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php @@ -16,20 +16,10 @@ */ final class StaticDoctrineAnnotationParser { - /** - * @var PlainValueParser - */ - private $plainValueParser; - - /** - * @var ArrayParser - */ - private $arrayParser; - - public function __construct(PlainValueParser $plainValueParser, ArrayParser $arrayParser) - { - $this->plainValueParser = $plainValueParser; - $this->arrayParser = $arrayParser; + public function __construct( + private PlainValueParser $plainValueParser, + private ArrayParser $arrayParser + ) { } /** diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php index a1e8f4d38cc..6d3ef6c4d43 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php @@ -12,14 +12,9 @@ */ final class ArrayParser { - /** - * @var PlainValueParser - */ - private $plainValueParser; - - public function __construct(PlainValueParser $plainValueParser) - { - $this->plainValueParser = $plainValueParser; + public function __construct( + private PlainValueParser $plainValueParser + ) { } /** diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php index d7a702d6592..e1138c3913e 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php @@ -23,27 +23,15 @@ final class PlainValueParser */ private $staticDoctrineAnnotationParser; - /** - * @var ClassAnnotationMatcher - */ - private $classAnnotationMatcher; - - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - /** * @var ArrayParser */ private $arrayParser; public function __construct( - ClassAnnotationMatcher $classAnnotationMatcher, - CurrentNodeProvider $currentNodeProvider + private ClassAnnotationMatcher $classAnnotationMatcher, + private CurrentNodeProvider $currentNodeProvider ) { - $this->classAnnotationMatcher = $classAnnotationMatcher; - $this->currentNodeProvider = $currentNodeProvider; } /** diff --git a/packages/BetterPhpDocParser/ValueObject/AroundSpaces.php b/packages/BetterPhpDocParser/ValueObject/AroundSpaces.php index 663c1d96202..a2fe99460aa 100644 --- a/packages/BetterPhpDocParser/ValueObject/AroundSpaces.php +++ b/packages/BetterPhpDocParser/ValueObject/AroundSpaces.php @@ -6,20 +6,10 @@ final class AroundSpaces { - /** - * @var string - */ - private $closingSpace; - - /** - * @var string - */ - private $openingSpace; - - public function __construct(string $closingSpace, string $openingSpace) - { - $this->closingSpace = $closingSpace; - $this->openingSpace = $openingSpace; + public function __construct( + private string $closingSpace, + private string $openingSpace + ) { } public function getClosingSpace(): string diff --git a/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php b/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php index 426bd088b09..25da46ff5b3 100644 --- a/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php +++ b/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php @@ -20,34 +20,19 @@ abstract class AbstractValuesAwareNode implements PhpDocTagValueNode */ private const UNQUOTED_VALUE_REGEX = '#"(?.*?)"#'; - /** - * @var mixed[] - */ - protected $values = []; - /** * @var bool */ protected $hasChanged = false; - /** - * @var string|null - */ - protected $silentKey; - - /** - * @var string|null - */ - protected $originalContent; - /** * @param mixed[] $values */ - public function __construct(array $values = [], ?string $originalContent = null, ?string $silentKey = null) - { - $this->values = $values; - $this->originalContent = $originalContent; - $this->silentKey = $silentKey; + public function __construct( + protected array $values = [], + protected ?string $originalContent = null, + protected ?string $silentKey = null + ) { } public function removeValue(string $key): void diff --git a/packages/BetterPhpDocParser/ValueObject/PhpDoc/SpacingAwareTemplateTagValueNode.php b/packages/BetterPhpDocParser/ValueObject/PhpDoc/SpacingAwareTemplateTagValueNode.php index d78d7fc2189..b1b1042d0b3 100644 --- a/packages/BetterPhpDocParser/ValueObject/PhpDoc/SpacingAwareTemplateTagValueNode.php +++ b/packages/BetterPhpDocParser/ValueObject/PhpDoc/SpacingAwareTemplateTagValueNode.php @@ -9,15 +9,13 @@ final class SpacingAwareTemplateTagValueNode extends TemplateTagValueNode { - /** - * @var string - */ - private $preposition; - - public function __construct(string $name, ?TypeNode $typeNode, string $description, string $preposition) - { + public function __construct( + string $name, + ?TypeNode $typeNode, + string $description, + private string $preposition + ) { parent::__construct($name, $typeNode, $description); - $this->preposition = $preposition; } public function __toString(): string diff --git a/packages/BetterPhpDocParser/ValueObject/Type/BracketsAwareUnionTypeNode.php b/packages/BetterPhpDocParser/ValueObject/Type/BracketsAwareUnionTypeNode.php index 532b575500f..6118e642c18 100644 --- a/packages/BetterPhpDocParser/ValueObject/Type/BracketsAwareUnionTypeNode.php +++ b/packages/BetterPhpDocParser/ValueObject/Type/BracketsAwareUnionTypeNode.php @@ -9,19 +9,14 @@ final class BracketsAwareUnionTypeNode extends UnionTypeNode { - /** - * @var bool - */ - private $isWrappedInBrackets = false; - /** * @param TypeNode[] $types */ - public function __construct(array $types, bool $isWrappedInBrackets = false) - { + public function __construct( + array $types, + private bool $isWrappedInBrackets = false + ) { parent::__construct($types); - - $this->isWrappedInBrackets = $isWrappedInBrackets; } /** diff --git a/packages/Caching/Application/CachedFileInfoFilterAndReporter.php b/packages/Caching/Application/CachedFileInfoFilterAndReporter.php index f98a8e9b876..310b3cb140a 100644 --- a/packages/Caching/Application/CachedFileInfoFilterAndReporter.php +++ b/packages/Caching/Application/CachedFileInfoFilterAndReporter.php @@ -11,29 +11,11 @@ final class CachedFileInfoFilterAndReporter { - /** - * @var Configuration - */ - private $configuration; - - /** - * @var ChangedFilesDetector - */ - private $changedFilesDetector; - - /** - * @var UnchangedFilesFilter - */ - private $unchangedFilesFilter; - public function __construct( - Configuration $configuration, - ChangedFilesDetector $changedFilesDetector, - UnchangedFilesFilter $unchangedFilesFilter + private Configuration $configuration, + private ChangedFilesDetector $changedFilesDetector, + private UnchangedFilesFilter $unchangedFilesFilter ) { - $this->configuration = $configuration; - $this->changedFilesDetector = $changedFilesDetector; - $this->unchangedFilesFilter = $unchangedFilesFilter; } /** diff --git a/packages/Caching/Cache/NetteCacheFactory.php b/packages/Caching/Cache/NetteCacheFactory.php index dd97111629f..87f68dc7637 100644 --- a/packages/Caching/Cache/NetteCacheFactory.php +++ b/packages/Caching/Cache/NetteCacheFactory.php @@ -12,20 +12,10 @@ final class NetteCacheFactory { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - public function __construct(ParameterProvider $parameterProvider, SmartFileSystem $smartFileSystem) - { - $this->parameterProvider = $parameterProvider; - $this->smartFileSystem = $smartFileSystem; + public function __construct( + private ParameterProvider $parameterProvider, + private SmartFileSystem $smartFileSystem + ) { } public function create(): Cache diff --git a/packages/Caching/Detector/ChangedFilesDetector.php b/packages/Caching/Detector/ChangedFilesDetector.php index fee471647f2..6b157a6b25a 100644 --- a/packages/Caching/Detector/ChangedFilesDetector.php +++ b/packages/Caching/Detector/ChangedFilesDetector.php @@ -20,20 +20,10 @@ final class ChangedFilesDetector */ private const CONFIGURATION_HASH_KEY = 'configuration_hash'; - /** - * @var FileHashComputer - */ - private $fileHashComputer; - - /** - * @var Cache - */ - private $cache; - - public function __construct(FileHashComputer $fileHashComputer, Cache $cache) - { - $this->fileHashComputer = $fileHashComputer; - $this->cache = $cache; + public function __construct( + private FileHashComputer $fileHashComputer, + private Cache $cache + ) { } /** diff --git a/packages/Caching/FileSystem/DependencyResolver.php b/packages/Caching/FileSystem/DependencyResolver.php index 448dec8874d..1dfc4669006 100644 --- a/packages/Caching/FileSystem/DependencyResolver.php +++ b/packages/Caching/FileSystem/DependencyResolver.php @@ -13,36 +13,12 @@ final class DependencyResolver { - /** - * @var FileHelper - */ - private $fileHelper; - - /** - * @var PHPStanDependencyResolver - */ - private $phpStanDependencyResolver; - - /** - * @var NodeScopeResolver - */ - private $nodeScopeResolver; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - public function __construct( - NodeScopeResolver $nodeScopeResolver, - PHPStanDependencyResolver $phpStanDependencyResolver, - FileHelper $fileHelper, - PrivatesAccessor $privatesAccessor + private NodeScopeResolver $nodeScopeResolver, + private PHPStanDependencyResolver $phpStanDependencyResolver, + private FileHelper $fileHelper, + private PrivatesAccessor $privatesAccessor ) { - $this->fileHelper = $fileHelper; - $this->phpStanDependencyResolver = $phpStanDependencyResolver; - $this->nodeScopeResolver = $nodeScopeResolver; - $this->privatesAccessor = $privatesAccessor; } /** diff --git a/packages/Caching/UnchangedFilesFilter.php b/packages/Caching/UnchangedFilesFilter.php index 7036319da6b..a60fa56e64e 100644 --- a/packages/Caching/UnchangedFilesFilter.php +++ b/packages/Caching/UnchangedFilesFilter.php @@ -9,14 +9,9 @@ final class UnchangedFilesFilter { - /** - * @var ChangedFilesDetector - */ - private $changedFilesDetector; - - public function __construct(ChangedFilesDetector $changedFilesDetector) - { - $this->changedFilesDetector = $changedFilesDetector; + public function __construct( + private ChangedFilesDetector $changedFilesDetector + ) { } /** diff --git a/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php b/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php index 58924de97a4..eb3bc3e1f60 100644 --- a/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php +++ b/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php @@ -8,14 +8,9 @@ final class RectorsChangelogResolver { - /** - * @var AnnotationExtractor - */ - private $annotationExtractor; - - public function __construct(AnnotationExtractor $annotationExtractor) - { - $this->annotationExtractor = $annotationExtractor; + public function __construct( + private AnnotationExtractor $annotationExtractor + ) { } /** diff --git a/packages/ChangesReporting/Collector/RectorChangeCollector.php b/packages/ChangesReporting/Collector/RectorChangeCollector.php index 42fdda97274..412341adac7 100644 --- a/packages/ChangesReporting/Collector/RectorChangeCollector.php +++ b/packages/ChangesReporting/Collector/RectorChangeCollector.php @@ -14,22 +14,10 @@ final class RectorChangeCollector { - /** - * @var CurrentRectorProvider - */ - private $currentRectorProvider; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - public function __construct( - CurrentRectorProvider $currentRectorProvider, - CurrentFileProvider $currentFileProvider + private CurrentRectorProvider $currentRectorProvider, + private CurrentFileProvider $currentFileProvider ) { - $this->currentRectorProvider = $currentRectorProvider; - $this->currentFileProvider = $currentFileProvider; } public function notifyNodeFileInfo(Node $node): void diff --git a/packages/ChangesReporting/Output/ConsoleOutputFormatter.php b/packages/ChangesReporting/Output/ConsoleOutputFormatter.php index 9be6c44793b..9c7464ff25b 100644 --- a/packages/ChangesReporting/Output/ConsoleOutputFormatter.php +++ b/packages/ChangesReporting/Output/ConsoleOutputFormatter.php @@ -27,29 +27,11 @@ final class ConsoleOutputFormatter implements OutputFormatterInterface */ private const ON_LINE_REGEX = '# on line #'; - /** - * @var OutputStyleInterface - */ - private $outputStyle; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var RectorsChangelogResolver - */ - private $rectorsChangelogResolver; - public function __construct( - Configuration $configuration, - OutputStyleInterface $outputStyle, - RectorsChangelogResolver $rectorsChangelogResolver + private Configuration $configuration, + private OutputStyleInterface $outputStyle, + private RectorsChangelogResolver $rectorsChangelogResolver ) { - $this->outputStyle = $outputStyle; - $this->configuration = $configuration; - $this->rectorsChangelogResolver = $rectorsChangelogResolver; } public function report(ProcessResult $processResult): void diff --git a/packages/ChangesReporting/Output/JsonOutputFormatter.php b/packages/ChangesReporting/Output/JsonOutputFormatter.php index efe4ce173c3..08e798d3bb5 100644 --- a/packages/ChangesReporting/Output/JsonOutputFormatter.php +++ b/packages/ChangesReporting/Output/JsonOutputFormatter.php @@ -18,29 +18,11 @@ final class JsonOutputFormatter implements OutputFormatterInterface */ public const NAME = 'json'; - /** - * @var Configuration - */ - private $configuration; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var RectorsChangelogResolver - */ - private $rectorsChangelogResolver; - public function __construct( - Configuration $configuration, - SmartFileSystem $smartFileSystem, - RectorsChangelogResolver $rectorsChangelogResolver + private Configuration $configuration, + private SmartFileSystem $smartFileSystem, + private RectorsChangelogResolver $rectorsChangelogResolver ) { - $this->configuration = $configuration; - $this->smartFileSystem = $smartFileSystem; - $this->rectorsChangelogResolver = $rectorsChangelogResolver; } public function getName(): string diff --git a/packages/ChangesReporting/ValueObject/RectorWithLineChange.php b/packages/ChangesReporting/ValueObject/RectorWithLineChange.php index 9d3bad5aa23..d2be90876e8 100644 --- a/packages/ChangesReporting/ValueObject/RectorWithLineChange.php +++ b/packages/ChangesReporting/ValueObject/RectorWithLineChange.php @@ -8,20 +8,10 @@ final class RectorWithLineChange { - /** - * @var int - */ - private $line; - - /** - * @var RectorInterface - */ - private $rector; - - public function __construct(RectorInterface $rector, int $line) - { - $this->rector = $rector; - $this->line = $line; + public function __construct( + private RectorInterface $rector, + private int $line + ) { } /** diff --git a/packages/ChangesReporting/ValueObjectFactory/ErrorFactory.php b/packages/ChangesReporting/ValueObjectFactory/ErrorFactory.php index 23483684317..c9416d9ddb5 100644 --- a/packages/ChangesReporting/ValueObjectFactory/ErrorFactory.php +++ b/packages/ChangesReporting/ValueObjectFactory/ErrorFactory.php @@ -10,14 +10,9 @@ final class ErrorFactory { - /** - * @var ExceptionCorrector - */ - private $exceptionCorrector; - - public function __construct(ExceptionCorrector $exceptionCorrector) - { - $this->exceptionCorrector = $exceptionCorrector; + public function __construct( + private ExceptionCorrector $exceptionCorrector + ) { } public function createAutoloadError(AnalysedCodeException $analysedCodeException): RectorError diff --git a/packages/ChangesReporting/ValueObjectFactory/FileDiffFactory.php b/packages/ChangesReporting/ValueObjectFactory/FileDiffFactory.php index e712b0284ca..a458ad9312e 100644 --- a/packages/ChangesReporting/ValueObjectFactory/FileDiffFactory.php +++ b/packages/ChangesReporting/ValueObjectFactory/FileDiffFactory.php @@ -11,20 +11,10 @@ final class FileDiffFactory { - /** - * @var DefaultDiffer - */ - private $defaultDiffer; - - /** - * @var ConsoleDiffer - */ - private $consoleDiffer; - - public function __construct(DefaultDiffer $defaultDiffer, ConsoleDiffer $consoleDiffer) - { - $this->defaultDiffer = $defaultDiffer; - $this->consoleDiffer = $consoleDiffer; + public function __construct( + private DefaultDiffer $defaultDiffer, + private ConsoleDiffer $consoleDiffer + ) { } public function createFileDiff(File $file, string $oldContent, string $newContent): FileDiff diff --git a/packages/Comments/CommentRemover.php b/packages/Comments/CommentRemover.php index ba1bd20d2a7..7f361f61330 100644 --- a/packages/Comments/CommentRemover.php +++ b/packages/Comments/CommentRemover.php @@ -15,14 +15,9 @@ */ final class CommentRemover { - /** - * @var CommentRemovingNodeTraverser - */ - private $commentRemovingNodeTraverser; - - public function __construct(CommentRemovingNodeTraverser $commentRemovingNodeTraverser) - { - $this->commentRemovingNodeTraverser = $commentRemovingNodeTraverser; + public function __construct( + private CommentRemovingNodeTraverser $commentRemovingNodeTraverser + ) { } /** diff --git a/packages/Comments/NodeDocBlock/DocBlockUpdater.php b/packages/Comments/NodeDocBlock/DocBlockUpdater.php index 57f9f2ef07d..7acf85b6e32 100644 --- a/packages/Comments/NodeDocBlock/DocBlockUpdater.php +++ b/packages/Comments/NodeDocBlock/DocBlockUpdater.php @@ -18,14 +18,9 @@ final class DocBlockUpdater */ public const SPACE_OR_ASTERISK_REGEX = '#(\s|\*)+#'; - /** - * @var PhpDocInfoPrinter - */ - private $phpDocInfoPrinter; - - public function __construct(PhpDocInfoPrinter $phpDocInfoPrinter) - { - $this->phpDocInfoPrinter = $phpDocInfoPrinter; + public function __construct( + private PhpDocInfoPrinter $phpDocInfoPrinter + ) { } public function updateNodeWithPhpDocInfo(Node $node): void diff --git a/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php b/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php index bb9876af78b..c2f58500f39 100644 --- a/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php +++ b/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php @@ -10,14 +10,9 @@ final class ClassChildAnalyzer { - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - - public function __construct(FamilyRelationsAnalyzer $familyRelationsAnalyzer) - { - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; + public function __construct( + private FamilyRelationsAnalyzer $familyRelationsAnalyzer + ) { } public function hasChildClassMethod(ClassReflection $classReflection, string $methodName): bool diff --git a/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php b/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php index add7a2a9a6c..7ba4f68139a 100644 --- a/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php +++ b/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php @@ -18,36 +18,12 @@ final class PropertyUsageAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - - /** - * @var NodeRepository - */ - private $nodeRepository; - public function __construct( - BetterNodeFinder $betterNodeFinder, - FamilyRelationsAnalyzer $familyRelationsAnalyzer, - NodeNameResolver $nodeNameResolver, - NodeRepository $nodeRepository + private BetterNodeFinder $betterNodeFinder, + private FamilyRelationsAnalyzer $familyRelationsAnalyzer, + private NodeNameResolver $nodeNameResolver, + private NodeRepository $nodeRepository ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; - $this->nodeRepository = $nodeRepository; } public function isPropertyFetchedInChildClass(Property $property): bool diff --git a/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php b/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php index 9c3df2998ea..241e574ef3b 100644 --- a/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php +++ b/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php @@ -10,20 +10,10 @@ final class FamilyRelationsAnalyzer { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - - public function __construct(ReflectionProvider $reflectionProvider, PrivatesAccessor $privatesAccessor) - { - $this->reflectionProvider = $reflectionProvider; - $this->privatesAccessor = $privatesAccessor; + public function __construct( + private ReflectionProvider $reflectionProvider, + private PrivatesAccessor $privatesAccessor + ) { } /** diff --git a/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php b/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php index 62c3b0e2558..8a3ff3b8469 100644 --- a/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php +++ b/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php @@ -15,14 +15,9 @@ */ final class EditorConfigIdiosyncraticParser implements EditorConfigParserInterface { - /** - * @var EditorConfig - */ - private $editorConfig; - - public function __construct(EditorConfig $editorConfig) - { - $this->editorConfig = $editorConfig; + public function __construct( + private EditorConfig $editorConfig + ) { } public function extractConfigurationForFile( diff --git a/packages/FileFormatter/FileFormatter.php b/packages/FileFormatter/FileFormatter.php index dcfcf4470d7..eab48607091 100644 --- a/packages/FileFormatter/FileFormatter.php +++ b/packages/FileFormatter/FileFormatter.php @@ -18,32 +18,15 @@ final class FileFormatter { - /** - * @var EditorConfigParserInterface - */ - private $editorConfigParser; - - /** - * @var FileFormatterInterface[] - */ - private $fileFormatters = []; - - /** - * @var ParameterProvider - */ - private $parameterProvider; - /** * @param FileFormatterInterface[] $fileFormatters */ public function __construct( - EditorConfigParserInterface $editorConfigParser, - ParameterProvider $parameterProvider, - array $fileFormatters = [] - ) { - $this->editorConfigParser = $editorConfigParser; - $this->fileFormatters = $fileFormatters; - $this->parameterProvider = $parameterProvider; + private EditorConfigParserInterface $editorConfigParser, + private ParameterProvider $parameterProvider, + private array $fileFormatters = [] + ) + { } /** diff --git a/packages/FileFormatter/Formatter/JsonFileFormatter.php b/packages/FileFormatter/Formatter/JsonFileFormatter.php index 9bec24eed04..ae9abea96c5 100644 --- a/packages/FileFormatter/Formatter/JsonFileFormatter.php +++ b/packages/FileFormatter/Formatter/JsonFileFormatter.php @@ -16,14 +16,9 @@ */ final class JsonFileFormatter implements FileFormatterInterface { - /** - * @var PrinterInterface - */ - private $jsonPrinter; - - public function __construct(PrinterInterface $jsonPrinter) - { - $this->jsonPrinter = $jsonPrinter; + public function __construct( + private PrinterInterface $jsonPrinter + ) { } public function supports(File $file): bool diff --git a/packages/FileFormatter/Formatter/XmlFileFormatter.php b/packages/FileFormatter/Formatter/XmlFileFormatter.php index 272ef825956..295a83eab37 100644 --- a/packages/FileFormatter/Formatter/XmlFileFormatter.php +++ b/packages/FileFormatter/Formatter/XmlFileFormatter.php @@ -16,14 +16,9 @@ */ final class XmlFileFormatter implements FileFormatterInterface { - /** - * @var Formatter - */ - private $xmlFormatter; - - public function __construct(Formatter $xmlFormatter) - { - $this->xmlFormatter = $xmlFormatter; + public function __construct( + private Formatter $xmlFormatter + ) { } public function supports(File $file): bool diff --git a/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php b/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php index 1400a713960..5c470b2b967 100644 --- a/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php +++ b/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php @@ -9,26 +9,11 @@ */ final class EditorConfigConfiguration { - /** - * @var NewLine - */ - private $newLine; - - /** - * @var bool - */ - private $insertFinalNewline = false; - - /** - * @var Indent - */ - private $indent; - - public function __construct(Indent $indent, NewLine $newLine, bool $insertFinalNewline) - { - $this->indent = $indent; - $this->newLine = $newLine; - $this->insertFinalNewline = $insertFinalNewline; + public function __construct( + private Indent $indent, + private NewLine $newLine, + private bool $insertFinalNewline + ) { } public function getNewLine(): string diff --git a/packages/FileSystemRector/Parser/FileInfoParser.php b/packages/FileSystemRector/Parser/FileInfoParser.php index 5e11eb7ec13..e3e739301e7 100644 --- a/packages/FileSystemRector/Parser/FileInfoParser.php +++ b/packages/FileSystemRector/Parser/FileInfoParser.php @@ -12,20 +12,10 @@ final class FileInfoParser { - /** - * @var Parser - */ - private $parser; - - /** - * @var NodeScopeAndMetadataDecorator - */ - private $nodeScopeAndMetadataDecorator; - - public function __construct(NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, Parser $parser) - { - $this->parser = $parser; - $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator; + public function __construct( + private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, + private Parser $parser + ) { } /** diff --git a/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php b/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php index 46ea21006ec..cb9df83a8b0 100644 --- a/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php +++ b/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php @@ -10,23 +10,13 @@ final class AddedFileWithNodes implements AddedFileInterface, FileWithNodesInterface { - /** - * @var string - */ - private $filePath; - - /** - * @var Node[] - */ - private $nodes = []; - /** * @param Node[] $nodes */ - public function __construct(string $filePath, array $nodes) - { - $this->filePath = $filePath; - $this->nodes = $nodes; + public function __construct( + private string $filePath, + private array $nodes + ) { } public function getFilePath(): string diff --git a/packages/FileSystemRector/ValueObjectFactory/AddedFileWithNodesFactory.php b/packages/FileSystemRector/ValueObjectFactory/AddedFileWithNodesFactory.php index fad1ba4d4ba..324abbb85bc 100644 --- a/packages/FileSystemRector/ValueObjectFactory/AddedFileWithNodesFactory.php +++ b/packages/FileSystemRector/ValueObjectFactory/AddedFileWithNodesFactory.php @@ -21,43 +21,13 @@ final class AddedFileWithNodesFactory { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var FileRelocationResolver - */ - private $fileRelocationResolver; - - /** - * @var CategoryNamespaceProvider - */ - private $categoryNamespaceProvider; - - /** - * @var RenamedClassesCollector - */ - private $renamedClassesCollector; - - /** - * @var FileInfoDeletionAnalyzer - */ - private $fileInfoDeletionAnalyzer; - public function __construct( - BetterNodeFinder $betterNodeFinder, - CategoryNamespaceProvider $categoryNamespaceProvider, - FileRelocationResolver $fileRelocationResolver, - RenamedClassesCollector $renamedClassesCollector, - FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer + private BetterNodeFinder $betterNodeFinder, + private CategoryNamespaceProvider $categoryNamespaceProvider, + private FileRelocationResolver $fileRelocationResolver, + private RenamedClassesCollector $renamedClassesCollector, + private FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->fileRelocationResolver = $fileRelocationResolver; - $this->categoryNamespaceProvider = $categoryNamespaceProvider; - $this->renamedClassesCollector = $renamedClassesCollector; - $this->fileInfoDeletionAnalyzer = $fileInfoDeletionAnalyzer; } public function createWithDesiredGroup( diff --git a/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodReferenceAnalyzer.php b/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodReferenceAnalyzer.php index 47aed0db03a..887a6cd13a7 100644 --- a/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodReferenceAnalyzer.php +++ b/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodReferenceAnalyzer.php @@ -15,14 +15,9 @@ final class ArrayCallableMethodReferenceAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/packages/NodeCollector/NodeCollector/NodeRepository.php b/packages/NodeCollector/NodeCollector/NodeRepository.php index aede5d9e45a..1734b1bbbe2 100644 --- a/packages/NodeCollector/NodeCollector/NodeRepository.php +++ b/packages/NodeCollector/NodeCollector/NodeRepository.php @@ -70,62 +70,20 @@ final class NodeRepository */ private $arrayCallablesByTypeAndMethod = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ArrayCallableMethodReferenceAnalyzer - */ - private $arrayCallableMethodReferenceAnalyzer; - - /** - * @var ParsedPropertyFetchNodeCollector - */ - private $parsedPropertyFetchNodeCollector; - - /** - * @var ParsedNodeCollector - */ - private $parsedNodeCollector; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - /** * @var array */ private $attributes = []; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - ArrayCallableMethodReferenceAnalyzer $arrayCallableMethodReferenceAnalyzer, - ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector, - NodeNameResolver $nodeNameResolver, - ParsedNodeCollector $parsedNodeCollector, - TypeUnwrapper $typeUnwrapper, - ReflectionProvider $reflectionProvider, - NodeTypeResolver $nodeTypeResolver + private ArrayCallableMethodReferenceAnalyzer $arrayCallableMethodReferenceAnalyzer, + private ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector, + private NodeNameResolver $nodeNameResolver, + private ParsedNodeCollector $parsedNodeCollector, + private TypeUnwrapper $typeUnwrapper, + private ReflectionProvider $reflectionProvider, + private NodeTypeResolver $nodeTypeResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->arrayCallableMethodReferenceAnalyzer = $arrayCallableMethodReferenceAnalyzer; - $this->parsedPropertyFetchNodeCollector = $parsedPropertyFetchNodeCollector; - $this->parsedNodeCollector = $parsedNodeCollector; - $this->typeUnwrapper = $typeUnwrapper; - $this->reflectionProvider = $reflectionProvider; - $this->nodeTypeResolver = $nodeTypeResolver; } public function collect(Node $node): void diff --git a/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php b/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php index 614894b9cfc..8a559846498 100644 --- a/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php +++ b/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php @@ -72,29 +72,11 @@ final class ParsedNodeCollector */ private $staticCalls = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - NodeNameResolver $nodeNameResolver, - ParentClassScopeResolver $parentClassScopeResolver, - ClassAnalyzer $classAnalyzer + private NodeNameResolver $nodeNameResolver, + private ParentClassScopeResolver $parentClassScopeResolver, + private ClassAnalyzer $classAnalyzer ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->parentClassScopeResolver = $parentClassScopeResolver; - $this->classAnalyzer = $classAnalyzer; } /** diff --git a/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php b/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php index 2f84d1f2e3c..f4ec706f07e 100644 --- a/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php +++ b/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php @@ -26,20 +26,10 @@ final class ParsedPropertyFetchNodeCollector */ private $propertyFetchesByTypeAndName = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver + ) { } public function collect(Node $node): void diff --git a/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php b/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php index 77079938e00..b56dfaa85ed 100644 --- a/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php +++ b/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php @@ -12,29 +12,11 @@ final class NodeCollectorNodeVisitor extends NodeVisitorAbstract { - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ParsedNodeCollector - */ - private $parsedNodeCollector; - - /** - * @var ParsedPropertyFetchNodeCollector - */ - private $parsedPropertyFetchNodeCollector; - public function __construct( - NodeRepository $nodeRepository, - ParsedNodeCollector $parsedNodeCollector, - ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector + private NodeRepository $nodeRepository, + private ParsedNodeCollector $parsedNodeCollector, + private ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector ) { - $this->nodeRepository = $nodeRepository; - $this->parsedNodeCollector = $parsedNodeCollector; - $this->parsedPropertyFetchNodeCollector = $parsedPropertyFetchNodeCollector; } public function enterNode(Node $node) diff --git a/packages/NodeCollector/Reflection/MethodReflectionProvider.php b/packages/NodeCollector/Reflection/MethodReflectionProvider.php index b1cefe0dff2..2fb3f5936ee 100644 --- a/packages/NodeCollector/Reflection/MethodReflectionProvider.php +++ b/packages/NodeCollector/Reflection/MethodReflectionProvider.php @@ -25,29 +25,11 @@ final class MethodReflectionProvider { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/packages/NodeCollector/StaticAnalyzer.php b/packages/NodeCollector/StaticAnalyzer.php index d49cfea9da2..1db3dba23ef 100644 --- a/packages/NodeCollector/StaticAnalyzer.php +++ b/packages/NodeCollector/StaticAnalyzer.php @@ -12,20 +12,10 @@ final class StaticAnalyzer { - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(NodeRepository $nodeRepository, ReflectionProvider $reflectionProvider) - { - $this->nodeRepository = $nodeRepository; - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private NodeRepository $nodeRepository, + private ReflectionProvider $reflectionProvider + ) { } public function isStaticMethod(string $methodName, string $className): bool diff --git a/packages/NodeCollector/ValueObject/ArrayCallable.php b/packages/NodeCollector/ValueObject/ArrayCallable.php index e503e074033..3a1413d471d 100644 --- a/packages/NodeCollector/ValueObject/ArrayCallable.php +++ b/packages/NodeCollector/ValueObject/ArrayCallable.php @@ -6,20 +6,10 @@ final class ArrayCallable { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - public function __construct(string $class, string $method) - { - $this->class = $class; - $this->method = $method; + public function __construct( + private string $class, + private string $method + ) { } public function getClass(): string diff --git a/packages/NodeNameResolver/Error/InvalidNameNodeReporter.php b/packages/NodeNameResolver/Error/InvalidNameNodeReporter.php index d4069b7ec45..70444a80d97 100644 --- a/packages/NodeNameResolver/Error/InvalidNameNodeReporter.php +++ b/packages/NodeNameResolver/Error/InvalidNameNodeReporter.php @@ -21,22 +21,10 @@ final class InvalidNameNodeReporter */ private const FILE = 'file'; - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - public function __construct( - CurrentFileProvider $currentFileProvider, - BetterStandardPrinter $betterStandardPrinter + private CurrentFileProvider $currentFileProvider, + private BetterStandardPrinter $betterStandardPrinter ) { - $this->currentFileProvider = $currentFileProvider; - $this->betterStandardPrinter = $betterStandardPrinter; } /** diff --git a/packages/NodeNameResolver/NodeNameResolver.php b/packages/NodeNameResolver/NodeNameResolver.php index d52324fdf4c..9604129d644 100644 --- a/packages/NodeNameResolver/NodeNameResolver.php +++ b/packages/NodeNameResolver/NodeNameResolver.php @@ -21,39 +21,16 @@ final class NodeNameResolver { - /** - * @var NodeNameResolverInterface[] - */ - private $nodeNameResolvers = []; - - /** - * @var RegexPatternDetector - */ - private $regexPatternDetector; - - /** - * @var ClassNaming - */ - private $classNaming; - - /** - * @var InvalidNameNodeReporter - */ - private $invalidNameNodeReporter; - /** * @param NodeNameResolverInterface[] $nodeNameResolvers */ public function __construct( - RegexPatternDetector $regexPatternDetector, - ClassNaming $classNaming, - InvalidNameNodeReporter $invalidNameNodeReporter, - array $nodeNameResolvers = [] - ) { - $this->regexPatternDetector = $regexPatternDetector; - $this->nodeNameResolvers = $nodeNameResolvers; - $this->classNaming = $classNaming; - $this->invalidNameNodeReporter = $invalidNameNodeReporter; + private RegexPatternDetector $regexPatternDetector, + private ClassNaming $classNaming, + private InvalidNameNodeReporter $invalidNameNodeReporter, + private array $nodeNameResolvers = [] + ) + { } /** diff --git a/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php b/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php index d32420d4632..d00ed5b3e0e 100644 --- a/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php +++ b/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php @@ -14,14 +14,9 @@ final class FuncCallNameResolver implements NodeNameResolverInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php b/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php index 63a50421c12..8f8e221ca84 100644 --- a/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php +++ b/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php @@ -13,14 +13,9 @@ final class NameNameResolver implements NodeNameResolverInterface { - /** - * @var FuncCallNameResolver - */ - private $funcCallNameResolver; - - public function __construct(FuncCallNameResolver $funcCallNameResolver) - { - $this->funcCallNameResolver = $funcCallNameResolver; + public function __construct( + private FuncCallNameResolver $funcCallNameResolver + ) { } /** diff --git a/packages/NodeNestingScope/ContextAnalyzer.php b/packages/NodeNestingScope/ContextAnalyzer.php index 4d552c19e2d..2f54deaad22 100644 --- a/packages/NodeNestingScope/ContextAnalyzer.php +++ b/packages/NodeNestingScope/ContextAnalyzer.php @@ -34,20 +34,10 @@ final class ContextAnalyzer */ private const LOOP_NODES = [For_::class, Foreach_::class, While_::class, Do_::class, Switch_::class]; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeTypeResolver $nodeTypeResolver) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeTypeResolver $nodeTypeResolver + ) { } public function isInLoop(Node $node): bool diff --git a/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php b/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php index 6af2b42fdcf..63bbaed44fc 100644 --- a/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php +++ b/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php @@ -15,14 +15,9 @@ final class ScopeAwareNodeFinder */ private $isBreakingNodeFoundFirst = false; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(BetterNodeFinder $betterNodeFinder) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/packages/NodeNestingScope/ParentScopeFinder.php b/packages/NodeNestingScope/ParentScopeFinder.php index 14fbb6932a3..ebbbf65e53d 100644 --- a/packages/NodeNestingScope/ParentScopeFinder.php +++ b/packages/NodeNestingScope/ParentScopeFinder.php @@ -14,14 +14,9 @@ final class ParentScopeFinder { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(BetterNodeFinder $betterNodeFinder) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/packages/NodeNestingScope/ScopeNestingComparator.php b/packages/NodeNestingScope/ScopeNestingComparator.php index 3826a6dcd3a..2a221d73ebd 100644 --- a/packages/NodeNestingScope/ScopeNestingComparator.php +++ b/packages/NodeNestingScope/ScopeNestingComparator.php @@ -16,25 +16,15 @@ final class ScopeNestingComparator { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - /** * @var Expr[] */ private $doubleIfBranchExprs = []; - public function __construct(BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeComparator = $nodeComparator; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeComparator $nodeComparator + ) { } public function areReturnScopeNested(Return_ $return, Node $secondNodeScopeNode): bool diff --git a/packages/NodeRemoval/AssignRemover.php b/packages/NodeRemoval/AssignRemover.php index 6a5a9e5587d..5a96a06978b 100644 --- a/packages/NodeRemoval/AssignRemover.php +++ b/packages/NodeRemoval/AssignRemover.php @@ -13,36 +13,12 @@ final class AssignRemover { - /** - * @var NodesToReplaceCollector - */ - private $nodesToReplaceCollector; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - /** - * @var NodeRemover - */ - private $nodeRemover; - - /** - * @var LivingCodeManipulator - */ - private $livingCodeManipulator; - public function __construct( - NodesToReplaceCollector $nodesToReplaceCollector, - RectorChangeCollector $rectorChangeCollector, - NodeRemover $nodeRemover, - LivingCodeManipulator $livingCodeManipulator + private NodesToReplaceCollector $nodesToReplaceCollector, + private RectorChangeCollector $rectorChangeCollector, + private NodeRemover $nodeRemover, + private LivingCodeManipulator $livingCodeManipulator ) { - $this->nodesToReplaceCollector = $nodesToReplaceCollector; - $this->rectorChangeCollector = $rectorChangeCollector; - $this->nodeRemover = $nodeRemover; - $this->livingCodeManipulator = $livingCodeManipulator; } public function removeAssignNode(Assign $assign): void diff --git a/packages/NodeRemoval/ClassMethodRemover.php b/packages/NodeRemoval/ClassMethodRemover.php index e84d49d5f74..6276b127878 100644 --- a/packages/NodeRemoval/ClassMethodRemover.php +++ b/packages/NodeRemoval/ClassMethodRemover.php @@ -15,29 +15,11 @@ final class ClassMethodRemover { - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var NodeRemover - */ - private $nodeRemover; - - /** - * @var LivingCodeManipulator - */ - private $livingCodeManipulator; - public function __construct( - NodeRepository $nodeRepository, - NodeRemover $nodeRemover, - LivingCodeManipulator $livingCodeManipulator + private NodeRepository $nodeRepository, + private NodeRemover $nodeRemover, + private LivingCodeManipulator $livingCodeManipulator ) { - $this->nodeRepository = $nodeRepository; - $this->nodeRemover = $nodeRemover; - $this->livingCodeManipulator = $livingCodeManipulator; } public function removeClassMethodAndUsages(ClassMethod $classMethod): void diff --git a/packages/NodeRemoval/NodeRemover.php b/packages/NodeRemoval/NodeRemover.php index 91bd4a7a2b1..6043e524a9c 100644 --- a/packages/NodeRemoval/NodeRemover.php +++ b/packages/NodeRemoval/NodeRemover.php @@ -20,22 +20,10 @@ final class NodeRemover { - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - public function __construct( - NodesToRemoveCollector $nodesToRemoveCollector, - RectorChangeCollector $rectorChangeCollector + private NodesToRemoveCollector $nodesToRemoveCollector, + private RectorChangeCollector $rectorChangeCollector ) { - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->rectorChangeCollector = $rectorChangeCollector; } public function removeNode(Node $node): void diff --git a/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php b/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php index bd43b5f2665..d238049bf10 100644 --- a/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php +++ b/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php @@ -21,64 +21,16 @@ final class NodeScopeAndMetadataDecorator { - /** - * @var PHPStanNodeScopeResolver - */ - private $phpStanNodeScopeResolver; - - /** - * @var CloningVisitor - */ - private $cloningVisitor; - - /** - * @var FunctionMethodAndClassNodeVisitor - */ - private $functionMethodAndClassNodeVisitor; - - /** - * @var NamespaceNodeVisitor - */ - private $namespaceNodeVisitor; - - /** - * @var StatementNodeVisitor - */ - private $statementNodeVisitor; - - /** - * @var NodeCollectorNodeVisitor - */ - private $nodeCollectorNodeVisitor; - - /** - * @var NodeConnectingVisitor - */ - private $nodeConnectingVisitor; - - /** - * @var FunctionLikeParamArgPositionNodeVisitor - */ - private $functionLikeParamArgPositionNodeVisitor; - public function __construct( - CloningVisitor $cloningVisitor, - FunctionMethodAndClassNodeVisitor $functionMethodAndClassNodeVisitor, - NamespaceNodeVisitor $namespaceNodeVisitor, - NodeCollectorNodeVisitor $nodeCollectorNodeVisitor, - PHPStanNodeScopeResolver $phpStanNodeScopeResolver, - StatementNodeVisitor $statementNodeVisitor, - NodeConnectingVisitor $nodeConnectingVisitor, - FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor + private CloningVisitor $cloningVisitor, + private FunctionMethodAndClassNodeVisitor $functionMethodAndClassNodeVisitor, + private NamespaceNodeVisitor $namespaceNodeVisitor, + private NodeCollectorNodeVisitor $nodeCollectorNodeVisitor, + private PHPStanNodeScopeResolver $phpStanNodeScopeResolver, + private StatementNodeVisitor $statementNodeVisitor, + private NodeConnectingVisitor $nodeConnectingVisitor, + private FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor ) { - $this->phpStanNodeScopeResolver = $phpStanNodeScopeResolver; - $this->cloningVisitor = $cloningVisitor; - $this->functionMethodAndClassNodeVisitor = $functionMethodAndClassNodeVisitor; - $this->namespaceNodeVisitor = $namespaceNodeVisitor; - $this->statementNodeVisitor = $statementNodeVisitor; - $this->nodeCollectorNodeVisitor = $nodeCollectorNodeVisitor; - $this->nodeConnectingVisitor = $nodeConnectingVisitor; - $this->functionLikeParamArgPositionNodeVisitor = $functionLikeParamArgPositionNodeVisitor; } /** diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php index 54a4a143806..8e521c7e615 100644 --- a/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php +++ b/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php @@ -13,14 +13,9 @@ final class GenericClassStringTypeCorrector { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function correct(Type $mainType): Type diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php index f960755bf24..198ad2592d5 100644 --- a/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php +++ b/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php @@ -19,36 +19,12 @@ final class PregMatchTypeCorrector { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ParentScopeFinder - */ - private $parentScopeFinder; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - ParentScopeFinder $parentScopeFinder, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private ParentScopeFinder $parentScopeFinder, + private NodeComparator $nodeComparator ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->parentScopeFinder = $parentScopeFinder; - $this->nodeComparator = $nodeComparator; } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php index b1549e89377..d9cba3a223f 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver.php @@ -57,70 +57,27 @@ final class NodeTypeResolver */ private $nodeTypeResolvers = []; - /** - * @var ObjectTypeSpecifier - */ - private $objectTypeSpecifier; - /** * @var ArrayTypeAnalyzer */ private $arrayTypeAnalyzer; - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - /** - * @var GenericClassStringTypeCorrector - */ - private $genericClassStringTypeCorrector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var HasOffsetTypeCorrector - */ - private $hasOffsetTypeCorrector; - - /** - * @var IdentifierTypeResolver - */ - private $identifierTypeResolver; - - /** - * @var RenamedClassesDataCollector - */ - private $renamedClassesDataCollector; - /** * @param NodeTypeResolverInterface[] $nodeTypeResolvers */ public function __construct( - ObjectTypeSpecifier $objectTypeSpecifier, - ClassAnalyzer $classAnalyzer, - GenericClassStringTypeCorrector $genericClassStringTypeCorrector, - ReflectionProvider $reflectionProvider, - HasOffsetTypeCorrector $hasOffsetTypeCorrector, - IdentifierTypeResolver $identifierTypeResolver, - RenamedClassesDataCollector $renamedClassesDataCollector, + private ObjectTypeSpecifier $objectTypeSpecifier, + private ClassAnalyzer $classAnalyzer, + private GenericClassStringTypeCorrector $genericClassStringTypeCorrector, + private ReflectionProvider $reflectionProvider, + private HasOffsetTypeCorrector $hasOffsetTypeCorrector, + private IdentifierTypeResolver $identifierTypeResolver, + private RenamedClassesDataCollector $renamedClassesDataCollector, array $nodeTypeResolvers ) { foreach ($nodeTypeResolvers as $nodeTypeResolver) { $this->addNodeTypeResolver($nodeTypeResolver); } - - $this->objectTypeSpecifier = $objectTypeSpecifier; - $this->classAnalyzer = $classAnalyzer; - $this->genericClassStringTypeCorrector = $genericClassStringTypeCorrector; - $this->reflectionProvider = $reflectionProvider; - $this->hasOffsetTypeCorrector = $hasOffsetTypeCorrector; - $this->identifierTypeResolver = $identifierTypeResolver; - $this->renamedClassesDataCollector = $renamedClassesDataCollector; } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php index 37ba464fa13..d6e7c29fbde 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php @@ -20,14 +20,9 @@ */ final class NameTypeResolver implements NodeTypeResolverInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php index 532326ab314..61f84452435 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php @@ -22,29 +22,11 @@ final class NewTypeResolver implements NodeTypeResolverInterface { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - /** - * @var UnionTypeFactory - */ - private $unionTypeFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - ClassAnalyzer $classAnalyzer, - UnionTypeFactory $unionTypeFactory + private NodeNameResolver $nodeNameResolver, + private ClassAnalyzer $classAnalyzer, + private UnionTypeFactory $unionTypeFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->classAnalyzer = $classAnalyzer; - $this->unionTypeFactory = $unionTypeFactory; } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/ParamTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/ParamTypeResolver.php index d6ca28cc298..861618b49b7 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/ParamTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/ParamTypeResolver.php @@ -28,16 +28,6 @@ */ final class ParamTypeResolver implements NodeTypeResolverInterface { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - /** * @var NodeTypeResolver */ @@ -48,19 +38,11 @@ final class ParamTypeResolver implements NodeTypeResolverInterface */ private $staticTypeMapper; - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - PhpDocInfoFactory $phpDocInfoFactory + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->phpDocInfoFactory = $phpDocInfoFactory; } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php index 157ac28f58c..c0f4193dbd8 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php @@ -29,29 +29,11 @@ final class PropertyFetchTypeResolver implements NodeTypeResolverInterface */ private $nodeTypeResolver; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var TraitNodeScopeCollector - */ - private $traitNodeScopeCollector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - NodeNameResolver $nodeNameResolver, - TraitNodeScopeCollector $traitNodeScopeCollector, - ReflectionProvider $reflectionProvider + private NodeNameResolver $nodeNameResolver, + private TraitNodeScopeCollector $traitNodeScopeCollector, + private ReflectionProvider $reflectionProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->traitNodeScopeCollector = $traitNodeScopeCollector; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php index 7bb6c844545..5ad8fbdc7ea 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php @@ -24,20 +24,10 @@ final class StaticCallMethodCallTypeResolver implements NodeTypeResolverInterfac */ private $nodeTypeResolver; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php index bd7b6673df0..a9ace551f28 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php @@ -18,14 +18,9 @@ */ final class TraitTypeResolver implements NodeTypeResolverInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php index 2944058d300..e95e91f4080 100644 --- a/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php +++ b/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php @@ -27,29 +27,11 @@ final class VariableTypeResolver implements NodeTypeResolverInterface */ private const PARENT_NODE_ATTRIBUTES = [AttributeKey::PARENT_NODE, AttributeKey::METHOD_NODE]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var TraitNodeScopeCollector - */ - private $traitNodeScopeCollector; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - TraitNodeScopeCollector $traitNodeScopeCollector, - PhpDocInfoFactory $phpDocInfoFactory + private NodeNameResolver $nodeNameResolver, + private TraitNodeScopeCollector $traitNodeScopeCollector, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->traitNodeScopeCollector = $traitNodeScopeCollector; - $this->phpDocInfoFactory = $phpDocInfoFactory; } /** diff --git a/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php b/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php index b8ca1a81289..a6b2d95063e 100644 --- a/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php +++ b/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php @@ -14,14 +14,9 @@ */ final class FileNodeVisitor extends NodeVisitorAbstract { - /** - * @var File - */ - private $file; - - public function __construct(File $file) - { - $this->file = $file; + public function __construct( + private File $file + ) { } /** diff --git a/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php b/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php index bbb05cb1e61..18f573aa1df 100644 --- a/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php +++ b/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php @@ -18,14 +18,9 @@ final class NamespaceNodeVisitor extends NodeVisitorAbstract */ private $useNodes = []; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(BetterNodeFinder $betterNodeFinder) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/packages/NodeTypeResolver/PHPStan/Collector/TraitNodeScopeCollector.php b/packages/NodeTypeResolver/PHPStan/Collector/TraitNodeScopeCollector.php index e18fa10b5ba..f7b62ac8a86 100644 --- a/packages/NodeTypeResolver/PHPStan/Collector/TraitNodeScopeCollector.php +++ b/packages/NodeTypeResolver/PHPStan/Collector/TraitNodeScopeCollector.php @@ -16,14 +16,9 @@ final class TraitNodeScopeCollector */ private $scopeByTraitNodeHash = []; - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - - public function __construct(BetterStandardPrinter $betterStandardPrinter) - { - $this->betterStandardPrinter = $betterStandardPrinter; + public function __construct( + private BetterStandardPrinter $betterStandardPrinter + ) { } public function addForTraitAndNode(string $traitName, Node $node, Scope $scope): void diff --git a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php index 4ca794186e0..2dc3766aa09 100644 --- a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php +++ b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php @@ -24,19 +24,15 @@ final class RemoveDeepChainMethodCallNodeVisitor extends NodeVisitorAbstract */ private $nestedChainMethodCallLimit; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - /** * @var Expression|null */ private $removingExpression; - public function __construct(BetterNodeFinder $betterNodeFinder, ParameterProvider $parameterProvider) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + ParameterProvider $parameterProvider + ) { $this->nestedChainMethodCallLimit = (int) $parameterProvider->provideParameter( Option::NESTED_CHAIN_METHOD_CALL_LIMIT ); diff --git a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php index bf1472914cc..9fc3b2187b5 100644 --- a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php +++ b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php @@ -45,71 +45,17 @@ final class PHPStanNodeScopeResolver */ private $dependentFiles = []; - /** - * @var NodeScopeResolver - */ - private $nodeScopeResolver; - - /** - * @var ScopeFactory - */ - private $scopeFactory; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var RemoveDeepChainMethodCallNodeVisitor - */ - private $removeDeepChainMethodCallNodeVisitor; - - /** - * @var TraitNodeScopeCollector - */ - private $traitNodeScopeCollector; - - /** - * @var DependencyResolver - */ - private $dependencyResolver; - - /** - * @var ChangedFilesDetector - */ - private $changedFilesDetector; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - public function __construct( - ChangedFilesDetector $changedFilesDetector, - Configuration $configuration, - DependencyResolver $dependencyResolver, - NodeScopeResolver $nodeScopeResolver, - ReflectionProvider $reflectionProvider, - RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, - ScopeFactory $scopeFactory, - SymfonyStyle $symfonyStyle, - TraitNodeScopeCollector $traitNodeScopeCollector + private ChangedFilesDetector $changedFilesDetector, + private Configuration $configuration, + private DependencyResolver $dependencyResolver, + private NodeScopeResolver $nodeScopeResolver, + private ReflectionProvider $reflectionProvider, + private RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, + private ScopeFactory $scopeFactory, + private SymfonyStyle $symfonyStyle, + private TraitNodeScopeCollector $traitNodeScopeCollector ) { - $this->scopeFactory = $scopeFactory; - $this->nodeScopeResolver = $nodeScopeResolver; - $this->reflectionProvider = $reflectionProvider; - $this->removeDeepChainMethodCallNodeVisitor = $removeDeepChainMethodCallNodeVisitor; - $this->traitNodeScopeCollector = $traitNodeScopeCollector; - $this->dependencyResolver = $dependencyResolver; - $this->changedFilesDetector = $changedFilesDetector; - $this->configuration = $configuration; - $this->symfonyStyle = $symfonyStyle; } /** diff --git a/packages/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php b/packages/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php index 436b441f58e..a5243b78168 100644 --- a/packages/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php +++ b/packages/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php @@ -11,14 +11,9 @@ final class ScopeFactory { - /** - * @var PHPStanScopeFactory - */ - private $phpStanScopeFactory; - - public function __construct(PHPStanScopeFactory $phpStanScopeFactory) - { - $this->phpStanScopeFactory = $phpStanScopeFactory; + public function __construct( + private PHPStanScopeFactory $phpStanScopeFactory + ) { } public function createFromFile(SmartFileInfo $fileInfo): MutatingScope diff --git a/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php b/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php index 65bf978ec9d..97a85357201 100644 --- a/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php +++ b/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php @@ -27,14 +27,9 @@ final class TypeFactory { - /** - * @var UnionTypeFactory - */ - private $unionTypeFactory; - - public function __construct(UnionTypeFactory $unionTypeFactory) - { - $this->unionTypeFactory = $unionTypeFactory; + public function __construct( + private UnionTypeFactory $unionTypeFactory + ) { } /** diff --git a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockClassRenamer.php b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockClassRenamer.php index d77836a7a21..10bb8218953 100644 --- a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockClassRenamer.php +++ b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockClassRenamer.php @@ -11,22 +11,10 @@ final class DocBlockClassRenamer { - /** - * @var ClassRenamePhpDocNodeVisitor - */ - private $classRenamePhpDocNodeVisitor; - - /** - * @var RenamingPhpDocNodeVisitorFactory - */ - private $renamingPhpDocNodeVisitorFactory; - public function __construct( - ClassRenamePhpDocNodeVisitor $classRenamePhpDocNodeVisitor, - RenamingPhpDocNodeVisitorFactory $renamingPhpDocNodeVisitorFactory + private ClassRenamePhpDocNodeVisitor $classRenamePhpDocNodeVisitor, + private RenamingPhpDocNodeVisitorFactory $renamingPhpDocNodeVisitorFactory ) { - $this->classRenamePhpDocNodeVisitor = $classRenamePhpDocNodeVisitor; - $this->renamingPhpDocNodeVisitorFactory = $renamingPhpDocNodeVisitorFactory; } /** diff --git a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php index c1ae2af1c10..8b65869faaa 100644 --- a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php +++ b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php @@ -11,22 +11,10 @@ final class DocBlockNameImporter { - /** - * @var NameImportingPhpDocNodeVisitor - */ - private $nameImportingPhpDocNodeVisitor; - - /** - * @var ImportingPhpDocNodeTraverserFactory - */ - private $importingPhpDocNodeTraverserFactory; - public function __construct( - NameImportingPhpDocNodeVisitor $nameImportingPhpDocNodeVisitor, - ImportingPhpDocNodeTraverserFactory $importingPhpDocNodeTraverserFactory + private NameImportingPhpDocNodeVisitor $nameImportingPhpDocNodeVisitor, + private ImportingPhpDocNodeTraverserFactory $importingPhpDocNodeTraverserFactory ) { - $this->nameImportingPhpDocNodeVisitor = $nameImportingPhpDocNodeVisitor; - $this->importingPhpDocNodeTraverserFactory = $importingPhpDocNodeTraverserFactory; } public function importNames(PhpDocNode $phpDocNode, Node $node): void diff --git a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockTagReplacer.php b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockTagReplacer.php index 75a443a3e81..d523305d64b 100644 --- a/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockTagReplacer.php +++ b/packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockTagReplacer.php @@ -11,14 +11,9 @@ final class DocBlockTagReplacer { - /** - * @var AnnotationNaming - */ - private $annotationNaming; - - public function __construct(AnnotationNaming $annotationNaming) - { - $this->annotationNaming = $annotationNaming; + public function __construct( + private AnnotationNaming $annotationNaming + ) { } public function replaceTagByAnother(PhpDocInfo $phpDocInfo, string $oldTag, string $newTag): void diff --git a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/ImportingPhpDocNodeTraverserFactory.php b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/ImportingPhpDocNodeTraverserFactory.php index 671e31d92fb..955df5174c1 100644 --- a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/ImportingPhpDocNodeTraverserFactory.php +++ b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/ImportingPhpDocNodeTraverserFactory.php @@ -9,14 +9,9 @@ final class ImportingPhpDocNodeTraverserFactory { - /** - * @var NameImportingPhpDocNodeVisitor - */ - private $nameImportingPhpDocNodeVisitor; - - public function __construct(NameImportingPhpDocNodeVisitor $nameImportingPhpDocNodeVisitor) - { - $this->nameImportingPhpDocNodeVisitor = $nameImportingPhpDocNodeVisitor; + public function __construct( + private NameImportingPhpDocNodeVisitor $nameImportingPhpDocNodeVisitor + ) { } public function create(): PhpDocNodeTraverser diff --git a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/RenamingPhpDocNodeVisitorFactory.php b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/RenamingPhpDocNodeVisitorFactory.php index 79e9055c21a..cec46781cbb 100644 --- a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/RenamingPhpDocNodeVisitorFactory.php +++ b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/RenamingPhpDocNodeVisitorFactory.php @@ -9,14 +9,9 @@ final class RenamingPhpDocNodeVisitorFactory { - /** - * @var ClassRenamePhpDocNodeVisitor - */ - private $classRenamePhpDocNodeVisitor; - - public function __construct(ClassRenamePhpDocNodeVisitor $classRenamePhpDocNodeVisitor) - { - $this->classRenamePhpDocNodeVisitor = $classRenamePhpDocNodeVisitor; + public function __construct( + private ClassRenamePhpDocNodeVisitor $classRenamePhpDocNodeVisitor + ) { } public function create(): PhpDocNodeTraverser diff --git a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/UnderscorePhpDocNodeTraverserFactory.php b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/UnderscorePhpDocNodeTraverserFactory.php index 2d03ca01267..3a0bbad45de 100644 --- a/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/UnderscorePhpDocNodeTraverserFactory.php +++ b/packages/NodeTypeResolver/PhpDoc/PhpDocNodeTraverser/UnderscorePhpDocNodeTraverserFactory.php @@ -9,14 +9,9 @@ final class UnderscorePhpDocNodeTraverserFactory { - /** - * @var UnderscoreRenamePhpDocNodeVisitor - */ - private $underscoreRenamePhpDocNodeVisitor; - - public function __construct(UnderscoreRenamePhpDocNodeVisitor $underscoreRenamePhpDocNodeVisitor) - { - $this->underscoreRenamePhpDocNodeVisitor = $underscoreRenamePhpDocNodeVisitor; + public function __construct( + private UnderscoreRenamePhpDocNodeVisitor $underscoreRenamePhpDocNodeVisitor + ) { } public function create(): PhpDocNodeTraverser diff --git a/packages/NodeTypeResolver/PhpDoc/PhpDocTypeRenamer.php b/packages/NodeTypeResolver/PhpDoc/PhpDocTypeRenamer.php index 55b0fea8c3f..cf2f518dd1d 100644 --- a/packages/NodeTypeResolver/PhpDoc/PhpDocTypeRenamer.php +++ b/packages/NodeTypeResolver/PhpDoc/PhpDocTypeRenamer.php @@ -12,22 +12,10 @@ final class PhpDocTypeRenamer { - /** - * @var UnderscoreRenamePhpDocNodeVisitor - */ - private $underscoreRenamePhpDocNodeVisitor; - - /** - * @var UnderscorePhpDocNodeTraverserFactory - */ - private $underscorePhpDocNodeTraverserFactory; - public function __construct( - UnderscorePhpDocNodeTraverserFactory $underscorePhpDocNodeTraverserFactory, - UnderscoreRenamePhpDocNodeVisitor $underscoreRenamePhpDocNodeVisitor + private UnderscorePhpDocNodeTraverserFactory $underscorePhpDocNodeTraverserFactory, + private UnderscoreRenamePhpDocNodeVisitor $underscoreRenamePhpDocNodeVisitor ) { - $this->underscoreRenamePhpDocNodeVisitor = $underscoreRenamePhpDocNodeVisitor; - $this->underscorePhpDocNodeTraverserFactory = $underscorePhpDocNodeTraverserFactory; } public function changeUnderscoreType( diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php index f873a38a2be..33fd993cb16 100644 --- a/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php +++ b/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php @@ -18,25 +18,15 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - /** * @var OldToNewType[] */ private $oldToNewTypes = []; - public function __construct(StaticTypeMapper $staticTypeMapper, CurrentNodeProvider $currentNodeProvider) - { - $this->staticTypeMapper = $staticTypeMapper; - $this->currentNodeProvider = $currentNodeProvider; + public function __construct( + private StaticTypeMapper $staticTypeMapper, + private CurrentNodeProvider $currentNodeProvider + ) { } public function beforeTraverse(Node $node): void diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php index 8fa31168229..8923d389bbf 100644 --- a/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php +++ b/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php @@ -20,41 +20,17 @@ final class NameImportingPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var ClassNameImportSkipper - */ - private $classNameImportSkipper; - - /** - * @var UseNodesToAddCollector - */ - private $useNodesToAddCollector; - /** * @var PhpParserNode|null */ private $currentPhpParserNode; public function __construct( - StaticTypeMapper $staticTypeMapper, - ParameterProvider $parameterProvider, - ClassNameImportSkipper $classNameImportSkipper, - UseNodesToAddCollector $useNodesToAddCollector + private StaticTypeMapper $staticTypeMapper, + private ParameterProvider $parameterProvider, + private ClassNameImportSkipper $classNameImportSkipper, + private UseNodesToAddCollector $useNodesToAddCollector ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->parameterProvider = $parameterProvider; - $this->classNameImportSkipper = $classNameImportSkipper; - $this->useNodesToAddCollector = $useNodesToAddCollector; } public function beforeTraverse(Node $node): void diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/UnderscoreRenamePhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/UnderscoreRenamePhpDocNodeVisitor.php index 951a2d114f2..db45035af77 100644 --- a/packages/NodeTypeResolver/PhpDocNodeVisitor/UnderscoreRenamePhpDocNodeVisitor.php +++ b/packages/NodeTypeResolver/PhpDocNodeVisitor/UnderscoreRenamePhpDocNodeVisitor.php @@ -15,11 +15,6 @@ final class UnderscoreRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - /** * @var PseudoNamespaceToNamespace|null */ @@ -30,9 +25,9 @@ final class UnderscoreRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor */ private $currentPhpParserNode; - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } public function beforeTraverse(Node $node): void diff --git a/packages/NodeTypeResolver/Reflection/BetterReflection/RectorBetterReflectionSourceLocatorFactory.php b/packages/NodeTypeResolver/Reflection/BetterReflection/RectorBetterReflectionSourceLocatorFactory.php index 44403158df8..724a62d9f20 100644 --- a/packages/NodeTypeResolver/Reflection/BetterReflection/RectorBetterReflectionSourceLocatorFactory.php +++ b/packages/NodeTypeResolver/Reflection/BetterReflection/RectorBetterReflectionSourceLocatorFactory.php @@ -11,22 +11,10 @@ final class RectorBetterReflectionSourceLocatorFactory { - /** - * @var BetterReflectionSourceLocatorFactory - */ - private $betterReflectionSourceLocatorFactory; - - /** - * @var IntermediateSourceLocator - */ - private $intermediateSourceLocator; - public function __construct( - BetterReflectionSourceLocatorFactory $betterReflectionSourceLocatorFactory, - IntermediateSourceLocator $intermediateSourceLocator + private BetterReflectionSourceLocatorFactory $betterReflectionSourceLocatorFactory, + private IntermediateSourceLocator $intermediateSourceLocator ) { - $this->betterReflectionSourceLocatorFactory = $betterReflectionSourceLocatorFactory; - $this->intermediateSourceLocator = $intermediateSourceLocator; } public function create(): MemoizingSourceLocator diff --git a/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php index f0a884ca809..1efda7acb70 100644 --- a/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php +++ b/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php @@ -26,29 +26,11 @@ final class ArrayTypeAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var PregMatchTypeCorrector - */ - private $pregMatchTypeCorrector; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - PregMatchTypeCorrector $pregMatchTypeCorrector + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private PregMatchTypeCorrector $pregMatchTypeCorrector ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->pregMatchTypeCorrector = $pregMatchTypeCorrector; - $this->nodeNameResolver = $nodeNameResolver; } public function isArrayType(Node $node): bool diff --git a/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php index aaf99fef858..2877e0ac49c 100644 --- a/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php +++ b/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php @@ -11,35 +11,16 @@ final class CountableTypeAnalyzer { - /** - * @var ArrayTypeAnalyzer - */ - private $arrayTypeAnalyzer; - - /** - * @var PregMatchTypeCorrector - */ - private $pregMatchTypeCorrector; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - /** * @var ObjectType[] */ private $countableObjectTypes = []; public function __construct( - ArrayTypeAnalyzer $arrayTypeAnalyzer, - NodeTypeResolver $nodeTypeResolver, - PregMatchTypeCorrector $pregMatchTypeCorrector + private ArrayTypeAnalyzer $arrayTypeAnalyzer, + private NodeTypeResolver $nodeTypeResolver, + private PregMatchTypeCorrector $pregMatchTypeCorrector ) { - $this->arrayTypeAnalyzer = $arrayTypeAnalyzer; - $this->pregMatchTypeCorrector = $pregMatchTypeCorrector; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->countableObjectTypes = [ new ObjectType('Countable'), new ObjectType('SimpleXMLElement'), diff --git a/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php index aea187fe1c4..f22dcf4a434 100644 --- a/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php +++ b/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php @@ -11,14 +11,9 @@ final class StringTypeAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function isStringOrUnionStringOnlyType(Node $node): bool diff --git a/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php b/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php index 5eabceb82f6..e0e1fdce68f 100644 --- a/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php +++ b/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php @@ -17,14 +17,9 @@ */ final class ArrayTypeComparator { - /** - * @var UnionTypeCommonTypeNarrower - */ - private $unionTypeCommonTypeNarrower; - - public function __construct(UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower) - { - $this->unionTypeCommonTypeNarrower = $unionTypeCommonTypeNarrower; + public function __construct( + private UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower + ) { } public function isSubtype(ArrayType $checkedType, ArrayType $mainType): bool diff --git a/packages/NodeTypeResolver/TypeComparator/TypeComparator.php b/packages/NodeTypeResolver/TypeComparator/TypeComparator.php index da68019832f..a29f2636017 100644 --- a/packages/NodeTypeResolver/TypeComparator/TypeComparator.php +++ b/packages/NodeTypeResolver/TypeComparator/TypeComparator.php @@ -24,50 +24,14 @@ final class TypeComparator { - /** - * @var TypeHasher - */ - private $typeHasher; - - /** - * @var TypeNormalizer - */ - private $typeNormalizer; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var ArrayTypeComparator - */ - private $arrayTypeComparator; - - /** - * @var ScalarTypeComparator - */ - private $scalarTypeComparator; - - /** - * @var TypeFactory - */ - private $typeFactory; - public function __construct( - TypeHasher $typeHasher, - TypeNormalizer $typeNormalizer, - StaticTypeMapper $staticTypeMapper, - ArrayTypeComparator $arrayTypeComparator, - ScalarTypeComparator $scalarTypeComparator, - TypeFactory $typeFactory + private TypeHasher $typeHasher, + private TypeNormalizer $typeNormalizer, + private StaticTypeMapper $staticTypeMapper, + private ArrayTypeComparator $arrayTypeComparator, + private ScalarTypeComparator $scalarTypeComparator, + private TypeFactory $typeFactory ) { - $this->typeHasher = $typeHasher; - $this->typeNormalizer = $typeNormalizer; - $this->staticTypeMapper = $staticTypeMapper; - $this->arrayTypeComparator = $arrayTypeComparator; - $this->scalarTypeComparator = $scalarTypeComparator; - $this->typeFactory = $typeFactory; } public function areTypesEqual(Type $firstType, Type $secondType): bool diff --git a/packages/NodeTypeResolver/ValueObject/OldToNewType.php b/packages/NodeTypeResolver/ValueObject/OldToNewType.php index 38f8b4dd902..5d9e1870893 100644 --- a/packages/NodeTypeResolver/ValueObject/OldToNewType.php +++ b/packages/NodeTypeResolver/ValueObject/OldToNewType.php @@ -8,20 +8,10 @@ final class OldToNewType { - /** - * @var Type - */ - private $oldType; - - /** - * @var Type - */ - private $newType; - - public function __construct(Type $oldType, Type $newType) - { - $this->oldType = $oldType; - $this->newType = $newType; + public function __construct( + private Type $oldType, + private Type $newType + ) { } public function getOldType(): Type diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php index 47b954fa6f2..788c804bd8e 100644 --- a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php +++ b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php @@ -39,22 +39,10 @@ final class UnionTypeCommonTypeNarrower RectorInterface::class => [RectorInterface::class], ]; - /** - * @var GenericClassStringTypeCorrector - */ - private $genericClassStringTypeCorrector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - GenericClassStringTypeCorrector $genericClassStringTypeCorrector, - ReflectionProvider $reflectionProvider + private GenericClassStringTypeCorrector $genericClassStringTypeCorrector, + private ReflectionProvider $reflectionProvider ) { - $this->genericClassStringTypeCorrector = $genericClassStringTypeCorrector; - $this->reflectionProvider = $reflectionProvider; } public function narrowToSharedObjectType(UnionType $unionType): ?ObjectType diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php index 208b8da7dd8..e24e44eb171 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php @@ -17,14 +17,9 @@ final class BooleanTypeMapper implements TypeMapperInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php index 5dc0b3758b9..cd27bec1f95 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php @@ -21,14 +21,9 @@ final class ClosureTypeMapper implements TypeMapperInterface, PHPStanStaticTypeM */ private $phpStanStaticTypeMapper; - /** - * @var CallableTypeMapper - */ - private $callableTypeMapper; - - public function __construct(CallableTypeMapper $callableTypeMapper) - { - $this->callableTypeMapper = $callableTypeMapper; + public function __construct( + private CallableTypeMapper $callableTypeMapper + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php index 96ce4ee62b3..33ca82f723f 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php @@ -16,14 +16,9 @@ final class FloatTypeMapper implements TypeMapperInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php index 3c9ec9959e2..9cbb5c1e6b1 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php @@ -16,14 +16,9 @@ final class IntegerTypeMapper implements TypeMapperInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php index 413cef93c45..eff0aa8caf0 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php @@ -20,19 +20,14 @@ final class ObjectWithoutClassTypeMapper implements TypeMapperInterface, PHPStanStaticTypeMapperAwareInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - /** * @var PHPStanStaticTypeMapper */ private $phpStanStaticTypeMapper; - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php index 7447a463a40..6ef2ad937ab 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php @@ -20,14 +20,9 @@ */ final class StaticTypeMapper implements TypeMapperInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php index 99430eee26e..630fc9c15e3 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php @@ -16,14 +16,9 @@ final class StringTypeMapper implements TypeMapperInterface { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php index 8cacaa83448..59c6ddcf2c1 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php @@ -13,14 +13,9 @@ final class TypeWithClassNameTypeMapper implements TypeMapperInterface { - /** - * @var StringTypeMapper - */ - private $stringTypeMapper; - - public function __construct(StringTypeMapper $stringTypeMapper) - { - $this->stringTypeMapper = $stringTypeMapper; + public function __construct( + private StringTypeMapper $stringTypeMapper + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php index 7b81cec260c..0201967d31a 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php @@ -40,43 +40,13 @@ final class UnionTypeMapper implements TypeMapperInterface */ private $phpStanStaticTypeMapper; - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - /** - * @var UnionTypeAnalyzer - */ - private $unionTypeAnalyzer; - - /** - * @var DoctrineTypeAnalyzer - */ - private $doctrineTypeAnalyzer; - - /** - * @var BoolUnionTypeAnalyzer - */ - private $boolUnionTypeAnalyzer; - - /** - * @var UnionTypeCommonTypeNarrower - */ - private $unionTypeCommonTypeNarrower; - public function __construct( - DoctrineTypeAnalyzer $doctrineTypeAnalyzer, - PhpVersionProvider $phpVersionProvider, - UnionTypeAnalyzer $unionTypeAnalyzer, - BoolUnionTypeAnalyzer $boolUnionTypeAnalyzer, - UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower + private DoctrineTypeAnalyzer $doctrineTypeAnalyzer, + private PhpVersionProvider $phpVersionProvider, + private UnionTypeAnalyzer $unionTypeAnalyzer, + private BoolUnionTypeAnalyzer $boolUnionTypeAnalyzer, + private UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower ) { - $this->phpVersionProvider = $phpVersionProvider; - $this->unionTypeAnalyzer = $unionTypeAnalyzer; - $this->doctrineTypeAnalyzer = $doctrineTypeAnalyzer; - $this->boolUnionTypeAnalyzer = $boolUnionTypeAnalyzer; - $this->unionTypeCommonTypeNarrower = $unionTypeCommonTypeNarrower; } /** diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php index 311d7a26612..3e8b597a2bf 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php @@ -21,14 +21,9 @@ final class VoidTypeMapper implements TypeMapperInterface */ private const VOID = 'void'; - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/Utils/TypeUnwrapper.php b/packages/PHPStanStaticTypeMapper/Utils/TypeUnwrapper.php index ff501be7dab..cd53419854d 100644 --- a/packages/PHPStanStaticTypeMapper/Utils/TypeUnwrapper.php +++ b/packages/PHPStanStaticTypeMapper/Utils/TypeUnwrapper.php @@ -12,14 +12,9 @@ final class TypeUnwrapper { - /** - * @var UnionTypeFactory - */ - private $unionTypeFactory; - - public function __construct(UnionTypeFactory $unionTypeFactory) - { - $this->unionTypeFactory = $unionTypeFactory; + public function __construct( + private UnionTypeFactory $unionTypeFactory + ) { } /** diff --git a/packages/PHPStanStaticTypeMapper/ValueObject/UnionTypeAnalysis.php b/packages/PHPStanStaticTypeMapper/ValueObject/UnionTypeAnalysis.php index 50f614d5a66..4333ddbb34a 100644 --- a/packages/PHPStanStaticTypeMapper/ValueObject/UnionTypeAnalysis.php +++ b/packages/PHPStanStaticTypeMapper/ValueObject/UnionTypeAnalysis.php @@ -6,26 +6,11 @@ final class UnionTypeAnalysis { - /** - * @var bool - */ - private $isNullableType = false; - - /** - * @var bool - */ - private $hasIterable = false; - - /** - * @var bool - */ - private $hasArray = false; - - public function __construct(bool $isNullableType, bool $hasIterable, bool $hasArray) - { - $this->isNullableType = $isNullableType; - $this->hasIterable = $hasIterable; - $this->hasArray = $hasArray; + public function __construct( + private bool $isNullableType, + private bool $hasIterable, + private bool $hasArray + ) { } public function isNullableType(): bool diff --git a/packages/PostRector/Application/PostFileProcessor.php b/packages/PostRector/Application/PostFileProcessor.php index fb74ced53de..2819bac2537 100644 --- a/packages/PostRector/Application/PostFileProcessor.php +++ b/packages/PostRector/Application/PostFileProcessor.php @@ -20,34 +20,16 @@ final class PostFileProcessor */ private $postRectors = []; - /** - * @var Skipper - */ - private $skipper; - - /** - * @var CurrentRectorProvider - */ - private $currentRectorProvider; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - /** * @param PostRectorInterface[] $postRectors */ public function __construct( - Skipper $skipper, - CurrentFileProvider $currentFileProvider, - CurrentRectorProvider $currentRectorProvider, + private Skipper $skipper, + private CurrentFileProvider $currentFileProvider, + private CurrentRectorProvider $currentRectorProvider, array $postRectors ) { $this->postRectors = $this->sortByPriority($postRectors); - $this->skipper = $skipper; - $this->currentRectorProvider = $currentRectorProvider; - $this->currentFileProvider = $currentFileProvider; } /** diff --git a/packages/PostRector/Collector/NodesToAddCollector.php b/packages/PostRector/Collector/NodesToAddCollector.php index d4d70190ccf..ad66ed73a83 100644 --- a/packages/PostRector/Collector/NodesToAddCollector.php +++ b/packages/PostRector/Collector/NodesToAddCollector.php @@ -28,29 +28,11 @@ final class NodesToAddCollector implements NodeCollectorInterface */ private $nodesToAddBefore = []; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - public function __construct( - BetterNodeFinder $betterNodeFinder, - RectorChangeCollector $rectorChangeCollector, - BetterStandardPrinter $betterStandardPrinter + private BetterNodeFinder $betterNodeFinder, + private RectorChangeCollector $rectorChangeCollector, + private BetterStandardPrinter $betterStandardPrinter ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->rectorChangeCollector = $rectorChangeCollector; - $this->betterStandardPrinter = $betterStandardPrinter; } public function isActive(): bool diff --git a/packages/PostRector/Collector/NodesToRemoveCollector.php b/packages/PostRector/Collector/NodesToRemoveCollector.php index 09f9f777e59..60801ad1765 100644 --- a/packages/PostRector/Collector/NodesToRemoveCollector.php +++ b/packages/PostRector/Collector/NodesToRemoveCollector.php @@ -25,48 +25,18 @@ final class NodesToRemoveCollector implements NodeCollectorInterface { - /** - * @var AffectedFilesCollector - */ - private $affectedFilesCollector; - - /** - * @var BreakingRemovalGuard - */ - private $breakingRemovalGuard; - /** * @var Stmt[]|Node[] */ private $nodesToRemove = []; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - public function __construct( - AffectedFilesCollector $affectedFilesCollector, - BreakingRemovalGuard $breakingRemovalGuard, - BetterNodeFinder $betterNodeFinder, - NodeComparator $nodeComparator, - CurrentFileProvider $currentFileProvider + private AffectedFilesCollector $affectedFilesCollector, + private BreakingRemovalGuard $breakingRemovalGuard, + private BetterNodeFinder $betterNodeFinder, + private NodeComparator $nodeComparator, + private CurrentFileProvider $currentFileProvider ) { - $this->affectedFilesCollector = $affectedFilesCollector; - $this->breakingRemovalGuard = $breakingRemovalGuard; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeComparator = $nodeComparator; - $this->currentFileProvider = $currentFileProvider; } public function addNodeToRemove(Node $node): void diff --git a/packages/PostRector/Collector/PropertyToAddCollector.php b/packages/PostRector/Collector/PropertyToAddCollector.php index 70e7f9fd4e8..5a760208e49 100644 --- a/packages/PostRector/Collector/PropertyToAddCollector.php +++ b/packages/PostRector/Collector/PropertyToAddCollector.php @@ -19,11 +19,6 @@ final class PropertyToAddCollector implements NodeCollectorInterface */ private $constantsByClass = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - /** * @var array */ @@ -34,15 +29,10 @@ final class PropertyToAddCollector implements NodeCollectorInterface */ private $propertiesWithoutConstructorByClass = []; - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - public function __construct(NodeNameResolver $nodeNameResolver, RectorChangeCollector $rectorChangeCollector) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->rectorChangeCollector = $rectorChangeCollector; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private RectorChangeCollector $rectorChangeCollector + ) { } public function isActive(): bool diff --git a/packages/PostRector/Collector/UseNodesToAddCollector.php b/packages/PostRector/Collector/UseNodesToAddCollector.php index fec64200037..c0e092e65be 100644 --- a/packages/PostRector/Collector/UseNodesToAddCollector.php +++ b/packages/PostRector/Collector/UseNodesToAddCollector.php @@ -32,14 +32,9 @@ final class UseNodesToAddCollector implements NodeCollectorInterface */ private $useImportTypesInFilePath = []; - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - - public function __construct(CurrentFileProvider $currentFileProvider) - { - $this->currentFileProvider = $currentFileProvider; + public function __construct( + private CurrentFileProvider $currentFileProvider + ) { } public function isActive(): bool diff --git a/packages/PostRector/DependencyInjection/PropertyAdder.php b/packages/PostRector/DependencyInjection/PropertyAdder.php index 099bca5d318..1491ff3e24d 100644 --- a/packages/PostRector/DependencyInjection/PropertyAdder.php +++ b/packages/PostRector/DependencyInjection/PropertyAdder.php @@ -18,43 +18,13 @@ final class PropertyAdder { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PropertyToAddCollector - */ - private $propertyToAddCollector; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - PropertyToAddCollector $propertyToAddCollector, - RectorChangeCollector $rectorChangeCollector, - PropertyNaming $propertyNaming + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private PropertyToAddCollector $propertyToAddCollector, + private RectorChangeCollector $rectorChangeCollector, + private PropertyNaming $propertyNaming ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->propertyToAddCollector = $propertyToAddCollector; - $this->rectorChangeCollector = $rectorChangeCollector; - $this->propertyNaming = $propertyNaming; } public function addPropertyToCollector(Property $property): void diff --git a/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php b/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php index 9e5d4b6c333..63515bae689 100644 --- a/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php +++ b/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php @@ -12,29 +12,11 @@ final class NetteInjectDetector { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - NodeNameResolver $nodeNameResolver, - PhpDocInfoFactory $phpDocInfoFactory, - ReflectionProvider $reflectionProvider + private NodeNameResolver $nodeNameResolver, + private PhpDocInfoFactory $phpDocInfoFactory, + private ReflectionProvider $reflectionProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->reflectionProvider = $reflectionProvider; } public function isNetteInjectPreferred(Class_ $class): bool diff --git a/packages/PostRector/Rector/ClassRenamingPostRector.php b/packages/PostRector/Rector/ClassRenamingPostRector.php index 5d99c2ab9be..e02d9c438b2 100644 --- a/packages/PostRector/Rector/ClassRenamingPostRector.php +++ b/packages/PostRector/Rector/ClassRenamingPostRector.php @@ -12,20 +12,10 @@ final class ClassRenamingPostRector extends AbstractPostRector { - /** - * @var RenamedClassesCollector - */ - private $renamedClassesCollector; - - /** - * @var ClassRenamer - */ - private $classRenamer; - - public function __construct(ClassRenamer $classRenamer, RenamedClassesCollector $renamedClassesCollector) - { - $this->renamedClassesCollector = $renamedClassesCollector; - $this->classRenamer = $classRenamer; + public function __construct( + private ClassRenamer $classRenamer, + private RenamedClassesCollector $renamedClassesCollector + ) { } public function getPriority(): int diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 032dc0ced5c..375bdc94dcc 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -19,57 +19,15 @@ final class NameImportingPostRector extends AbstractPostRector { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var NameImporter - */ - private $nameImporter; - - /** - * @var DocBlockNameImporter - */ - private $docBlockNameImporter; - - /** - * @var ClassNameImportSkipper - */ - private $classNameImportSkipper; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - ParameterProvider $parameterProvider, - NameImporter $nameImporter, - DocBlockNameImporter $docBlockNameImporter, - ClassNameImportSkipper $classNameImportSkipper, - PhpDocInfoFactory $phpDocInfoFactory, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private ParameterProvider $parameterProvider, + private NameImporter $nameImporter, + private DocBlockNameImporter $docBlockNameImporter, + private ClassNameImportSkipper $classNameImportSkipper, + private PhpDocInfoFactory $phpDocInfoFactory, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->parameterProvider = $parameterProvider; - $this->nameImporter = $nameImporter; - $this->docBlockNameImporter = $docBlockNameImporter; - $this->classNameImportSkipper = $classNameImportSkipper; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } public function enterNode(Node $node): ?Node diff --git a/packages/PostRector/Rector/NodeAddingPostRector.php b/packages/PostRector/Rector/NodeAddingPostRector.php index 7bd1b99e329..2f76573d5d7 100644 --- a/packages/PostRector/Rector/NodeAddingPostRector.php +++ b/packages/PostRector/Rector/NodeAddingPostRector.php @@ -22,14 +22,9 @@ */ final class NodeAddingPostRector extends AbstractPostRector { - /** - * @var NodesToAddCollector - */ - private $nodesToAddCollector; - - public function __construct(NodesToAddCollector $nodesToAddCollector) - { - $this->nodesToAddCollector = $nodesToAddCollector; + public function __construct( + private NodesToAddCollector $nodesToAddCollector + ) { } public function getPriority(): int diff --git a/packages/PostRector/Rector/NodeRemovingPostRector.php b/packages/PostRector/Rector/NodeRemovingPostRector.php index 8b7939f39e7..908055eab25 100644 --- a/packages/PostRector/Rector/NodeRemovingPostRector.php +++ b/packages/PostRector/Rector/NodeRemovingPostRector.php @@ -17,29 +17,11 @@ final class NodeRemovingPostRector extends AbstractPostRector { - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - NodesToRemoveCollector $nodesToRemoveCollector + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private NodesToRemoveCollector $nodesToRemoveCollector ) { - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->nodeFactory = $nodeFactory; - $this->nodeNameResolver = $nodeNameResolver; } public function getPriority(): int diff --git a/packages/PostRector/Rector/NodeToReplacePostRector.php b/packages/PostRector/Rector/NodeToReplacePostRector.php index 8090ea0a84f..9b36374e590 100644 --- a/packages/PostRector/Rector/NodeToReplacePostRector.php +++ b/packages/PostRector/Rector/NodeToReplacePostRector.php @@ -11,14 +11,9 @@ final class NodeToReplacePostRector extends AbstractPostRector { - /** - * @var NodesToReplaceCollector - */ - private $nodesToReplaceCollector; - - public function __construct(NodesToReplaceCollector $nodesToReplaceCollector) - { - $this->nodesToReplaceCollector = $nodesToReplaceCollector; + public function __construct( + private NodesToReplaceCollector $nodesToReplaceCollector + ) { } public function getPriority(): int diff --git a/packages/PostRector/Rector/PropertyAddingPostRector.php b/packages/PostRector/Rector/PropertyAddingPostRector.php index 9c178d4d1ab..1146c3b3eb6 100644 --- a/packages/PostRector/Rector/PropertyAddingPostRector.php +++ b/packages/PostRector/Rector/PropertyAddingPostRector.php @@ -19,43 +19,13 @@ */ final class PropertyAddingPostRector extends AbstractPostRector { - /** - * @var ClassDependencyManipulator - */ - private $classDependencyManipulator; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var PropertyToAddCollector - */ - private $propertyToAddCollector; - - /** - * @var NetteInjectDetector - */ - private $netteInjectDetector; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - ClassDependencyManipulator $classDependencyManipulator, - ClassInsertManipulator $classInsertManipulator, - NetteInjectDetector $netteInjectDetector, - PropertyToAddCollector $propertyToAddCollector, - ClassAnalyzer $classAnalyzer + private ClassDependencyManipulator $classDependencyManipulator, + private ClassInsertManipulator $classInsertManipulator, + private NetteInjectDetector $netteInjectDetector, + private PropertyToAddCollector $propertyToAddCollector, + private ClassAnalyzer $classAnalyzer ) { - $this->classDependencyManipulator = $classDependencyManipulator; - $this->classInsertManipulator = $classInsertManipulator; - $this->propertyToAddCollector = $propertyToAddCollector; - $this->netteInjectDetector = $netteInjectDetector; - $this->classAnalyzer = $classAnalyzer; } public function getPriority(): int diff --git a/packages/PostRector/Rector/UseAddingPostRector.php b/packages/PostRector/Rector/UseAddingPostRector.php index 78d6b890340..c847f2ff2cb 100644 --- a/packages/PostRector/Rector/UseAddingPostRector.php +++ b/packages/PostRector/Rector/UseAddingPostRector.php @@ -20,50 +20,14 @@ final class UseAddingPostRector extends AbstractPostRector { - /** - * @var UseImportsAdder - */ - private $useImportsAdder; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var UseImportsRemover - */ - private $useImportsRemover; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var UseNodesToAddCollector - */ - private $useNodesToAddCollector; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - public function __construct( - BetterNodeFinder $betterNodeFinder, - TypeFactory $typeFactory, - UseImportsAdder $useImportsAdder, - UseImportsRemover $useImportsRemover, - UseNodesToAddCollector $useNodesToAddCollector, - CurrentFileProvider $currentFileProvider + private BetterNodeFinder $betterNodeFinder, + private TypeFactory $typeFactory, + private UseImportsAdder $useImportsAdder, + private UseImportsRemover $useImportsRemover, + private UseNodesToAddCollector $useNodesToAddCollector, + private CurrentFileProvider $currentFileProvider ) { - $this->useImportsAdder = $useImportsAdder; - $this->betterNodeFinder = $betterNodeFinder; - $this->useImportsRemover = $useImportsRemover; - $this->typeFactory = $typeFactory; - $this->useNodesToAddCollector = $useNodesToAddCollector; - $this->currentFileProvider = $currentFileProvider; } /** diff --git a/packages/PostRector/ValueObject/PropertyMetadata.php b/packages/PostRector/ValueObject/PropertyMetadata.php index b3d42592c2c..80d33771078 100644 --- a/packages/PostRector/ValueObject/PropertyMetadata.php +++ b/packages/PostRector/ValueObject/PropertyMetadata.php @@ -8,26 +8,11 @@ final class PropertyMetadata { - /** - * @var string - */ - private $name; - - /** - * @var Type|null - */ - private $type; - - /** - * @var int - */ - private $flags; - - public function __construct(string $name, ?Type $type, int $flags) - { - $this->name = $name; - $this->type = $type; - $this->flags = $flags; + public function __construct( + private string $name, + private ?Type $type, + private int $flags + ) { } public function getName(): string diff --git a/packages/ReadWrite/Guard/VariableToConstantGuard.php b/packages/ReadWrite/Guard/VariableToConstantGuard.php index 9ebab9473b6..8280dc3251b 100644 --- a/packages/ReadWrite/Guard/VariableToConstantGuard.php +++ b/packages/ReadWrite/Guard/VariableToConstantGuard.php @@ -23,29 +23,11 @@ final class VariableToConstantGuard */ private $referencePositionsByFunctionName = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - public function __construct( - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider, - PrivatesAccessor $privatesAccessor + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider, + private PrivatesAccessor $privatesAccessor ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; - $this->privatesAccessor = $privatesAccessor; } public function isReadArg(Arg $arg): bool diff --git a/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php b/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php index 080a08d483a..2dda9697120 100644 --- a/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php +++ b/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php @@ -10,17 +10,12 @@ final class ReadExprAnalyzer { - /** - * @var ReadNodeAnalyzerInterface[] - */ - private $readNodeAnalyzers = []; - /** * @param ReadNodeAnalyzerInterface[] $readNodeAnalyzers */ - public function __construct(array $readNodeAnalyzers) - { - $this->readNodeAnalyzers = $readNodeAnalyzers; + public function __construct( + private array $readNodeAnalyzers + ) { } /** diff --git a/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php b/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php index 5be483df048..a17ac425982 100644 --- a/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php +++ b/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php @@ -24,36 +24,12 @@ final class ReadWritePropertyAnalyzer { - /** - * @var VariableToConstantGuard - */ - private $variableToConstantGuard; - - /** - * @var AssignManipulator - */ - private $assignManipulator; - - /** - * @var ReadExprAnalyzer - */ - private $readExprAnalyzer; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - VariableToConstantGuard $variableToConstantGuard, - AssignManipulator $assignManipulator, - ReadExprAnalyzer $readExprAnalyzer, - BetterNodeFinder $betterNodeFinder + private VariableToConstantGuard $variableToConstantGuard, + private AssignManipulator $assignManipulator, + private ReadExprAnalyzer $readExprAnalyzer, + private BetterNodeFinder $betterNodeFinder ) { - $this->variableToConstantGuard = $variableToConstantGuard; - $this->assignManipulator = $assignManipulator; - $this->readExprAnalyzer = $readExprAnalyzer; - $this->betterNodeFinder = $betterNodeFinder; } /** diff --git a/packages/ReadWrite/NodeFinder/NodeUsageFinder.php b/packages/ReadWrite/NodeFinder/NodeUsageFinder.php index c6688586d38..42841271f9f 100644 --- a/packages/ReadWrite/NodeFinder/NodeUsageFinder.php +++ b/packages/ReadWrite/NodeFinder/NodeUsageFinder.php @@ -17,43 +17,13 @@ final class NodeUsageFinder { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ScopeAwareNodeFinder - */ - private $scopeAwareNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder, - NodeRepository $nodeRepository, - ScopeAwareNodeFinder $scopeAwareNodeFinder, - NodeComparator $nodeComparator + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder, + private NodeRepository $nodeRepository, + private ScopeAwareNodeFinder $scopeAwareNodeFinder, + private NodeComparator $nodeComparator ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeRepository = $nodeRepository; - $this->scopeAwareNodeFinder = $scopeAwareNodeFinder; - $this->nodeComparator = $nodeComparator; } /** diff --git a/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php b/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php index 8e16c3f01d3..3338c06d71c 100644 --- a/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php +++ b/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php @@ -11,20 +11,10 @@ final class PropertyFetchReadNodeAnalyzer implements ReadNodeAnalyzerInterface { - /** - * @var ReadExprAnalyzer - */ - private $readExprAnalyzer; - - /** - * @var NodeUsageFinder - */ - private $nodeUsageFinder; - - public function __construct(ReadExprAnalyzer $readExprAnalyzer, NodeUsageFinder $nodeUsageFinder) - { - $this->readExprAnalyzer = $readExprAnalyzer; - $this->nodeUsageFinder = $nodeUsageFinder; + public function __construct( + private ReadExprAnalyzer $readExprAnalyzer, + private NodeUsageFinder $nodeUsageFinder + ) { } public function supports(Node $node): bool diff --git a/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php b/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php index 95de9db719e..e94e5f98db2 100644 --- a/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php +++ b/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php @@ -12,29 +12,11 @@ final class VariableReadNodeAnalyzer implements ReadNodeAnalyzerInterface { - /** - * @var ParentScopeFinder - */ - private $parentScopeFinder; - - /** - * @var NodeUsageFinder - */ - private $nodeUsageFinder; - - /** - * @var ReadExprAnalyzer - */ - private $readExprAnalyzer; - public function __construct( - ParentScopeFinder $parentScopeFinder, - NodeUsageFinder $nodeUsageFinder, - ReadExprAnalyzer $readExprAnalyzer + private ParentScopeFinder $parentScopeFinder, + private NodeUsageFinder $nodeUsageFinder, + private ReadExprAnalyzer $readExprAnalyzer ) { - $this->parentScopeFinder = $parentScopeFinder; - $this->nodeUsageFinder = $nodeUsageFinder; - $this->readExprAnalyzer = $readExprAnalyzer; } public function supports(Node $node): bool diff --git a/packages/StaticTypeMapper/Mapper/PhpParserNodeMapper.php b/packages/StaticTypeMapper/Mapper/PhpParserNodeMapper.php index 47986843793..d02cd716db8 100644 --- a/packages/StaticTypeMapper/Mapper/PhpParserNodeMapper.php +++ b/packages/StaticTypeMapper/Mapper/PhpParserNodeMapper.php @@ -13,17 +13,12 @@ final class PhpParserNodeMapper { - /** - * @var PhpParserNodeMapperInterface[] - */ - private $phpParserNodeMappers = []; - /** * @param PhpParserNodeMapperInterface[] $phpParserNodeMappers */ - public function __construct(array $phpParserNodeMappers) - { - $this->phpParserNodeMappers = $phpParserNodeMappers; + public function __construct( + private array $phpParserNodeMappers + ) { } public function mapToPHPStanType(Node $node): Type diff --git a/packages/StaticTypeMapper/PhpDoc/PhpDocTypeMapper.php b/packages/StaticTypeMapper/PhpDoc/PhpDocTypeMapper.php index f4e47c0bff7..5b80a8f6396 100644 --- a/packages/StaticTypeMapper/PhpDoc/PhpDocTypeMapper.php +++ b/packages/StaticTypeMapper/PhpDoc/PhpDocTypeMapper.php @@ -16,23 +16,13 @@ */ final class PhpDocTypeMapper { - /** - * @var PhpDocTypeMapperInterface[] - */ - private $phpDocTypeMappers = []; - - /** - * @var TypeNodeResolver - */ - private $typeNodeResolver; - /** * @param PhpDocTypeMapperInterface[] $phpDocTypeMappers */ - public function __construct(array $phpDocTypeMappers, TypeNodeResolver $typeNodeResolver) - { - $this->phpDocTypeMappers = $phpDocTypeMappers; - $this->typeNodeResolver = $typeNodeResolver; + public function __construct( + private array $phpDocTypeMappers, + private TypeNodeResolver $typeNodeResolver + ) { } public function mapToPHPStanType(TypeNode $typeNode, Node $node, NameScope $nameScope): Type diff --git a/packages/StaticTypeMapper/PhpDocParser/IdentifierTypeMapper.php b/packages/StaticTypeMapper/PhpDocParser/IdentifierTypeMapper.php index cd591ce9854..8598b4776a2 100644 --- a/packages/StaticTypeMapper/PhpDocParser/IdentifierTypeMapper.php +++ b/packages/StaticTypeMapper/PhpDocParser/IdentifierTypeMapper.php @@ -25,29 +25,11 @@ final class IdentifierTypeMapper implements PhpDocTypeMapperInterface { - /** - * @var ScalarStringToTypeMapper - */ - private $scalarStringToTypeMapper; - - /** - * @var ObjectTypeSpecifier - */ - private $objectTypeSpecifier; - - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - public function __construct( - ObjectTypeSpecifier $objectTypeSpecifier, - ScalarStringToTypeMapper $scalarStringToTypeMapper, - ParentClassScopeResolver $parentClassScopeResolver + private ObjectTypeSpecifier $objectTypeSpecifier, + private ScalarStringToTypeMapper $scalarStringToTypeMapper, + private ParentClassScopeResolver $parentClassScopeResolver ) { - $this->scalarStringToTypeMapper = $scalarStringToTypeMapper; - $this->objectTypeSpecifier = $objectTypeSpecifier; - $this->parentClassScopeResolver = $parentClassScopeResolver; } /** diff --git a/packages/StaticTypeMapper/PhpDocParser/UnionTypeMapper.php b/packages/StaticTypeMapper/PhpDocParser/UnionTypeMapper.php index f92aeb3ef81..dd4c3ec57ab 100644 --- a/packages/StaticTypeMapper/PhpDocParser/UnionTypeMapper.php +++ b/packages/StaticTypeMapper/PhpDocParser/UnionTypeMapper.php @@ -20,14 +20,9 @@ final class UnionTypeMapper implements PhpDocTypeMapperInterface */ private $phpDocTypeMapper; - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } /** diff --git a/packages/StaticTypeMapper/PhpParser/IdentifierNodeMapper.php b/packages/StaticTypeMapper/PhpParser/IdentifierNodeMapper.php index a80cfc599e7..223e97d791c 100644 --- a/packages/StaticTypeMapper/PhpParser/IdentifierNodeMapper.php +++ b/packages/StaticTypeMapper/PhpParser/IdentifierNodeMapper.php @@ -12,14 +12,9 @@ final class IdentifierNodeMapper implements PhpParserNodeMapperInterface { - /** - * @var ScalarStringToTypeMapper - */ - private $scalarStringToTypeMapper; - - public function __construct(ScalarStringToTypeMapper $scalarStringToTypeMapper) - { - $this->scalarStringToTypeMapper = $scalarStringToTypeMapper; + public function __construct( + private ScalarStringToTypeMapper $scalarStringToTypeMapper + ) { } /** diff --git a/packages/StaticTypeMapper/PhpParser/NameNodeMapper.php b/packages/StaticTypeMapper/PhpParser/NameNodeMapper.php index 2372329f27d..b054721c1c0 100644 --- a/packages/StaticTypeMapper/PhpParser/NameNodeMapper.php +++ b/packages/StaticTypeMapper/PhpParser/NameNodeMapper.php @@ -24,22 +24,10 @@ final class NameNodeMapper implements PhpParserNodeMapperInterface { - /** - * @var RenamedClassesCollector - */ - private $renamedClassesCollector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - RenamedClassesCollector $renamedClassesCollector, - ReflectionProvider $reflectionProvider + private RenamedClassesCollector $renamedClassesCollector, + private ReflectionProvider $reflectionProvider ) { - $this->renamedClassesCollector = $renamedClassesCollector; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/packages/StaticTypeMapper/PhpParser/NullableTypeNodeMapper.php b/packages/StaticTypeMapper/PhpParser/NullableTypeNodeMapper.php index 15c3d2538d2..46c066206f8 100644 --- a/packages/StaticTypeMapper/PhpParser/NullableTypeNodeMapper.php +++ b/packages/StaticTypeMapper/PhpParser/NullableTypeNodeMapper.php @@ -14,19 +14,14 @@ final class NullableTypeNodeMapper implements PhpParserNodeMapperInterface { - /** - * @var TypeFactory - */ - private $typeFactory; - /** * @var PhpParserNodeMapper */ private $phpParserNodeMapper; - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } /** diff --git a/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php b/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php index ceff60543a2..52fcca5f7f3 100644 --- a/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php +++ b/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php @@ -13,19 +13,14 @@ final class UnionTypeNodeMapper implements PhpParserNodeMapperInterface { - /** - * @var TypeFactory - */ - private $typeFactory; - /** * @var PhpParserNodeMapper */ private $phpParserNodeMapper; - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } /** diff --git a/packages/StaticTypeMapper/StaticTypeMapper.php b/packages/StaticTypeMapper/StaticTypeMapper.php index 1cf8fd59632..fcfeacbbac1 100644 --- a/packages/StaticTypeMapper/StaticTypeMapper.php +++ b/packages/StaticTypeMapper/StaticTypeMapper.php @@ -30,37 +30,12 @@ */ final class StaticTypeMapper { - /** - * @var PHPStanStaticTypeMapper - */ - private $phpStanStaticTypeMapper; - - /** - * @var PhpParserNodeMapper - */ - private $phpParserNodeMapper; - - /** - * @var PhpDocTypeMapper - */ - private $phpDocTypeMapper; - - /** - * @var NameScopeFactory - */ - private $nameScopeFactory; - public function __construct( - NameScopeFactory $nameScopeFactory, - PHPStanStaticTypeMapper $phpStanStaticTypeMapper, - PhpDocTypeMapper $phpDocTypeMapper, - PhpParserNodeMapper $phpParserNodeMapper + private NameScopeFactory $nameScopeFactory, + private PHPStanStaticTypeMapper $phpStanStaticTypeMapper, + private PhpDocTypeMapper $phpDocTypeMapper, + private PhpParserNodeMapper $phpParserNodeMapper ) { - $this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper; - $this->phpParserNodeMapper = $phpParserNodeMapper; - $this->phpDocTypeMapper = $phpDocTypeMapper; - $this->nameScopeFactory = $nameScopeFactory; - $this->nameScopeFactory->setStaticTypeMapper($this); } diff --git a/packages/StaticTypeMapper/ValueObject/Type/AliasedObjectType.php b/packages/StaticTypeMapper/ValueObject/Type/AliasedObjectType.php index 19b341e8140..8b970a69609 100644 --- a/packages/StaticTypeMapper/ValueObject/Type/AliasedObjectType.php +++ b/packages/StaticTypeMapper/ValueObject/Type/AliasedObjectType.php @@ -11,16 +11,11 @@ final class AliasedObjectType extends ObjectType { - /** - * @var string - */ - private $fullyQualifiedClass; - - public function __construct(string $alias, string $fullyQualifiedClass) - { + public function __construct( + string $alias, + private string $fullyQualifiedClass + ) { parent::__construct($alias); - - $this->fullyQualifiedClass = $fullyQualifiedClass; } public function getFullyQualifiedClass(): string diff --git a/packages/StaticTypeMapper/ValueObject/Type/ShortenedObjectType.php b/packages/StaticTypeMapper/ValueObject/Type/ShortenedObjectType.php index 7c91eda714f..35e865d5c6a 100644 --- a/packages/StaticTypeMapper/ValueObject/Type/ShortenedObjectType.php +++ b/packages/StaticTypeMapper/ValueObject/Type/ShortenedObjectType.php @@ -10,19 +10,14 @@ final class ShortenedObjectType extends ObjectType { - /** - * @var string - */ - private $fullyQualifiedName; - /** * @param class-string $fullyQualifiedName */ - public function __construct(string $shortName, string $fullyQualifiedName) - { + public function __construct( + string $shortName, + private string $fullyQualifiedName + ) { parent::__construct($shortName); - - $this->fullyQualifiedName = $fullyQualifiedName; } public function isSuperTypeOf(Type $type): TrinaryLogic diff --git a/packages/Testing/TestingParser/TestingParser.php b/packages/Testing/TestingParser/TestingParser.php index 477b48ee9ca..91330503819 100644 --- a/packages/Testing/TestingParser/TestingParser.php +++ b/packages/Testing/TestingParser/TestingParser.php @@ -15,36 +15,12 @@ final class TestingParser { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var Parser - */ - private $parser; - - /** - * @var NodeScopeAndMetadataDecorator - */ - private $nodeScopeAndMetadataDecorator; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - ParameterProvider $parameterProvider, - Parser $parser, - NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, - BetterNodeFinder $betterNodeFinder + private ParameterProvider $parameterProvider, + private Parser $parser, + private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, + private BetterNodeFinder $betterNodeFinder ) { - $this->parameterProvider = $parameterProvider; - $this->parser = $parser; - $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator; - $this->betterNodeFinder = $betterNodeFinder; } /** diff --git a/packages/Testing/ValueObject/InputFilePathWithExpectedFile.php b/packages/Testing/ValueObject/InputFilePathWithExpectedFile.php index f6839116567..24aabfea22c 100644 --- a/packages/Testing/ValueObject/InputFilePathWithExpectedFile.php +++ b/packages/Testing/ValueObject/InputFilePathWithExpectedFile.php @@ -9,20 +9,10 @@ final class InputFilePathWithExpectedFile { - /** - * @var string - */ - private $inputFilePath; - - /** - * @var AddedFileWithContent - */ - private $addedFileWithContent; - - public function __construct(string $inputFilePath, AddedFileWithContent $addedFileWithContent) - { - $this->inputFilePath = $inputFilePath; - $this->addedFileWithContent = $addedFileWithContent; + public function __construct( + private string $inputFilePath, + private AddedFileWithContent $addedFileWithContent + ) { } public function getInputFileInfo(): SmartFileInfo diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php index 41c510174c2..b2cbf26ed5c 100644 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php @@ -12,14 +12,9 @@ final class ClassMethodParamVendorLockResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function isVendorLocked(ClassMethod $classMethod): bool diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php index 7a4fcce9f99..3ece2b4548b 100644 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php +++ b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php @@ -32,36 +32,12 @@ final class ClassMethodReturnTypeOverrideGuard 'PhpParser\NodeVisitor' => ['enterNode', 'leaveNode', 'beforeTraverse', 'afterTraverse'], ]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider, - FamilyRelationsAnalyzer $familyRelationsAnalyzer, - BetterNodeFinder $betterNodeFinder + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider, + private FamilyRelationsAnalyzer $familyRelationsAnalyzer, + private BetterNodeFinder $betterNodeFinder ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; - $this->betterNodeFinder = $betterNodeFinder; } public function shouldSkipClassMethod(ClassMethod $classMethod): bool diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php index 92751d1cd27..0d4142ea881 100644 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php @@ -15,22 +15,10 @@ final class ClassMethodReturnVendorLockResolver { - /** - * @var MethodReflectionContractAnalyzer - */ - private $methodReflectionContractAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer, - NodeNameResolver $nodeNameResolver + private MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer, + private NodeNameResolver $nodeNameResolver ) { - $this->methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; } public function isVendorLocked(ClassMethod $classMethod): bool diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php index ecfed7f4c61..833bd267fb8 100644 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php @@ -14,22 +14,10 @@ final class ClassMethodVendorLockResolver { - /** - * @var MethodReflectionContractAnalyzer - */ - private $methodReflectionContractAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer, - NodeNameResolver $nodeNameResolver + private MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer, + private NodeNameResolver $nodeNameResolver ) { - $this->methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php index 48b283548e1..33ffa21b712 100644 --- a/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php @@ -13,22 +13,10 @@ final class PropertyTypeVendorLockResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - public function __construct( - NodeNameResolver $nodeNameResolver, - FamilyRelationsAnalyzer $familyRelationsAnalyzer + private NodeNameResolver $nodeNameResolver, + private FamilyRelationsAnalyzer $familyRelationsAnalyzer ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; } public function isVendorLocked(Property $property): bool diff --git a/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php index f6e02296144..332653a420c 100644 --- a/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php @@ -14,20 +14,10 @@ final class PropertyVisibilityVendorLockResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - - public function __construct(NodeNameResolver $nodeNameResolver, FamilyRelationsAnalyzer $familyRelationsAnalyzer) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private FamilyRelationsAnalyzer $familyRelationsAnalyzer + ) { } /** diff --git a/packages/VendorLocker/VendorLockResolver.php b/packages/VendorLocker/VendorLockResolver.php index 1e9e921113e..efb93984305 100644 --- a/packages/VendorLocker/VendorLockResolver.php +++ b/packages/VendorLocker/VendorLockResolver.php @@ -14,36 +14,12 @@ final class VendorLockResolver { - /** - * @var ClassMethodReturnVendorLockResolver - */ - private $classMethodReturnVendorLockResolver; - - /** - * @var ClassMethodParamVendorLockResolver - */ - private $classMethodParamVendorLockResolver; - - /** - * @var PropertyTypeVendorLockResolver - */ - private $propertyTypeVendorLockResolver; - - /** - * @var ClassMethodVendorLockResolver - */ - private $classMethodVendorLockResolver; - public function __construct( - ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver, - ClassMethodReturnVendorLockResolver $classMethodReturnVendorLockResolver, - ClassMethodVendorLockResolver $classMethodVendorLockResolver, - PropertyTypeVendorLockResolver $propertyTypeVendorLockResolver + private ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver, + private ClassMethodReturnVendorLockResolver $classMethodReturnVendorLockResolver, + private ClassMethodVendorLockResolver $classMethodVendorLockResolver, + private PropertyTypeVendorLockResolver $propertyTypeVendorLockResolver ) { - $this->classMethodReturnVendorLockResolver = $classMethodReturnVendorLockResolver; - $this->classMethodParamVendorLockResolver = $classMethodParamVendorLockResolver; - $this->propertyTypeVendorLockResolver = $propertyTypeVendorLockResolver; - $this->classMethodVendorLockResolver = $classMethodVendorLockResolver; } public function isClassMethodParamLockedIn(Node $node): bool diff --git a/phpstan.neon b/phpstan.neon index c13df8f7a25..cae8bd08227 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -499,6 +499,7 @@ parameters: # temporary out of order after rector-src extract - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' +<<<<<<< HEAD ======= >>>>>>> 5288d92bc (bump workflow version to PHP 8) ======= @@ -506,3 +507,10 @@ parameters: # temporary out of order after rector-src extract - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' >>>>>>> 8f4d07170 (skip static error) +======= + + # bug in PHP 8, fix in dev-main + - + message: '#Do not call parent method if parent method is empty#' + path: packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php +>>>>>>> 83f18a5ac (fixup! [PHP 8] Use promoted properties) diff --git a/rector.php b/rector.php index 0ae51d44f6c..eceffc3b37f 100644 --- a/rector.php +++ b/rector.php @@ -12,6 +12,7 @@ use Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector; use Rector\Nette\Set\NetteSetList; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; +use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; use Rector\PHPUnit\Rector\Class_\AddSeeTestAnnotationRector; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivatePropertyRector; @@ -49,6 +50,8 @@ InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => $configuration, ]]); + $services->set(ClassPropertyAssignToConstructorPromotionRector::class); + $services->set(PreferThisOrSelfMethodCallRector::class) ->call('configure', [[ PreferThisOrSelfMethodCallRector::TYPE_TO_PREFERENCE => [ diff --git a/rules/Arguments/NodeAnalyzer/ArgumentAddingScope.php b/rules/Arguments/NodeAnalyzer/ArgumentAddingScope.php index 444e7e13146..0c54a0f2d5b 100644 --- a/rules/Arguments/NodeAnalyzer/ArgumentAddingScope.php +++ b/rules/Arguments/NodeAnalyzer/ArgumentAddingScope.php @@ -28,14 +28,9 @@ final class ArgumentAddingScope */ public const SCOPE_CLASS_METHOD = 'class_method'; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php b/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php index 64dd037df71..cbf2d01f1cc 100644 --- a/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php +++ b/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php @@ -42,14 +42,9 @@ final class ArgumentAdderRector extends AbstractRector implements ConfigurableRe */ private $addedArguments = []; - /** - * @var ArgumentAddingScope - */ - private $argumentAddingScope; - - public function __construct(ArgumentAddingScope $argumentAddingScope) - { - $this->argumentAddingScope = $argumentAddingScope; + public function __construct( + private ArgumentAddingScope $argumentAddingScope + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Arguments/ValueObject/ArgumentAdder.php b/rules/Arguments/ValueObject/ArgumentAdder.php index 6001b82c602..6de73c40ab3 100644 --- a/rules/Arguments/ValueObject/ArgumentAdder.php +++ b/rules/Arguments/ValueObject/ArgumentAdder.php @@ -8,60 +8,18 @@ final class ArgumentAdder { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var int - */ - private $position; - - /** - * @var string|null - */ - private $argumentName; - - /** - * @var mixed|null - */ - private $argumentDefaultValue; - - /** - * @var string|null - */ - private $argumentType; - - /** - * @var string|null - */ - private $scope; - /** * @param mixed|null $argumentDefaultValue */ public function __construct( - string $class, - string $method, - int $position, - ?string $argumentName = null, - $argumentDefaultValue = null, - ?string $argumentType = null, - ?string $scope = null + private string $class, + private string $method, + private int $position, + private ?string $argumentName = null, + private $argumentDefaultValue = null, + private ?string $argumentType = null, + private ?string $scope = null ) { - $this->class = $class; - $this->method = $method; - $this->position = $position; - $this->argumentName = $argumentName; - $this->argumentDefaultValue = $argumentDefaultValue; - $this->argumentType = $argumentType; - $this->scope = $scope; } public function getObjectType(): ObjectType diff --git a/rules/Arguments/ValueObject/ArgumentDefaultValueReplacer.php b/rules/Arguments/ValueObject/ArgumentDefaultValueReplacer.php index 0f70a5d4685..63a6df3832b 100644 --- a/rules/Arguments/ValueObject/ArgumentDefaultValueReplacer.php +++ b/rules/Arguments/ValueObject/ArgumentDefaultValueReplacer.php @@ -8,42 +8,17 @@ final class ArgumentDefaultValueReplacer { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var int - */ - private $position; - - /** - * @var mixed - */ - private $valueBefore; - - /** - * @var mixed - */ - private $valueAfter; - /** * @param mixed $valueBefore * @param mixed $valueAfter */ - public function __construct(string $class, string $method, int $position, $valueBefore, $valueAfter) - { - $this->class = $class; - $this->method = $method; - $this->position = $position; - $this->valueBefore = $valueBefore; - $this->valueAfter = $valueAfter; + public function __construct( + private string $class, + private string $method, + private int $position, + private $valueBefore, + private $valueAfter + ) { } public function getObjectType(): ObjectType diff --git a/rules/Arguments/ValueObject/SwapFuncCallArguments.php b/rules/Arguments/ValueObject/SwapFuncCallArguments.php index 0ff4e123c13..20fb37db8bc 100644 --- a/rules/Arguments/ValueObject/SwapFuncCallArguments.php +++ b/rules/Arguments/ValueObject/SwapFuncCallArguments.php @@ -6,23 +6,13 @@ final class SwapFuncCallArguments { - /** - * @var string - */ - private $function; - - /** - * @var array - */ - private $order = []; - /** * @param array $order */ - public function __construct(string $function, array $order) - { - $this->function = $function; - $this->order = $order; + public function __construct( + private string $function, + private array $order + ) { } public function getFunction(): string diff --git a/rules/Arguments/ValueObject/ValueObjectWrapArg.php b/rules/Arguments/ValueObject/ValueObjectWrapArg.php index a03b1acf846..134b01c1e18 100644 --- a/rules/Arguments/ValueObject/ValueObjectWrapArg.php +++ b/rules/Arguments/ValueObject/ValueObjectWrapArg.php @@ -8,32 +8,12 @@ final class ValueObjectWrapArg { - /** - * @var string - */ - private $objectType; - - /** - * @var string - */ - private $methodName; - - /** - * @var int - */ - private $argPosition; - - /** - * @var string - */ - private $newType; - - public function __construct(string $objectType, string $methodName, int $argPosition, string $newType) - { - $this->objectType = $objectType; - $this->methodName = $methodName; - $this->argPosition = $argPosition; - $this->newType = $newType; + public function __construct( + private string $objectType, + private string $methodName, + private int $argPosition, + private string $newType + ) { } public function getObjectType(): ObjectType diff --git a/rules/Autodiscovery/Analyzer/ValueObjectClassAnalyzer.php b/rules/Autodiscovery/Analyzer/ValueObjectClassAnalyzer.php index b1c00f1531b..52848fd90c2 100644 --- a/rules/Autodiscovery/Analyzer/ValueObjectClassAnalyzer.php +++ b/rules/Autodiscovery/Analyzer/ValueObjectClassAnalyzer.php @@ -21,43 +21,13 @@ final class ValueObjectClassAnalyzer */ private $valueObjectStatusByClassName = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - PhpDocInfoFactory $phpDocInfoFactory, - NodeRepository $nodeRepository, - ClassAnalyzer $classAnalyzer + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private PhpDocInfoFactory $phpDocInfoFactory, + private NodeRepository $nodeRepository, + private ClassAnalyzer $classAnalyzer ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->nodeRepository = $nodeRepository; - $this->classAnalyzer = $classAnalyzer; } public function isValueObjectClass(Class_ $class): bool diff --git a/rules/Autodiscovery/Rector/Class_/MoveEntitiesToEntityDirectoryRector.php b/rules/Autodiscovery/Rector/Class_/MoveEntitiesToEntityDirectoryRector.php index 680f63e1b85..675d01b6fb7 100644 --- a/rules/Autodiscovery/Rector/Class_/MoveEntitiesToEntityDirectoryRector.php +++ b/rules/Autodiscovery/Rector/Class_/MoveEntitiesToEntityDirectoryRector.php @@ -27,22 +27,10 @@ final class MoveEntitiesToEntityDirectoryRector extends AbstractRector */ private const ENTITY_PATH_REGEX = '#\bEntity\b#'; - /** - * @var DoctrineDocBlockResolver - */ - private $doctrineDocBlockResolver; - - /** - * @var AddedFileWithNodesFactory - */ - private $addedFileWithNodesFactory; - public function __construct( - DoctrineDocBlockResolver $doctrineDocBlockResolver, - AddedFileWithNodesFactory $addedFileWithNodesFactory + private DoctrineDocBlockResolver $doctrineDocBlockResolver, + private AddedFileWithNodesFactory $addedFileWithNodesFactory ) { - $this->doctrineDocBlockResolver = $doctrineDocBlockResolver; - $this->addedFileWithNodesFactory = $addedFileWithNodesFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php b/rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php index d3a616c8413..7dfca1a5ebf 100644 --- a/rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php +++ b/rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php @@ -35,22 +35,10 @@ final class MoveServicesBySuffixToDirectoryRector extends AbstractRector impleme */ private $groupNamesBySuffix = []; - /** - * @var ExpectedFileLocationResolver - */ - private $expectedFileLocationResolver; - - /** - * @var AddedFileWithNodesFactory - */ - private $addedFileWithNodesFactory; - public function __construct( - ExpectedFileLocationResolver $expectedFileLocationResolver, - AddedFileWithNodesFactory $addedFileWithNodesFactory + private ExpectedFileLocationResolver $expectedFileLocationResolver, + private AddedFileWithNodesFactory $addedFileWithNodesFactory ) { - $this->expectedFileLocationResolver = $expectedFileLocationResolver; - $this->addedFileWithNodesFactory = $addedFileWithNodesFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php b/rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php index 9177c6eb288..44e3771e432 100644 --- a/rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php +++ b/rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php @@ -64,22 +64,10 @@ final class MoveValueObjectsToValueObjectDirectoryRector extends AbstractRector */ private $suffixes = []; - /** - * @var AddedFileWithNodesFactory - */ - private $addedFileWithNodesFactory; - - /** - * @var ValueObjectClassAnalyzer - */ - private $valueObjectClassAnalyzer; - public function __construct( - AddedFileWithNodesFactory $addedFileWithNodesFactory, - ValueObjectClassAnalyzer $valueObjectClassAnalyzer + private AddedFileWithNodesFactory $addedFileWithNodesFactory, + private ValueObjectClassAnalyzer $valueObjectClassAnalyzer ) { - $this->addedFileWithNodesFactory = $addedFileWithNodesFactory; - $this->valueObjectClassAnalyzer = $valueObjectClassAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php b/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php index 7672e296976..3ee96530d16 100644 --- a/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php +++ b/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php @@ -20,22 +20,10 @@ */ final class MoveInterfacesToContractNamespaceDirectoryRector extends AbstractRector { - /** - * @var NetteControlFactoryInterfaceAnalyzer - */ - private $netteControlFactoryInterfaceAnalyzer; - - /** - * @var AddedFileWithNodesFactory - */ - private $addedFileWithNodesFactory; - public function __construct( - NetteControlFactoryInterfaceAnalyzer $netteControlFactoryInterfaceAnalyzer, - AddedFileWithNodesFactory $addedFileWithNodesFactory + private NetteControlFactoryInterfaceAnalyzer $netteControlFactoryInterfaceAnalyzer, + private AddedFileWithNodesFactory $addedFileWithNodesFactory ) { - $this->netteControlFactoryInterfaceAnalyzer = $netteControlFactoryInterfaceAnalyzer; - $this->addedFileWithNodesFactory = $addedFileWithNodesFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/CompactConverter.php b/rules/CodeQuality/CompactConverter.php index cdac341d20a..94a30fcd27d 100644 --- a/rules/CodeQuality/CompactConverter.php +++ b/rules/CodeQuality/CompactConverter.php @@ -14,14 +14,9 @@ final class CompactConverter { - /** - * @var ValueResolver - */ - private $valueResolver; - - public function __construct(ValueResolver $valueResolver) - { - $this->valueResolver = $valueResolver; + public function __construct( + private ValueResolver $valueResolver + ) { } public function hasAllArgumentsNamed(FuncCall $funcCall): bool diff --git a/rules/CodeQuality/Naming/MethodCallToVariableNameResolver.php b/rules/CodeQuality/Naming/MethodCallToVariableNameResolver.php index 81ce626ba27..0ab11b0bf2f 100644 --- a/rules/CodeQuality/Naming/MethodCallToVariableNameResolver.php +++ b/rules/CodeQuality/Naming/MethodCallToVariableNameResolver.php @@ -40,20 +40,10 @@ final class MethodCallToVariableNameResolver */ private const VALID_STRING_VARIABLE_REGEX = '#^[a-z_]\w*$#'; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver, ExpectedNameResolver $expectedNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->expectedNameResolver = $expectedNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private ExpectedNameResolver $expectedNameResolver + ) { } /** diff --git a/rules/CodeQuality/NodeAnalyzer/CallableClassMethodMatcher.php b/rules/CodeQuality/NodeAnalyzer/CallableClassMethodMatcher.php index f5a10d72d4c..cb43041fb44 100644 --- a/rules/CodeQuality/NodeAnalyzer/CallableClassMethodMatcher.php +++ b/rules/CodeQuality/NodeAnalyzer/CallableClassMethodMatcher.php @@ -22,36 +22,12 @@ final class CallableClassMethodMatcher { - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - ValueResolver $valueResolver, - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private ValueResolver $valueResolver, + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->valueResolver = $valueResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/rules/CodeQuality/NodeAnalyzer/ClassLikeAnalyzer.php b/rules/CodeQuality/NodeAnalyzer/ClassLikeAnalyzer.php index d816f27e8e0..04c1dcbb155 100644 --- a/rules/CodeQuality/NodeAnalyzer/ClassLikeAnalyzer.php +++ b/rules/CodeQuality/NodeAnalyzer/ClassLikeAnalyzer.php @@ -9,14 +9,9 @@ final class ClassLikeAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php b/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php index f989f642f6b..9b3caa5b8cf 100644 --- a/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php +++ b/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php @@ -30,36 +30,12 @@ final class ForAnalyzer */ private const COUNT = 'count'; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var AssignManipulator - */ - private $assignManipulator; - public function __construct( - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder, - AssignManipulator $assignManipulator, - NodeComparator $nodeComparator + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder, + private AssignManipulator $assignManipulator, + private NodeComparator $nodeComparator ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->assignManipulator = $assignManipulator; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php b/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php index 914b5a9c6f4..5a11df5f9ce 100644 --- a/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php +++ b/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php @@ -19,43 +19,13 @@ final class ForeachAnalyzer { - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ForAnalyzer - */ - private $forAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeComparator $nodeComparator, - ForAnalyzer $forAnalyzer, - NodeNameResolver $nodeNameResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - BetterNodeFinder $betterNodeFinder + private NodeComparator $nodeComparator, + private ForAnalyzer $forAnalyzer, + private NodeNameResolver $nodeNameResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private BetterNodeFinder $betterNodeFinder ) { - $this->nodeComparator = $nodeComparator; - $this->forAnalyzer = $forAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->betterNodeFinder = $betterNodeFinder; } /** diff --git a/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php b/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php index f9964f22f24..fdd4698a880 100644 --- a/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php +++ b/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php @@ -33,64 +33,16 @@ final class LocalPropertyAnalyzer */ private const LARAVEL_COLLECTION_CLASS = 'Illuminate\Support\Collection'; - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ArrayDimFetchTypeResolver - */ - private $arrayDimFetchTypeResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var TypeFactory - */ - private $typeFactory; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - ClassAnalyzer $classAnalyzer, - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder, - ArrayDimFetchTypeResolver $arrayDimFetchTypeResolver, - NodeTypeResolver $nodeTypeResolver, - PropertyFetchAnalyzer $propertyFetchAnalyzer, - TypeFactory $typeFactory + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private ClassAnalyzer $classAnalyzer, + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder, + private ArrayDimFetchTypeResolver $arrayDimFetchTypeResolver, + private NodeTypeResolver $nodeTypeResolver, + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private TypeFactory $typeFactory ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->classAnalyzer = $classAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->arrayDimFetchTypeResolver = $arrayDimFetchTypeResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->typeFactory = $typeFactory; } /** diff --git a/rules/CodeQuality/NodeFactory/AnonymousFunctionFactory.php b/rules/CodeQuality/NodeFactory/AnonymousFunctionFactory.php index 16be3d73ff6..bbd46ba7d90 100644 --- a/rules/CodeQuality/NodeFactory/AnonymousFunctionFactory.php +++ b/rules/CodeQuality/NodeFactory/AnonymousFunctionFactory.php @@ -24,29 +24,11 @@ final class AnonymousFunctionFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - public function __construct( - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - StaticTypeMapper $staticTypeMapper + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private StaticTypeMapper $staticTypeMapper ) { - $this->nodeFactory = $nodeFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->staticTypeMapper = $staticTypeMapper; } /** diff --git a/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php b/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php index 736e7ec7e47..37b4488af70 100644 --- a/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php +++ b/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php @@ -10,20 +10,10 @@ final class MissingPropertiesFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var PropertyTypeDecorator - */ - private $propertyTypeDecorator; - - public function __construct(NodeFactory $nodeFactory, PropertyTypeDecorator $propertyTypeDecorator) - { - $this->nodeFactory = $nodeFactory; - $this->propertyTypeDecorator = $propertyTypeDecorator; + public function __construct( + private NodeFactory $nodeFactory, + private PropertyTypeDecorator $propertyTypeDecorator + ) { } /** diff --git a/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php b/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php index 3047b296433..0cdeec50c7e 100644 --- a/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php +++ b/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php @@ -18,36 +18,12 @@ final class PropertyTypeDecorator { - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - PhpVersionProvider $phpVersionProvider, - StaticTypeMapper $staticTypeMapper, - PhpDocTypeChanger $phpDocTypeChanger, - PhpDocInfoFactory $phpDocInfoFactory + private PhpVersionProvider $phpVersionProvider, + private StaticTypeMapper $staticTypeMapper, + private PhpDocTypeChanger $phpDocTypeChanger, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->phpVersionProvider = $phpVersionProvider; - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->phpDocInfoFactory = $phpDocInfoFactory; } public function decorateProperty(Property $property, Type $propertyType): void diff --git a/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php b/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php index 3015855e5a1..633e2609b9f 100644 --- a/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php +++ b/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php @@ -18,36 +18,12 @@ final class ExprBoolCaster { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - /** - * @var StaticTypeAnalyzer - */ - private $staticTypeAnalyzer; - - /** - * @var NodeFactory - */ - private $nodeFactory; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - TypeUnwrapper $typeUnwrapper, - StaticTypeAnalyzer $staticTypeAnalyzer, - NodeFactory $nodeFactory + private NodeTypeResolver $nodeTypeResolver, + private TypeUnwrapper $typeUnwrapper, + private StaticTypeAnalyzer $staticTypeAnalyzer, + private NodeFactory $nodeFactory ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeUnwrapper = $typeUnwrapper; - $this->staticTypeAnalyzer = $staticTypeAnalyzer; - $this->nodeFactory = $nodeFactory; } public function boolCastOrNullCompareIfNeeded(Expr $expr): Expr diff --git a/rules/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector.php b/rules/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector.php index 89ee3bb938b..cecf1953ee4 100644 --- a/rules/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector.php +++ b/rules/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector.php @@ -28,22 +28,10 @@ */ final class ArrayThisCallToThisMethodCallRector extends AbstractRector { - /** - * @var ArrayCallableMethodReferenceAnalyzer - */ - private $arrayCallableMethodReferenceAnalyzer; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - ArrayCallableMethodReferenceAnalyzer $arrayCallableMethodReferenceAnalyzer, - ReflectionProvider $reflectionProvider + private ArrayCallableMethodReferenceAnalyzer $arrayCallableMethodReferenceAnalyzer, + private ReflectionProvider $reflectionProvider ) { - $this->arrayCallableMethodReferenceAnalyzer = $arrayCallableMethodReferenceAnalyzer; - $this->reflectionProvider = $reflectionProvider; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php b/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php index e5d0a3ecf79..64491461643 100644 --- a/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php +++ b/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php @@ -29,22 +29,10 @@ */ final class CallableThisArrayToAnonymousFunctionRector extends AbstractRector { - /** - * @var CallableClassMethodMatcher - */ - private $callableClassMethodMatcher; - - /** - * @var AnonymousFunctionFactory - */ - private $anonymousFunctionFactory; - public function __construct( - CallableClassMethodMatcher $callableClassMethodMatcher, - AnonymousFunctionFactory $anonymousFunctionFactory + private CallableClassMethodMatcher $callableClassMethodMatcher, + private AnonymousFunctionFactory $anonymousFunctionFactory ) { - $this->callableClassMethodMatcher = $callableClassMethodMatcher; - $this->anonymousFunctionFactory = $anonymousFunctionFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Assign/CombinedAssignRector.php b/rules/CodeQuality/Rector/Assign/CombinedAssignRector.php index 52e3a235f46..bb42fa66ff6 100644 --- a/rules/CodeQuality/Rector/Assign/CombinedAssignRector.php +++ b/rules/CodeQuality/Rector/Assign/CombinedAssignRector.php @@ -17,14 +17,9 @@ */ final class CombinedAssignRector extends AbstractRector { - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - public function __construct(AssignAndBinaryMap $assignAndBinaryMap) - { - $this->assignAndBinaryMap = $assignAndBinaryMap; + public function __construct( + private AssignAndBinaryMap $assignAndBinaryMap + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php b/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php index d6c9fa8b052..ec24cfb9009 100644 --- a/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php +++ b/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php @@ -23,14 +23,9 @@ */ final class SimplifyEmptyArrayCheckRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector.php b/rules/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector.php index 543918b8f7c..c0a14754e02 100644 --- a/rules/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector.php +++ b/rules/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector.php @@ -18,14 +18,9 @@ */ final class SimplifyDeMorganBinaryRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php b/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php index cf7e252a209..c1af964e596 100644 --- a/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php +++ b/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php @@ -35,14 +35,9 @@ final class ThrowWithPreviousExceptionRector extends AbstractRector */ private const DEFAULT_EXCEPTION_ARGUMENT_POSITION = 2; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php b/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php index f1a4033a67e..7b3dcd5ee07 100644 --- a/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php +++ b/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php @@ -38,14 +38,9 @@ final class DateTimeToDateTimeInterfaceRector extends AbstractRector 'add', 'modify', MethodName::SET_STATE, 'setDate', 'setISODate', 'setTime', 'setTimestamp', 'setTimezone', 'sub', ]; - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php b/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php index c991d571fda..085ce4fae6c 100644 --- a/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php +++ b/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php @@ -21,14 +21,9 @@ */ final class NarrowUnionTypeDocRector extends AbstractRector { - /** - * @var UnionTypeAnalyzer - */ - private $unionTypeAnalyzer; - - public function __construct(UnionTypeAnalyzer $unionTypeAnalyzer) - { - $this->unionTypeAnalyzer = $unionTypeAnalyzer; + public function __construct( + private UnionTypeAnalyzer $unionTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php b/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php index 53b3fd1ce6b..adad6e511a4 100644 --- a/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php +++ b/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php @@ -26,43 +26,13 @@ */ final class CompleteDynamicPropertiesRector extends AbstractRector { - /** - * @var MissingPropertiesFactory - */ - private $missingPropertiesFactory; - - /** - * @var LocalPropertyAnalyzer - */ - private $localPropertyAnalyzer; - - /** - * @var ClassLikeAnalyzer - */ - private $classLikeAnalyzer; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - MissingPropertiesFactory $missingPropertiesFactory, - LocalPropertyAnalyzer $localPropertyAnalyzer, - ClassLikeAnalyzer $classLikeAnalyzer, - ReflectionProvider $reflectionProvider, - ClassAnalyzer $classAnalyzer + private MissingPropertiesFactory $missingPropertiesFactory, + private LocalPropertyAnalyzer $localPropertyAnalyzer, + private ClassLikeAnalyzer $classLikeAnalyzer, + private ReflectionProvider $reflectionProvider, + private ClassAnalyzer $classAnalyzer ) { - $this->missingPropertiesFactory = $missingPropertiesFactory; - $this->localPropertyAnalyzer = $localPropertyAnalyzer; - $this->classLikeAnalyzer = $classLikeAnalyzer; - $this->reflectionProvider = $reflectionProvider; - $this->classAnalyzer = $classAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php b/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php index 0c898368f16..f8bc456ad2d 100644 --- a/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php +++ b/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php @@ -25,14 +25,9 @@ */ final class InlineIfToExplicitIfRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php b/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php index 642cf5c6d1d..df57d97de8b 100644 --- a/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php +++ b/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php @@ -20,14 +20,9 @@ */ final class ForRepeatedCountToOwnVariableRector extends AbstractRector { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/For_/ForToForeachRector.php b/rules/CodeQuality/Rector/For_/ForToForeachRector.php index c543cf481ee..223bcd1944f 100644 --- a/rules/CodeQuality/Rector/For_/ForToForeachRector.php +++ b/rules/CodeQuality/Rector/For_/ForToForeachRector.php @@ -30,11 +30,6 @@ final class ForToForeachRector extends AbstractRector */ private const COUNT = 'count'; - /** - * @var Inflector - */ - private $inflector; - /** * @var string|null */ @@ -55,31 +50,12 @@ final class ForToForeachRector extends AbstractRector */ private $iteratedExpr; - /** - * @var ForAnalyzer - */ - private $forAnalyzer; - - /** - * @var ForeachFactory - */ - private $foreachFactory; - - /** - * @var ForeachAnalyzer - */ - private $foreachAnalyzer; - public function __construct( - Inflector $inflector, - ForAnalyzer $forAnalyzer, - ForeachFactory $foreachFactory, - ForeachAnalyzer $foreachAnalyzer + private Inflector $inflector, + private ForAnalyzer $forAnalyzer, + private ForeachFactory $foreachFactory, + private ForeachAnalyzer $foreachAnalyzer ) { - $this->inflector = $inflector; - $this->forAnalyzer = $forAnalyzer; - $this->foreachFactory = $foreachFactory; - $this->foreachAnalyzer = $foreachAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php index 8532f589e6b..579c8b184f4 100644 --- a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php +++ b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php @@ -20,20 +20,10 @@ */ final class ForeachItemsAssignToEmptyArrayToAssignRector extends AbstractRector { - /** - * @var NodeUsageFinder - */ - private $nodeUsageFinder; - - /** - * @var ForeachAnalyzer - */ - private $foreachAnalyzer; - - public function __construct(NodeUsageFinder $nodeUsageFinder, ForeachAnalyzer $foreachAnalyzer) - { - $this->nodeUsageFinder = $nodeUsageFinder; - $this->foreachAnalyzer = $foreachAnalyzer; + public function __construct( + private NodeUsageFinder $nodeUsageFinder, + private ForeachAnalyzer $foreachAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php index 08ade0e6752..8ccbcb2cbac 100644 --- a/rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php +++ b/rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php @@ -29,20 +29,10 @@ */ final class ForeachToInArrayRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - /** - * @var CommentsMerger - */ - private $commentsMerger; - - public function __construct(BinaryOpManipulator $binaryOpManipulator, CommentsMerger $commentsMerger) - { - $this->binaryOpManipulator = $binaryOpManipulator; - $this->commentsMerger = $commentsMerger; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator, + private CommentsMerger $commentsMerger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php b/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php index e45a7624d07..d6bf50ccb49 100644 --- a/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php +++ b/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php @@ -27,19 +27,14 @@ */ final class SimplifyForeachToCoalescingRector extends AbstractRector { - /** - * @var ForeachManipulator - */ - private $foreachManipulator; - /** * @var Return_|null */ private $return; - public function __construct(ForeachManipulator $foreachManipulator) - { - $this->foreachManipulator = $foreachManipulator; + public function __construct( + private ForeachManipulator $foreachManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php b/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php index 163f17eb176..2f3a3b1ae5c 100644 --- a/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php +++ b/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php @@ -20,14 +20,9 @@ */ final class CallUserFuncWithArrowFunctionToInlineRector extends AbstractRector { - /** - * @var ClosureArrowFunctionAnalyzer - */ - private $closureArrowFunctionAnalyzer; - - public function __construct(ClosureArrowFunctionAnalyzer $closureArrowFunctionAnalyzer) - { - $this->closureArrowFunctionAnalyzer = $closureArrowFunctionAnalyzer; + public function __construct( + private ClosureArrowFunctionAnalyzer $closureArrowFunctionAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php b/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php index fa9551b4d98..4b74e6cf14c 100644 --- a/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php +++ b/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php @@ -27,29 +27,11 @@ */ final class CompactToVariablesRector extends AbstractRector { - /** - * @var CompactConverter - */ - private $compactConverter; - - /** - * @var ArrayItemsAnalyzer - */ - private $arrayItemsAnalyzer; - - /** - * @var ArrayCompacter - */ - private $arrayCompacter; - public function __construct( - CompactConverter $compactConverter, - ArrayItemsAnalyzer $arrayItemsAnalyzer, - ArrayCompacter $arrayCompacter + private CompactConverter $compactConverter, + private ArrayItemsAnalyzer $arrayItemsAnalyzer, + private ArrayCompacter $arrayCompacter ) { - $this->compactConverter = $compactConverter; - $this->arrayItemsAnalyzer = $arrayItemsAnalyzer; - $this->arrayCompacter = $arrayCompacter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector.php b/rules/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector.php index 1c9abf0e196..262671ff20e 100644 --- a/rules/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector.php +++ b/rules/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector.php @@ -32,14 +32,9 @@ final class SimplifyRegexPatternRector extends AbstractRector '[\r\n\t\f\v ]' => '\s', ]; - /** - * @var RegexPatternArgumentManipulator - */ - private $regexPatternArgumentManipulator; - - public function __construct(RegexPatternArgumentManipulator $regexPatternArgumentManipulator) - { - $this->regexPatternArgumentManipulator = $regexPatternArgumentManipulator; + public function __construct( + private RegexPatternArgumentManipulator $regexPatternArgumentManipulator + ) { } public function getRuleDefinition(): RuleDefinition From fc461611395e80eea2993eb22079f94055934e01 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 10 May 2021 14:04:13 +0200 Subject: [PATCH 3/6] [PHP 8] Use promoted properties --- .../Printer/PhpDocInfoPrinter.php | 10 -- packages/FileFormatter/FileFormatter.php | 3 +- .../NodeNameResolver/NodeNameResolver.php | 3 +- src/Application/ApplicationFileProcessor.php | 40 +------- .../FileDecorator/FileDiffFileDecorator.php | 11 +-- src/Application/FileProcessor.php | 40 +------- .../FileProcessor/PhpFileProcessor.php | 88 +++-------------- .../RemovedAndAddedFilesProcessor.php | 40 +------- src/Autoloading/AdditionalAutoloader.php | 24 +---- src/Autoloading/BootstrapFilesIncluder.php | 11 +-- src/Console/Command/InitCommand.php | 32 +----- src/Console/Command/ProcessCommand.php | 97 +++---------------- src/Console/Command/ShowCommand.php | 19 +--- src/Console/Output/RectorOutputStyle.php | 11 +-- src/Console/Style/SymfonyStyleFactory.php | 11 +-- ...dRectorConfigureCallValuesCompilerPass.php | 11 +-- ...rableCallValuesCollectingPhpFileLoader.php | 9 +- src/Exclusion/ExclusionManager.php | 11 +-- src/FileSystem/FilesFinder.php | 32 +----- src/FileSystem/FilesystemTweaker.php | 11 +-- src/FileSystem/PhpFilesFinder.php | 24 +---- src/HttpKernel/RectorKernel.php | 13 +-- src/NodeAnalyzer/ChangedNodeAnalyzer.php | 11 +-- src/NodeAnalyzer/ClassAnalyzer.php | 11 +-- src/NodeAnalyzer/CompactFuncCallAnalyzer.php | 11 +-- src/NodeAnalyzer/ParamAnalyzer.php | 18 +--- src/NodeAnalyzer/PropertyFetchAnalyzer.php | 18 +--- src/NodeAnalyzer/PropertyPresenceChecker.php | 24 +---- src/NodeManipulator/ArrayManipulator.php | 11 +-- src/NodeManipulator/AssignManipulator.php | 40 +------- src/NodeManipulator/BinaryOpManipulator.php | 11 +-- .../ChildAndParentClassManipulator.php | 48 ++------- src/NodeManipulator/ClassConstManipulator.php | 40 +------- .../ClassDependencyManipulator.php | 64 ++---------- .../ClassInsertManipulator.php | 18 +--- src/NodeManipulator/ClassManipulator.php | 24 +---- 36 files changed, 142 insertions(+), 758 deletions(-) diff --git a/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php b/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php index e6383960fe2..71e08f646e9 100644 --- a/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php +++ b/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php @@ -33,12 +33,6 @@ final class PhpDocInfoPrinter */ public const CLOSING_DOCBLOCK_REGEX = '#\*\/(\s+)?$#'; - /** - * @var string - * @see https://regex101.com/r/Jzqzpw/1 - */ - private const MISSING_NEWLINE_REGEX = '#([^\s])\*/$#'; - /** * @var string * @see https://regex101.com/r/mVmOCY/2 @@ -136,10 +130,6 @@ public function __construct( public function printNew(PhpDocInfo $phpDocInfo): string { $docContent = (string) $phpDocInfo->getPhpDocNode(); - - // fix missing newline in the end of docblock - keep BC compatible for both cases until phpstan with phpdoc-parser 0.5.2 is released - $docContent = Strings::replace($docContent, self::MISSING_NEWLINE_REGEX, "$1\n */"); - if ($phpDocInfo->isSingleLine()) { return $this->docBlockInliner->inline($docContent); } diff --git a/packages/FileFormatter/FileFormatter.php b/packages/FileFormatter/FileFormatter.php index eab48607091..0cefce8e572 100644 --- a/packages/FileFormatter/FileFormatter.php +++ b/packages/FileFormatter/FileFormatter.php @@ -25,8 +25,7 @@ public function __construct( private EditorConfigParserInterface $editorConfigParser, private ParameterProvider $parameterProvider, private array $fileFormatters = [] - ) - { + ) { } /** diff --git a/packages/NodeNameResolver/NodeNameResolver.php b/packages/NodeNameResolver/NodeNameResolver.php index 9604129d644..09149cfcec1 100644 --- a/packages/NodeNameResolver/NodeNameResolver.php +++ b/packages/NodeNameResolver/NodeNameResolver.php @@ -29,8 +29,7 @@ public function __construct( private ClassNaming $classNaming, private InvalidNameNodeReporter $invalidNameNodeReporter, private array $nodeNameResolvers = [] - ) - { + ) { } /** diff --git a/src/Application/ApplicationFileProcessor.php b/src/Application/ApplicationFileProcessor.php index 3a22e53f7c9..be5a5f39b08 100644 --- a/src/Application/ApplicationFileProcessor.php +++ b/src/Application/ApplicationFileProcessor.php @@ -13,46 +13,16 @@ final class ApplicationFileProcessor { - /** - * @var FileProcessorInterface[] - */ - private $fileProcessors = []; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var FileDiffFileDecorator - */ - private $fileDiffFileDecorator; - - /** - * @var FileFormatter - */ - private $fileFormatter; - /** * @param FileProcessorInterface[] $fileProcessors */ public function __construct( - Configuration $configuration, - SmartFileSystem $smartFileSystem, - FileDiffFileDecorator $fileDiffFileDecorator, - FileFormatter $fileFormatter, - array $fileProcessors = [] + private Configuration $configuration, + private SmartFileSystem $smartFileSystem, + private FileDiffFileDecorator $fileDiffFileDecorator, + private FileFormatter $fileFormatter, + private array $fileProcessors = [] ) { - $this->fileProcessors = $fileProcessors; - $this->smartFileSystem = $smartFileSystem; - $this->configuration = $configuration; - $this->fileDiffFileDecorator = $fileDiffFileDecorator; - $this->fileFormatter = $fileFormatter; } /** diff --git a/src/Application/FileDecorator/FileDiffFileDecorator.php b/src/Application/FileDecorator/FileDiffFileDecorator.php index d8c212c3bf4..e3c1094bbfe 100644 --- a/src/Application/FileDecorator/FileDiffFileDecorator.php +++ b/src/Application/FileDecorator/FileDiffFileDecorator.php @@ -10,14 +10,9 @@ final class FileDiffFileDecorator implements FileDecoratorInterface { - /** - * @var FileDiffFactory - */ - private $fileDiffFactory; - - public function __construct(FileDiffFactory $fileDiffFactory) - { - $this->fileDiffFactory = $fileDiffFactory; + public function __construct( + private FileDiffFactory $fileDiffFactory + ) { } /** diff --git a/src/Application/FileProcessor.php b/src/Application/FileProcessor.php index 184b3c605db..b58fd970c19 100644 --- a/src/Application/FileProcessor.php +++ b/src/Application/FileProcessor.php @@ -13,43 +13,13 @@ final class FileProcessor { - /** - * @var Parser - */ - private $parser; - - /** - * @var Lexer - */ - private $lexer; - - /** - * @var RectorNodeTraverser - */ - private $rectorNodeTraverser; - - /** - * @var NodeScopeAndMetadataDecorator - */ - private $nodeScopeAndMetadataDecorator; - - /** - * @var AffectedFilesCollector - */ - private $affectedFilesCollector; - public function __construct( - AffectedFilesCollector $affectedFilesCollector, - Lexer $lexer, - NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, - Parser $parser, - RectorNodeTraverser $rectorNodeTraverser + private AffectedFilesCollector $affectedFilesCollector, + private Lexer $lexer, + private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, + private Parser $parser, + private RectorNodeTraverser $rectorNodeTraverser ) { - $this->parser = $parser; - $this->lexer = $lexer; - $this->rectorNodeTraverser = $rectorNodeTraverser; - $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator; - $this->affectedFilesCollector = $affectedFilesCollector; } public function parseFileInfoToLocalCache(File $file): void diff --git a/src/Application/FileProcessor/PhpFileProcessor.php b/src/Application/FileProcessor/PhpFileProcessor.php index 5500cb5b85a..dcb526b778a 100644 --- a/src/Application/FileProcessor/PhpFileProcessor.php +++ b/src/Application/FileProcessor/PhpFileProcessor.php @@ -38,91 +38,25 @@ final class PhpFileProcessor implements FileProcessorInterface */ private const PROGRESS_BAR_STEP_MULTIPLIER = 4; - /** - * @var Configuration - */ - private $configuration; - /** * @var File[] */ private $notParsedFiles = []; - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - /** - * @var FileProcessor - */ - private $fileProcessor; - - /** - * @var RemovedAndAddedFilesCollector - */ - private $removedAndAddedFilesCollector; - - /** - * @var RemovedAndAddedFilesProcessor - */ - private $removedAndAddedFilesProcessor; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - - /** - * @var FileDiffFileDecorator - */ - private $fileDiffFileDecorator; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - - /** - * @var FormatPerservingPrinter - */ - private $formatPerservingPrinter; - - /** - * @var PostFileProcessor - */ - private $postFileProcessor; - - /** - * @var ErrorFactory - */ - private $errorFactory; - public function __construct( - Configuration $configuration, - FormatPerservingPrinter $formatPerservingPrinter, - FileProcessor $fileProcessor, - RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, - RemovedAndAddedFilesProcessor $removedAndAddedFilesProcessor, - SymfonyStyle $symfonyStyle, - PrivatesAccessor $privatesAccessor, - FileDiffFileDecorator $fileDiffFileDecorator, - CurrentFileProvider $currentFileProvider, - PostFileProcessor $postFileProcessor, - ErrorFactory $errorFactory + private Configuration $configuration, + private FormatPerservingPrinter $formatPerservingPrinter, + private FileProcessor $fileProcessor, + private RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, + private RemovedAndAddedFilesProcessor $removedAndAddedFilesProcessor, + private SymfonyStyle $symfonyStyle, + private PrivatesAccessor $privatesAccessor, + private FileDiffFileDecorator $fileDiffFileDecorator, + private CurrentFileProvider $currentFileProvider, + private PostFileProcessor $postFileProcessor, + private ErrorFactory $errorFactory ) { - $this->symfonyStyle = $symfonyStyle; - $this->configuration = $configuration; - $this->fileProcessor = $fileProcessor; - $this->removedAndAddedFilesCollector = $removedAndAddedFilesCollector; - $this->removedAndAddedFilesProcessor = $removedAndAddedFilesProcessor; - $this->privatesAccessor = $privatesAccessor; - $this->fileDiffFileDecorator = $fileDiffFileDecorator; $this->configuration = $configuration; - $this->currentFileProvider = $currentFileProvider; - $this->formatPerservingPrinter = $formatPerservingPrinter; - $this->postFileProcessor = $postFileProcessor; - $this->errorFactory = $errorFactory; } /** diff --git a/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php b/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php index 6d81f25ca29..6a9df8b63ce 100644 --- a/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php +++ b/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php @@ -14,43 +14,13 @@ */ final class RemovedAndAddedFilesProcessor { - /** - * @var RemovedAndAddedFilesCollector - */ - private $removedAndAddedFilesCollector; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - /** - * @var NodesWithFileDestinationPrinter - */ - private $nodesWithFileDestinationPrinter; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - public function __construct( - Configuration $configuration, - SmartFileSystem $smartFileSystem, - NodesWithFileDestinationPrinter $nodesWithFileDestinationPrinter, - RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, - SymfonyStyle $symfonyStyle + private Configuration $configuration, + private SmartFileSystem $smartFileSystem, + private NodesWithFileDestinationPrinter $nodesWithFileDestinationPrinter, + private RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, + private SymfonyStyle $symfonyStyle ) { - $this->removedAndAddedFilesCollector = $removedAndAddedFilesCollector; - $this->configuration = $configuration; - $this->symfonyStyle = $symfonyStyle; - $this->nodesWithFileDestinationPrinter = $nodesWithFileDestinationPrinter; - $this->smartFileSystem = $smartFileSystem; } public function run(): void diff --git a/src/Autoloading/AdditionalAutoloader.php b/src/Autoloading/AdditionalAutoloader.php index 21819b9d38b..de912379faf 100644 --- a/src/Autoloading/AdditionalAutoloader.php +++ b/src/Autoloading/AdditionalAutoloader.php @@ -15,29 +15,11 @@ */ final class AdditionalAutoloader { - /** - * @var FileSystemGuard - */ - private $fileSystemGuard; - - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var DynamicSourceLocatorDecorator - */ - private $dynamicSourceLocatorDecorator; - public function __construct( - FileSystemGuard $fileSystemGuard, - ParameterProvider $parameterProvider, - DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator + private FileSystemGuard $fileSystemGuard, + private ParameterProvider $parameterProvider, + private DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator ) { - $this->fileSystemGuard = $fileSystemGuard; - $this->parameterProvider = $parameterProvider; - $this->dynamicSourceLocatorDecorator = $dynamicSourceLocatorDecorator; } public function autoloadInput(InputInterface $input): void diff --git a/src/Autoloading/BootstrapFilesIncluder.php b/src/Autoloading/BootstrapFilesIncluder.php index 2b6752bb660..7b38dd25fa4 100644 --- a/src/Autoloading/BootstrapFilesIncluder.php +++ b/src/Autoloading/BootstrapFilesIncluder.php @@ -11,14 +11,9 @@ final class BootstrapFilesIncluder { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - public function __construct(ParameterProvider $parameterProvider) - { - $this->parameterProvider = $parameterProvider; + public function __construct( + private ParameterProvider $parameterProvider + ) { } /** diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php index 50b9aa3bd8a..ebb976a7d19 100644 --- a/src/Console/Command/InitCommand.php +++ b/src/Console/Command/InitCommand.php @@ -18,39 +18,15 @@ final class InitCommand extends Command { - /** - * @var FileSystemGuard - */ - private $fileSystemGuard; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - /** - * @var TemplateResolverInterface[] - */ - private $templateResolvers = []; - /** * @param TemplateResolverInterface[] $templateResolvers */ public function __construct( - FileSystemGuard $fileSystemGuard, - SmartFileSystem $smartFileSystem, - SymfonyStyle $symfonyStyle, - array $templateResolvers + private FileSystemGuard $fileSystemGuard, + private SmartFileSystem $smartFileSystem, + private SymfonyStyle $symfonyStyle, + private array $templateResolvers ) { - $this->fileSystemGuard = $fileSystemGuard; - $this->smartFileSystem = $smartFileSystem; - $this->symfonyStyle = $symfonyStyle; - $this->templateResolvers = $templateResolvers; parent::__construct(); } diff --git a/src/Console/Command/ProcessCommand.php b/src/Console/Command/ProcessCommand.php index 624a3a779fd..4f731a639cc 100644 --- a/src/Console/Command/ProcessCommand.php +++ b/src/Console/Command/ProcessCommand.php @@ -31,94 +31,21 @@ final class ProcessCommand extends Command { - /** - * @var AdditionalAutoloader - */ - private $additionalAutoloader; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var OutputFormatterCollector - */ - private $outputFormatterCollector; - - /** - * @var PhpFilesFinder - */ - private $phpFilesFinder; - - /** - * @var ChangedFilesDetector - */ - private $changedFilesDetector; - - /** - * @var MissingRectorRulesReporter - */ - private $missingRectorRulesReporter; - - /** - * @var ApplicationFileProcessor - */ - private $applicationFileProcessor; - - /** - * @var FileFactory - */ - private $fileFactory; - - /** - * @var BootstrapFilesIncluder - */ - private $bootstrapFilesIncluder; - - /** - * @var ProcessResultFactory - */ - private $processResultFactory; - - /** - * @var NodeScopeResolver - */ - private $nodeScopeResolver; - - /** - * @var DynamicSourceLocatorDecorator - */ - private $dynamicSourceLocatorDecorator; - public function __construct( - AdditionalAutoloader $additionalAutoloader, - ChangedFilesDetector $changedFilesDetector, - Configuration $configuration, - OutputFormatterCollector $outputFormatterCollector, - PhpFilesFinder $phpFilesFinder, - MissingRectorRulesReporter $missingRectorRulesReporter, - ApplicationFileProcessor $applicationFileProcessor, - FileFactory $fileFactory, - BootstrapFilesIncluder $bootstrapFilesIncluder, - ProcessResultFactory $processResultFactory, - NodeScopeResolver $nodeScopeResolver, - DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator + private AdditionalAutoloader $additionalAutoloader, + private ChangedFilesDetector $changedFilesDetector, + private Configuration $configuration, + private OutputFormatterCollector $outputFormatterCollector, + private PhpFilesFinder $phpFilesFinder, + private MissingRectorRulesReporter $missingRectorRulesReporter, + private ApplicationFileProcessor $applicationFileProcessor, + private FileFactory $fileFactory, + private BootstrapFilesIncluder $bootstrapFilesIncluder, + private ProcessResultFactory $processResultFactory, + private NodeScopeResolver $nodeScopeResolver, + private DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator ) { - $this->additionalAutoloader = $additionalAutoloader; - $this->configuration = $configuration; - $this->outputFormatterCollector = $outputFormatterCollector; - $this->changedFilesDetector = $changedFilesDetector; - $this->phpFilesFinder = $phpFilesFinder; - $this->missingRectorRulesReporter = $missingRectorRulesReporter; - parent::__construct(); - $this->applicationFileProcessor = $applicationFileProcessor; - $this->fileFactory = $fileFactory; - $this->bootstrapFilesIncluder = $bootstrapFilesIncluder; - $this->processResultFactory = $processResultFactory; - $this->nodeScopeResolver = $nodeScopeResolver; - $this->dynamicSourceLocatorDecorator = $dynamicSourceLocatorDecorator; } protected function configure(): void diff --git a/src/Console/Command/ShowCommand.php b/src/Console/Command/ShowCommand.php index 06815c3730b..b30f0426074 100644 --- a/src/Console/Command/ShowCommand.php +++ b/src/Console/Command/ShowCommand.php @@ -14,24 +14,13 @@ final class ShowCommand extends Command { - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - /** - * @var RectorInterface[] - */ - private $rectors = []; - /** * @param RectorInterface[] $rectors */ - public function __construct(SymfonyStyle $symfonyStyle, array $rectors) - { - $this->symfonyStyle = $symfonyStyle; - $this->rectors = $rectors; - + public function __construct( + private SymfonyStyle $symfonyStyle, + private array $rectors + ) { parent::__construct(); } diff --git a/src/Console/Output/RectorOutputStyle.php b/src/Console/Output/RectorOutputStyle.php index 22b888b7074..115a5e8069a 100644 --- a/src/Console/Output/RectorOutputStyle.php +++ b/src/Console/Output/RectorOutputStyle.php @@ -13,14 +13,9 @@ */ final class RectorOutputStyle implements OutputStyleInterface { - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - public function __construct(SymfonyStyle $symfonyStyle) - { - $this->symfonyStyle = $symfonyStyle; + public function __construct( + private SymfonyStyle $symfonyStyle + ) { } public function error(string $message): void diff --git a/src/Console/Style/SymfonyStyleFactory.php b/src/Console/Style/SymfonyStyleFactory.php index 6683c076f3f..7c0323bb4af 100644 --- a/src/Console/Style/SymfonyStyleFactory.php +++ b/src/Console/Style/SymfonyStyleFactory.php @@ -13,14 +13,9 @@ final class SymfonyStyleFactory { - /** - * @var PrivatesCaller - */ - private $privatesCaller; - - public function __construct(PrivatesCaller $privatesCaller) - { - $this->privatesCaller = $privatesCaller; + public function __construct( + private PrivatesCaller $privatesCaller + ) { } public function create(): SymfonyStyle diff --git a/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php b/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php index 76a7faa9c25..75cc2e3e94c 100644 --- a/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php +++ b/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php @@ -16,14 +16,9 @@ final class MergeImportedRectorConfigureCallValuesCompilerPass implements Compil */ private const CONFIGURE_METHOD_NAME = 'configure'; - /** - * @var ConfigureCallValuesCollector - */ - private $configureCallValuesCollector; - - public function __construct(ConfigureCallValuesCollector $configureCallValuesCollector) - { - $this->configureCallValuesCollector = $configureCallValuesCollector; + public function __construct( + private ConfigureCallValuesCollector $configureCallValuesCollector + ) { } public function process(ContainerBuilder $containerBuilder): void diff --git a/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php b/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php index fd87adfb4d0..db0af3b8ca6 100644 --- a/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php +++ b/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php @@ -12,18 +12,11 @@ final class ConfigurableCallValuesCollectingPhpFileLoader extends PhpFileLoader { - /** - * @var ConfigureCallValuesCollector - */ - private $configureCallValuesCollector; - public function __construct( ContainerBuilder $containerBuilder, FileLocatorInterface $fileLocator, - ConfigureCallValuesCollector $configureCallValuesCollector + private ConfigureCallValuesCollector $configureCallValuesCollector ) { - $this->configureCallValuesCollector = $configureCallValuesCollector; - parent::__construct($containerBuilder, $fileLocator); } diff --git a/src/Exclusion/ExclusionManager.php b/src/Exclusion/ExclusionManager.php index 192c15f9a87..178c9d32046 100644 --- a/src/Exclusion/ExclusionManager.php +++ b/src/Exclusion/ExclusionManager.php @@ -21,14 +21,9 @@ */ final class ExclusionManager { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory + ) { } public function isNodeSkippedByRector(Node $node, PhpRectorInterface $phpRector): bool diff --git a/src/FileSystem/FilesFinder.php b/src/FileSystem/FilesFinder.php index c03c8d2cd12..83bcf5e8c48 100644 --- a/src/FileSystem/FilesFinder.php +++ b/src/FileSystem/FilesFinder.php @@ -34,36 +34,12 @@ final class FilesFinder */ private $fileInfosBySourceAndSuffixes = []; - /** - * @var FilesystemTweaker - */ - private $filesystemTweaker; - - /** - * @var FinderSanitizer - */ - private $finderSanitizer; - - /** - * @var FileSystemFilter - */ - private $fileSystemFilter; - - /** - * @var SkippedPathsResolver - */ - private $skippedPathsResolver; - public function __construct( - FilesystemTweaker $filesystemTweaker, - FinderSanitizer $finderSanitizer, - FileSystemFilter $fileSystemFilter, - SkippedPathsResolver $skippedPathsResolver + private FilesystemTweaker $filesystemTweaker, + private FinderSanitizer $finderSanitizer, + private FileSystemFilter $fileSystemFilter, + private SkippedPathsResolver $skippedPathsResolver ) { - $this->filesystemTweaker = $filesystemTweaker; - $this->finderSanitizer = $finderSanitizer; - $this->fileSystemFilter = $fileSystemFilter; - $this->skippedPathsResolver = $skippedPathsResolver; } /** diff --git a/src/FileSystem/FilesystemTweaker.php b/src/FileSystem/FilesystemTweaker.php index a7645d78350..3eb8839d990 100644 --- a/src/FileSystem/FilesystemTweaker.php +++ b/src/FileSystem/FilesystemTweaker.php @@ -9,14 +9,9 @@ final class FilesystemTweaker { - /** - * @var FileSystemGuard - */ - private $fileSystemGuard; - - public function __construct(FileSystemGuard $fileSystemGuard) - { - $this->fileSystemGuard = $fileSystemGuard; + public function __construct( + private FileSystemGuard $fileSystemGuard + ) { } /** diff --git a/src/FileSystem/PhpFilesFinder.php b/src/FileSystem/PhpFilesFinder.php index b381839eed9..1e199c9be0f 100644 --- a/src/FileSystem/PhpFilesFinder.php +++ b/src/FileSystem/PhpFilesFinder.php @@ -11,29 +11,11 @@ final class PhpFilesFinder { - /** - * @var FilesFinder - */ - private $filesFinder; - - /** - * @var Configuration - */ - private $configuration; - - /** - * @var CachedFileInfoFilterAndReporter - */ - private $cachedFileInfoFilterAndReporter; - public function __construct( - FilesFinder $filesFinder, - Configuration $configuration, - CachedFileInfoFilterAndReporter $cachedFileInfoFilterAndReporter + private FilesFinder $filesFinder, + private Configuration $configuration, + private CachedFileInfoFilterAndReporter $cachedFileInfoFilterAndReporter ) { - $this->filesFinder = $filesFinder; - $this->configuration = $configuration; - $this->cachedFileInfoFilterAndReporter = $cachedFileInfoFilterAndReporter; } /** diff --git a/src/HttpKernel/RectorKernel.php b/src/HttpKernel/RectorKernel.php index 0f89a4d6854..59a5db3c3b4 100644 --- a/src/HttpKernel/RectorKernel.php +++ b/src/HttpKernel/RectorKernel.php @@ -34,11 +34,6 @@ */ final class RectorKernel extends Kernel { - /** - * @var SmartFileInfo[] - */ - private $configFileInfos = []; - /** * @var ConfigureCallValuesCollector */ @@ -47,10 +42,12 @@ final class RectorKernel extends Kernel /** * @param SmartFileInfo[] $configFileInfos */ - public function __construct(string $environment, bool $debug, array $configFileInfos) - { + public function __construct( + string $environment, + bool $debug, + private array $configFileInfos + ) { $this->configureCallValuesCollector = new ConfigureCallValuesCollector(); - $this->configFileInfos = $configFileInfos; parent::__construct($environment, $debug); } diff --git a/src/NodeAnalyzer/ChangedNodeAnalyzer.php b/src/NodeAnalyzer/ChangedNodeAnalyzer.php index b3216c7a1b7..ac5bde4ee38 100644 --- a/src/NodeAnalyzer/ChangedNodeAnalyzer.php +++ b/src/NodeAnalyzer/ChangedNodeAnalyzer.php @@ -12,14 +12,9 @@ final class ChangedNodeAnalyzer { - /** - * @var NodeComparator - */ - private $nodeComparator; - - public function __construct(NodeComparator $nodeComparator) - { - $this->nodeComparator = $nodeComparator; + public function __construct( + private NodeComparator $nodeComparator + ) { } public function hasNodeChanged(Node $originalNode, Node $node): bool diff --git a/src/NodeAnalyzer/ClassAnalyzer.php b/src/NodeAnalyzer/ClassAnalyzer.php index 0d36b029b37..bceed963921 100644 --- a/src/NodeAnalyzer/ClassAnalyzer.php +++ b/src/NodeAnalyzer/ClassAnalyzer.php @@ -19,14 +19,9 @@ final class ClassAnalyzer */ private const ANONYMOUS_CLASS_REGEX = '#AnonymousClass\w+$#'; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function isAnonymousClass(Node $node): bool diff --git a/src/NodeAnalyzer/CompactFuncCallAnalyzer.php b/src/NodeAnalyzer/CompactFuncCallAnalyzer.php index 9ebda807e9a..df925374608 100644 --- a/src/NodeAnalyzer/CompactFuncCallAnalyzer.php +++ b/src/NodeAnalyzer/CompactFuncCallAnalyzer.php @@ -11,14 +11,9 @@ final class CompactFuncCallAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function isInCompact(FuncCall $funcCall, Variable $variable): bool diff --git a/src/NodeAnalyzer/ParamAnalyzer.php b/src/NodeAnalyzer/ParamAnalyzer.php index 1c94e369123..9aa6bf44721 100644 --- a/src/NodeAnalyzer/ParamAnalyzer.php +++ b/src/NodeAnalyzer/ParamAnalyzer.php @@ -13,20 +13,10 @@ final class ParamAnalyzer { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeComparator = $nodeComparator; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeComparator $nodeComparator + ) { } public function isParamUsedInClassMethod(ClassMethod $classMethod, Param $param): bool diff --git a/src/NodeAnalyzer/PropertyFetchAnalyzer.php b/src/NodeAnalyzer/PropertyFetchAnalyzer.php index f90b1155c56..45ed615e019 100644 --- a/src/NodeAnalyzer/PropertyFetchAnalyzer.php +++ b/src/NodeAnalyzer/PropertyFetchAnalyzer.php @@ -19,20 +19,10 @@ final class PropertyFetchAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder + ) { } public function isLocalPropertyFetch(Node $node): bool diff --git a/src/NodeAnalyzer/PropertyPresenceChecker.php b/src/NodeAnalyzer/PropertyPresenceChecker.php index 4c63cd34b8d..e898e138d0b 100644 --- a/src/NodeAnalyzer/PropertyPresenceChecker.php +++ b/src/NodeAnalyzer/PropertyPresenceChecker.php @@ -13,29 +13,11 @@ final class PropertyPresenceChecker { - /** - * @var PromotedPropertyResolver - */ - private $promotedPropertyResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - PromotedPropertyResolver $promotedPropertyResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private PromotedPropertyResolver $promotedPropertyResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->promotedPropertyResolver = $promotedPropertyResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/src/NodeManipulator/ArrayManipulator.php b/src/NodeManipulator/ArrayManipulator.php index 6e865757d36..4a4cb03eee1 100644 --- a/src/NodeManipulator/ArrayManipulator.php +++ b/src/NodeManipulator/ArrayManipulator.php @@ -12,14 +12,9 @@ final class ArrayManipulator { - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - public function __construct(RectorChangeCollector $rectorChangeCollector) - { - $this->rectorChangeCollector = $rectorChangeCollector; + public function __construct( + private RectorChangeCollector $rectorChangeCollector + ) { } public function isArrayOnlyScalarValues(Array_ $array): bool diff --git a/src/NodeManipulator/AssignManipulator.php b/src/NodeManipulator/AssignManipulator.php index 44c83694784..db17966f9c8 100644 --- a/src/NodeManipulator/AssignManipulator.php +++ b/src/NodeManipulator/AssignManipulator.php @@ -39,43 +39,13 @@ final class AssignManipulator PostInc::class, ]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var TypeChecker - */ - private $typeChecker; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeComparator $nodeComparator, - BetterNodeFinder $betterNodeFinder, - PropertyFetchAnalyzer $propertyFetchAnalyzer, - TypeChecker $typeChecker + private NodeNameResolver $nodeNameResolver, + private NodeComparator $nodeComparator, + private BetterNodeFinder $betterNodeFinder, + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private TypeChecker $typeChecker ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->typeChecker = $typeChecker; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/NodeManipulator/BinaryOpManipulator.php b/src/NodeManipulator/BinaryOpManipulator.php index 49ab80aed96..6a5491b9df1 100644 --- a/src/NodeManipulator/BinaryOpManipulator.php +++ b/src/NodeManipulator/BinaryOpManipulator.php @@ -16,14 +16,9 @@ final class BinaryOpManipulator { - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - public function __construct(AssignAndBinaryMap $assignAndBinaryMap) - { - $this->assignAndBinaryMap = $assignAndBinaryMap; + public function __construct( + private AssignAndBinaryMap $assignAndBinaryMap + ) { } /** diff --git a/src/NodeManipulator/ChildAndParentClassManipulator.php b/src/NodeManipulator/ChildAndParentClassManipulator.php index f899dda00de..94089fb7a6f 100644 --- a/src/NodeManipulator/ChildAndParentClassManipulator.php +++ b/src/NodeManipulator/ChildAndParentClassManipulator.php @@ -17,50 +17,14 @@ final class ChildAndParentClassManipulator { - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var PromotedPropertyParamCleaner - */ - private $promotedPropertyParamCleaner; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - public function __construct( - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - NodeRepository $nodeRepository, - PromotedPropertyParamCleaner $promotedPropertyParamCleaner, - ReflectionProvider $reflectionProvider, - ParentClassScopeResolver $parentClassScopeResolver + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private NodeRepository $nodeRepository, + private PromotedPropertyParamCleaner $promotedPropertyParamCleaner, + private ReflectionProvider $reflectionProvider, + private ParentClassScopeResolver $parentClassScopeResolver ) { - $this->nodeFactory = $nodeFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeRepository = $nodeRepository; - $this->promotedPropertyParamCleaner = $promotedPropertyParamCleaner; - $this->reflectionProvider = $reflectionProvider; - $this->parentClassScopeResolver = $parentClassScopeResolver; } /** diff --git a/src/NodeManipulator/ClassConstManipulator.php b/src/NodeManipulator/ClassConstManipulator.php index 8afbc6d8e8c..d550353f4f3 100644 --- a/src/NodeManipulator/ClassConstManipulator.php +++ b/src/NodeManipulator/ClassConstManipulator.php @@ -17,43 +17,13 @@ final class ClassConstManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ClassManipulator - */ - private $classManipulator; - - /** - * @var NodeRepository - */ - private $nodeRepository; - public function __construct( - BetterNodeFinder $betterNodeFinder, - ClassManipulator $classManipulator, - NodeNameResolver $nodeNameResolver, - NodeRepository $nodeRepository, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private ClassManipulator $classManipulator, + private NodeNameResolver $nodeNameResolver, + private NodeRepository $nodeRepository, + private NodeComparator $nodeComparator ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->classManipulator = $classManipulator; - $this->nodeRepository = $nodeRepository; - $this->nodeComparator = $nodeComparator; } public function hasClassConstFetch(ClassConst $classConst): bool diff --git a/src/NodeManipulator/ClassDependencyManipulator.php b/src/NodeManipulator/ClassDependencyManipulator.php index 38e26f10108..4ce773b2f72 100644 --- a/src/NodeManipulator/ClassDependencyManipulator.php +++ b/src/NodeManipulator/ClassDependencyManipulator.php @@ -25,64 +25,16 @@ final class ClassDependencyManipulator { - /** - * @var ClassMethodAssignManipulator - */ - private $classMethodAssignManipulator; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var ChildAndParentClassManipulator - */ - private $childAndParentClassManipulator; - - /** - * @var StmtsManipulator - */ - private $stmtsManipulator; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - /** - * @var PropertyPresenceChecker - */ - private $propertyPresenceChecker; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - ChildAndParentClassManipulator $childAndParentClassManipulator, - ClassInsertManipulator $classInsertManipulator, - ClassMethodAssignManipulator $classMethodAssignManipulator, - NodeFactory $nodeFactory, - StmtsManipulator $stmtsManipulator, - PhpVersionProvider $phpVersionProvider, - PropertyPresenceChecker $propertyPresenceChecker, - NodeNameResolver $nodeNameResolver + private ChildAndParentClassManipulator $childAndParentClassManipulator, + private ClassInsertManipulator $classInsertManipulator, + private ClassMethodAssignManipulator $classMethodAssignManipulator, + private NodeFactory $nodeFactory, + private StmtsManipulator $stmtsManipulator, + private PhpVersionProvider $phpVersionProvider, + private PropertyPresenceChecker $propertyPresenceChecker, + private NodeNameResolver $nodeNameResolver ) { - $this->classMethodAssignManipulator = $classMethodAssignManipulator; - $this->nodeFactory = $nodeFactory; - $this->childAndParentClassManipulator = $childAndParentClassManipulator; - $this->stmtsManipulator = $stmtsManipulator; - $this->classInsertManipulator = $classInsertManipulator; - $this->phpVersionProvider = $phpVersionProvider; - $this->propertyPresenceChecker = $propertyPresenceChecker; - $this->nodeNameResolver = $nodeNameResolver; } public function addConstructorDependency(Class_ $class, PropertyMetadata $propertyMetadata): void diff --git a/src/NodeManipulator/ClassInsertManipulator.php b/src/NodeManipulator/ClassInsertManipulator.php index 986fad0d2ce..25869b5305c 100644 --- a/src/NodeManipulator/ClassInsertManipulator.php +++ b/src/NodeManipulator/ClassInsertManipulator.php @@ -23,20 +23,10 @@ final class ClassInsertManipulator */ private const BEFORE_TRAIT_TYPES = [TraitUse::class, Property::class, ClassMethod::class]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - public function __construct(NodeFactory $nodeFactory, NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeFactory = $nodeFactory; + public function __construct( + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/src/NodeManipulator/ClassManipulator.php b/src/NodeManipulator/ClassManipulator.php index b9799cc440b..30f746e33b9 100644 --- a/src/NodeManipulator/ClassManipulator.php +++ b/src/NodeManipulator/ClassManipulator.php @@ -18,29 +18,11 @@ final class ClassManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodesToRemoveCollector $nodesToRemoveCollector, - ReflectionProvider $reflectionProvider + private NodeNameResolver $nodeNameResolver, + private NodesToRemoveCollector $nodesToRemoveCollector, + private ReflectionProvider $reflectionProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->reflectionProvider = $reflectionProvider; } /** From ccf64d4e8374fdda92ea658f01f389afd6db5ca6 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 10 May 2021 15:28:38 +0200 Subject: [PATCH 4/6] [PHP 8.0] Remove uncatcheable variables --- phpstan.neon | 9 --- rector.php | 60 ++++++++++--------- .../DowngradeGeneratedScalarTypesRector.php | 2 +- rules/Naming/NamespaceMatcher.php | 3 +- src/Console/ConsoleApplication.php | 2 +- 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index cae8bd08227..cdf61271b77 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -494,23 +494,14 @@ parameters: - message: '#Function "function_exists\(\)" cannot be used/left in the code#' path: src/functions/node_helper.php -<<<<<<< HEAD -<<<<<<< HEAD # temporary out of order after rector-src extract - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' -<<<<<<< HEAD -======= ->>>>>>> 5288d92bc (bump workflow version to PHP 8) -======= # temporary out of order after rector-src extract - '#Class like namespace "Rector\\(.*?)" does not follow PSR\-4 configuration in composer\.json#' ->>>>>>> 8f4d07170 (skip static error) -======= # bug in PHP 8, fix in dev-main - message: '#Do not call parent method if parent method is empty#' path: packages/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php ->>>>>>> 83f18a5ac (fixup! [PHP 8] Use promoted properties) diff --git a/rector.php b/rector.php index eceffc3b37f..625d74c9f4c 100644 --- a/rector.php +++ b/rector.php @@ -25,39 +25,41 @@ return static function (ContainerConfigurator $containerConfigurator): void { // include sets - $containerConfigurator->import(SetList::CODING_STYLE); - $containerConfigurator->import(SetList::CODE_QUALITY); - $containerConfigurator->import(SetList::CODE_QUALITY_STRICT); - $containerConfigurator->import(SetList::DEAD_CODE); - $containerConfigurator->import(SetList::PRIVATIZATION); - $containerConfigurator->import(SetList::NAMING); - $containerConfigurator->import(SetList::TYPE_DECLARATION); - $containerConfigurator->import(SetList::PHP_71); - $containerConfigurator->import(SetList::PHP_72); - $containerConfigurator->import(SetList::PHP_73); - $containerConfigurator->import(SetList::EARLY_RETURN); - $containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT); - $containerConfigurator->import(NetteSetList::NETTE_UTILS_CODE_QUALITY); - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY); +// $containerConfigurator->import(SetList::CODING_STYLE); +// $containerConfigurator->import(SetList::CODE_QUALITY); +// $containerConfigurator->import(SetList::CODE_QUALITY_STRICT); +// $containerConfigurator->import(SetList::DEAD_CODE); +// $containerConfigurator->import(SetList::PRIVATIZATION); +// $containerConfigurator->import(SetList::NAMING); +// $containerConfigurator->import(SetList::TYPE_DECLARATION); +// $containerConfigurator->import(SetList::PHP_71); +// $containerConfigurator->import(SetList::PHP_72); +// $containerConfigurator->import(SetList::PHP_73); +// $containerConfigurator->import(SetList::EARLY_RETURN); +// $containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT); +// $containerConfigurator->import(NetteSetList::NETTE_UTILS_CODE_QUALITY); +// $containerConfigurator->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY); $services = $containerConfigurator->services(); - $configuration = ValueObjectInliner::inline([ - new InferParamFromClassMethodReturn(AbstractRector::class, 'refactor', 'getNodeTypes'), - ]); - $services->set(InferParamFromClassMethodReturnRector::class) - ->call('configure', [[ - InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => $configuration, - ]]); - $services->set(ClassPropertyAssignToConstructorPromotionRector::class); - - $services->set(PreferThisOrSelfMethodCallRector::class) - ->call('configure', [[ - PreferThisOrSelfMethodCallRector::TYPE_TO_PREFERENCE => [ - TestCase::class => PreferenceSelfThis::PREFER_THIS, - ], - ]]); +// +// $configuration = ValueObjectInliner::inline([ +// new InferParamFromClassMethodReturn(AbstractRector::class, 'refactor', 'getNodeTypes'), +// ]); +// $services->set(InferParamFromClassMethodReturnRector::class) +// ->call('configure', [[ +// InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => $configuration, +// ]]); +// +// $services->set(ClassPropertyAssignToConstructorPromotionRector::class); +// +// $services->set(PreferThisOrSelfMethodCallRector::class) +// ->call('configure', [[ +// PreferThisOrSelfMethodCallRector::TYPE_TO_PREFERENCE => [ +// TestCase::class => PreferenceSelfThis::PREFER_THIS, +// ], +// ]]); $parameters = $containerConfigurator->parameters(); diff --git a/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php b/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php index a05a889bbd2..38386bff5eb 100644 --- a/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php +++ b/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php @@ -118,7 +118,7 @@ public function refactor(Node $node): ?Node try { $nodes = $this->inlineCodeParser->parse('value . ' }'); - } catch (Error $error) { + } catch (Error) { // nothing we can do return null; } diff --git a/rules/Naming/NamespaceMatcher.php b/rules/Naming/NamespaceMatcher.php index 57b7ad08054..cd9562e0a45 100644 --- a/rules/Naming/NamespaceMatcher.php +++ b/rules/Naming/NamespaceMatcher.php @@ -4,7 +4,6 @@ namespace Rector\Naming; -use Nette\Utils\Strings; use Rector\Renaming\ValueObject\RenamedNamespace; final class NamespaceMatcher @@ -18,7 +17,7 @@ public function matchRenamedNamespace(string $name, array $oldToNewNamespace): ? /** @var string $oldNamespace */ foreach ($oldToNewNamespace as $oldNamespace => $newNamespace) { - if (Strings::startsWith($name, $oldNamespace)) { + if (str_starts_with($name, $oldNamespace)) { return new RenamedNamespace($name, $oldNamespace, $newNamespace); } } diff --git a/src/Console/ConsoleApplication.php b/src/Console/ConsoleApplication.php index e55a347ea27..e102af90a69 100644 --- a/src/Console/ConsoleApplication.php +++ b/src/Console/ConsoleApplication.php @@ -33,7 +33,7 @@ public function __construct(Configuration $configuration, CommandNaming $command { try { $version = $configuration->getPrettyVersion(); - } catch (OutOfBoundsException $outOfBoundsException) { + } catch (OutOfBoundsException) { $version = 'Unknown'; } From a48531e756813e10f7cd30b1ee3220c0a4f944e4 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 10 May 2021 23:48:36 +0100 Subject: [PATCH 5/6] add more promoted properties --- .../Printer/PhpDocInfoPrinter.php | 33 +------- packages/FileFormatter/ValueObject/Indent.php | 11 +-- .../FileFormatter/ValueObject/NewLine.php | 11 +-- ...aysTrueConditionSetInConstructorRector.php | 18 +---- ...lipTypeControlToUseExclusiveTypeRector.php | 11 +-- .../Identical/GetClassToInstanceOfRector.php | 11 +-- .../Identical/SimplifyArraySearchRector.php | 11 +-- .../Identical/SimplifyConditionsRector.php | 18 +---- .../Rector/If_/CombineIfRector.php | 11 +-- ...ompareReturnsToNullCoalesceQueueRector.php | 11 +-- .../Rector/If_/ExplicitBoolCompareRector.php | 18 +---- .../If_/SimplifyIfNotNullReturnRector.php | 11 +-- .../If_/SimplifyIfNullableReturnRector.php | 24 +----- .../Rector/If_/SimplifyIfReturnBoolRector.php | 18 +---- ...OnPropertyObjectToPropertyExistsRector.php | 11 +-- .../FixClassCaseSensitivityNameRector.php | 11 +-- .../Return_/SimplifyUselessVariableRector.php | 11 +-- .../Switch_/SingularSwitchToIfRector.php | 11 +-- .../SimplifyTautologyTernaryRector.php | 11 +-- .../UnnecessaryTernaryExpressionRector.php | 11 +-- .../ArrayDimFetchTypeResolver.php | 11 +-- .../AssignVariableTypeResolver.php | 11 +-- .../ParamTypeToAssertTypeRector.php | 18 +---- ...veOutMethodCallInsideIfConditionRector.php | 11 +-- ...VariableDeclarationNearReferenceRector.php | 18 +---- .../Application/UseImportsAdder.php | 11 +-- .../ClassNameImport/AliasUsesResolver.php | 18 +---- .../AliasClassNameImportSkipVoter.php | 11 +-- .../ClassLikeNameClassNameImportSkipVoter.php | 11 +-- ...yQualifiedNameClassNameImportSkipVoter.php | 18 +---- .../UsesClassNameImportSkipVoter.php | 11 +-- .../ClassNameImportSkipper.php | 11 +-- .../ClassNameImport/ShortNameResolver.php | 40 ++-------- .../ClassNameImport/UseImportsTraverser.php | 16 +--- .../ClassNameImport/UsedImportsResolver.php | 24 +----- rules/CodingStyle/Naming/NameRenamer.php | 11 +-- rules/CodingStyle/Node/ConcatManipulator.php | 16 +--- rules/CodingStyle/Node/DocAliasResolver.php | 16 +--- rules/CodingStyle/Node/NameImporter.php | 56 ++----------- rules/CodingStyle/Node/UseManipulator.php | 18 +---- .../Node/UseNameAliasToNameResolver.php | 18 +---- .../NodeAnalyzer/ImplodeAnalyzer.php | 11 +-- .../NodeFactory/JsonArrayFactory.php | 24 +----- .../JsonEncodeStaticCallFactory.php | 11 +-- ...anualJsonStringToJsonEncodeArrayRector.php | 32 +------- .../ClassConst/VarConstantCommentRector.php | 18 +---- .../ReturnArrayClassMethodToYieldRector.php | 19 +---- .../ClassMethod/UnSpreadOperatorRector.php | 11 +-- ...eldClassMethodToArrayClassMethodRector.php | 18 +---- .../AddArrayDefaultToArrayPropertyRector.php | 16 +--- .../CallUserFuncArrayToVariadicRector.php | 11 +-- .../CallUserFuncToMethodCallRector.php | 11 +-- .../FuncCall/ConsistentImplodeRector.php | 11 +-- ...ngClassConstantToClassConstFetchRector.php | 11 +-- ...assKeywordForClassNameResolutionRector.php | 11 +-- .../Switch_/BinarySwitchToIfElseRector.php | 11 +-- .../Rector/Use_/RemoveUnusedAliasRector.php | 32 +------- .../ConcatStringAndPlaceholders.php | 18 +---- .../CodingStyle/ValueObject/NameAndParent.php | 18 +---- .../ValueObject/NodeToRemoveAndConcatItem.php | 18 +---- .../ReturnArrayClassMethodToYield.php | 18 +---- .../FileProcessor/ComposerFileProcessor.php | 24 +----- rules/Composer/Guard/VersionGuard.php | 11 +-- .../AddPackageToRequireComposerRector.php | 11 +-- .../AddPackageToRequireDevComposerRector.php | 11 +-- .../ChangePackageVersionComposerRector.php | 11 +-- ...ReplacePackageAndVersionComposerRector.php | 11 +-- .../ValueObject/PackageAndVersion.php | 18 +---- .../ValueObject/ReplacePackageAndVersion.php | 13 ++- .../CurrentAndParentClassMethodComparator.php | 40 ++-------- .../Parameter/ParameterDefaultsComparator.php | 11 +-- .../Parameter/ParameterTypeComparator.php | 11 +-- rules/DeadCode/ConditionResolver.php | 32 +------- .../FunctionSupportResolver.php | 11 +-- .../InstanceOfUniqueKeyResolver.php | 11 +-- .../NodeAnalyzer/UsedVariableNameAnalyzer.php | 11 +-- .../ModifiedVariableNamesCollector.php | 16 +--- .../NodeByTypeAndPositionCollector.php | 18 +---- .../NodeCollector/UnusedParameterResolver.php | 16 +--- .../NextVariableUsageNodeFinder.php | 40 ++-------- .../PreviousVariableAssignNodeFinder.php | 24 +----- .../DeadCode/NodeFinder/VariableUseFinder.php | 24 +----- .../ControllerClassMethodManipulator.php | 18 +---- .../NodeManipulator/CountManipulator.php | 18 +---- .../NodeManipulator/LivingCodeManipulator.php | 11 +-- .../VariadicFunctionLikeDetector.php | 16 +--- .../PhpDoc/DeadParamTagValueNodeAnalyzer.php | 18 +---- .../PhpDoc/DeadReturnTagValueNodeAnalyzer.php | 11 +-- .../PhpDoc/DeadVarTagValueNodeAnalyzer.php | 11 +-- .../PhpDoc/TagRemover/ParamTagRemover.php | 16 +--- .../PhpDoc/TagRemover/ReturnTagRemover.php | 11 +-- .../PhpDoc/TagRemover/VarTagRemover.php | 40 ++-------- .../Assign/RemoveDoubleAssignRector.php | 11 +-- .../RemoveUnusedAssignVariableRector.php | 32 +------- .../RemoveUnusedVariableAssignRector.php | 32 +------- .../RemoveDuplicatedInstanceOfRector.php | 11 +-- ...RemoveUnusedPrivateClassConstantRector.php | 11 +-- .../ClassLike/RemoveAnnotationRector.php | 11 +-- .../RemoveDeadConstructorRector.php | 11 +-- .../RemoveDelegatingParentCallRector.php | 11 +-- .../RemoveEmptyClassMethodRector.php | 16 +--- .../RemoveUnusedConstructorParamRector.php | 11 +-- ...moveUnusedPrivateMethodParameterRector.php | 24 +----- .../RemoveUselessParamTagRector.php | 16 +--- .../RemoveUselessReturnTagRector.php | 11 +-- .../Expression/RemoveDeadStmtRector.php | 11 +-- .../RemoveDuplicatedIfReturnRector.php | 16 +--- .../RemoveOverriddenValuesRector.php | 24 +----- .../Rector/If_/RemoveDeadInstanceOfRector.php | 11 +-- ...UnusedNonEmptyArrayBeforeForeachRector.php | 24 +----- ...FutureCompatibleIfFunctionExistsRector.php | 18 +---- ...wrapFutureCompatibleIfPhpVersionRector.php | 18 +---- .../RemoveEmptyMethodCallRector.php | 11 +-- .../RemoveNonExistingVarAnnotationRector.php | 18 +---- ...eSetterOnlyPropertyAndMethodCallRector.php | 32 +------- .../RemoveUnusedPrivatePropertyRector.php | 18 +---- .../Property/RemoveUselessVarTagRector.php | 11 +-- .../RemoveParentCallWithoutParentRector.php | 24 +----- .../SideEffect/PureFunctionDetector.php | 11 +-- .../SideEffect/SideEffectNodeDetector.php | 18 +---- .../UselessIfCondBeforeForeachDetector.php | 18 +---- .../BinaryToVersionCompareCondition.php | 24 +----- .../DeadCode/ValueObject/VariableNodeUse.php | 40 ++-------- .../ValueObject/VersionCompareCondition.php | 25 ++---- .../ParentClassMethodTypeOverrideGuard.php | 18 +---- .../AssignAndRootExprAndNodesToAddMatcher.php | 40 ++-------- .../NodeAnalyzer/ExprStringTypeResolver.php | 18 +---- .../FluentCallStaticTypeResolver.php | 18 +---- .../FluentChainMethodCallNodeAnalyzer.php | 32 +------- .../FluentChainMethodCallRootExtractor.php | 48 ++--------- .../NodeAnalyzer/GetterMethodCallAnalyzer.php | 11 +-- .../NodeAnalyzer/MethodCallSkipAnalyzer.php | 16 +--- .../NewFluentChainMethodCallNodeAnalyzer.php | 11 +-- .../SameClassMethodCallAnalyzer.php | 11 +-- .../NonFluentChainMethodCallFactory.php | 24 +----- .../ReturnFluentMethodCallFactory.php | 24 +----- .../SeparateReturnMethodCallFactory.php | 11 +-- .../NodeFactory/VariableFromNewFactory.php | 11 +-- .../ClassMethod/ReturnThisRemoveRector.php | 11 +-- ...hainMethodCallToNormalMethodCallRector.php | 24 +----- ...MethodCallToStandaloneMethodCallRector.php | 48 ++--------- ...tterMethodCallToStandaloneAssignRector.php | 40 ++-------- ...FluentChainMethodCallToNonFluentRector.php | 32 +------- .../DefluentReturnMethodCallRector.php | 11 +-- ...hainMethodCallToNormalMethodCallRector.php | 48 ++--------- ...FluentChainMethodCallToNonFluentRector.php | 24 +----- .../MethodCallToClassMethodParser.php | 32 +------- .../Skipper/FluentMethodCallSkipper.php | 32 +------- .../ValueObject/AssignAndRootExpr.php | 8 +- .../AssignAndRootExprAndNodesToAdd.php | 18 +---- .../ValueObject/FirstAssignFluentCall.php | 8 +- .../ValueObject/FluentMethodCalls.php | 25 ++---- rules/Defluent/ValueObject/NormalToFluent.php | 18 +---- .../FluentMethodCallsFactory.php | 16 +--- .../NodeFactory/InjectMethodFactory.php | 40 ++-------- ...ropertyConstructorInjectionManipulator.php | 40 ++-------- .../NodeRemover/ClassMethodNodeRemover.php | 24 +----- ...nInjectionToConstructorInjectionRector.php | 16 +--- ...ltiParentingToAbstractDependencyRector.php | 24 +----- .../ReplaceVariableByPropertyFetchRector.php | 11 +-- .../DowngradeScalarTypeDeclarationRector.php | 11 +-- .../New_/DowngradeAnonymousClassRector.php | 16 +--- .../Spaceship/DowngradeSpaceshipRector.php | 11 +-- .../DowngradeGeneratedScalarTypesRector.php | 8 +- ...adeIterablePseudoTypeDeclarationRector.php | 11 +-- ...DowngradeNullableTypeDeclarationRector.php | 16 +--- .../DowngradeVoidTypeDeclarationRector.php | 11 +-- .../List_/DowngradeKeysInListRector.php | 18 +---- .../PhpDocFromTypeDeclarationDecorator.php | 40 ++-------- .../NodeAnalyzer/ClassLikeParentResolver.php | 11 +-- ...ClassLikeWithTraitsClassMethodResolver.php | 11 +-- .../NativeTypeClassTreeResolver.php | 18 +---- .../ParamContravariantDetector.php | 18 +---- .../ParentChildClassMethodTypeResolver.php | 32 +------- .../PhpDoc/NativeParamToPhpDocDecorator.php | 40 ++-------- .../DowngradeParameterTypeWideningRector.php | 40 ++-------- ...gradePregUnmatchedAsNullConstantRector.php | 11 +-- .../FuncCall/DowngradeStreamIsattyRector.php | 11 +-- .../DowngradeObjectTypeDeclarationRector.php | 11 +-- ...adeTrailingCommasInFunctionCallsRector.php | 11 +-- .../Array_/DowngradeArraySpreadRector.php | 11 +-- ...ArrowFunctionToAnonymousFunctionRector.php | 11 +-- ...wngradeContravariantArgumentTypeRector.php | 11 +-- .../DowngradeCovariantReturnTypeRector.php | 24 +----- .../DowngradeSelfTypeDeclarationRector.php | 16 +--- .../DowngradeStripTagsCallWithArrayRector.php | 11 +-- .../Property/DowngradeTypedPropertyRector.php | 11 +-- .../DowngradeStaticTypeDeclarationRector.php | 16 +--- ...owngradeTrailingCommasInParamUseRector.php | 11 +-- .../DowngradePropertyPromotionRector.php | 11 +-- .../DowngradeMixedTypeDeclarationRector.php | 11 +-- .../DowngradeUnionTypeDeclarationRector.php | 11 +-- ...wngradeNullsafeToTernaryOperatorRector.php | 11 +-- .../DowngradeUnionTypeTypedPropertyRector.php | 11 +-- .../NodeFactory/InvertedIfFactory.php | 24 +----- .../NodeTransformer/ConditionInverter.php | 11 +-- ...eNestedForeachIfsToEarlyContinueRector.php | 18 +---- .../If_/ChangeAndIfToEarlyReturnRector.php | 32 +------- ...geIfElseValueAssignToEarlyReturnRector.php | 18 +---- .../ChangeNestedIfsToEarlyReturnRector.php | 18 +---- ...hangeOrIfContinueToMultiContinueRector.php | 11 +-- .../ChangeOrIfReturnToEarlyReturnRector.php | 11 +-- .../PreparedValueToEarlyReturnRector.php | 11 +-- .../ReturnBinaryAndToEarlyReturnRector.php | 24 +----- .../ReturnBinaryOrToEarlyReturnRector.php | 24 +----- .../UnnededMethodTagValueNodeFilter.php | 11 +-- .../NodeType/GenericTypeSpecifier.php | 16 +--- ...GenericsPHPStormMethodAnnotationRector.php | 32 +------- .../Reflection/ClassGenericMethodResolver.php | 16 +--- .../MethodTagValueNodeFactory.php | 16 +--- .../MethodTagValueParameterNodeFactory.php | 11 +-- .../ChildParentClassReflections.php | 18 +---- .../Collector/MockVariableCollector.php | 18 +---- .../MockeryCreateMockToProphizeRector.php | 18 +---- .../StaticCall/MockeryCloseRemoveRector.php | 11 +-- rules/Naming/ArrayDimFetchRenamer.php | 16 +--- .../Guard/BreakingVariableRenameGuard.php | 48 ++--------- .../Guard/DateTimeAtNamingConventionGuard.php | 18 +---- rules/Naming/Guard/HasMagicGetSetGuard.php | 11 +-- .../BoolPropertyConflictingNameGuard.php | 24 +----- .../MatchPropertyTypeConflictingNameGuard.php | 24 +----- .../Naming/Guard/RamseyUuidInterfaceGuard.php | 11 +-- rules/Naming/Matcher/ForeachMatcher.php | 24 +----- .../Matcher/VariableAndCallAssignMatcher.php | 24 +----- .../Naming/Naming/ConflictingNameResolver.php | 40 ++-------- rules/Naming/Naming/ExpectedNameResolver.php | 32 +------- rules/Naming/Naming/MethodNameResolver.php | 11 +-- .../Naming/OverridenExistingNamesResolver.php | 24 +----- rules/Naming/Naming/PropertyNaming.php | 48 ++--------- rules/Naming/Naming/VariableNaming.php | 24 +----- .../NamingConventionAnalyzer.php | 11 +-- .../Naming/NodeRenamer/MethodCallRenamer.php | 11 +-- rules/Naming/ParamRenamer/ParamRenamer.php | 16 +--- .../PropertyRenamer/BoolPropertyRenamer.php | 16 +--- .../MatchTypePropertyRenamer.php | 16 +--- .../PropertyRenamer/PropertyFetchRenamer.php | 16 +--- .../PropertyRenamer/PropertyRenamer.php | 16 +--- ...iableToMatchMethodCallReturnTypeRector.php | 72 +++-------------- ...etterClassMethodNameStartWithGetRector.php | 18 +---- ...eIsserClassMethodNameStartWithIsRector.php | 18 +---- .../RenameParamToMatchTypeRector.php | 40 ++-------- .../RenameVariableToMatchNewTypeRector.php | 24 +----- .../RenamePropertyToMatchTypeRector.php | 40 ++-------- ...ValueVariableToMatchExprVariableRector.php | 18 +---- ...iableToMatchMethodCallReturnTypeRector.php | 40 ++-------- ...pertyRespectIsHasWasMethodNamingRector.php | 24 +----- rules/Naming/RectorNamingInflector.php | 11 +-- .../RenameGuard/PropertyRenameGuard.php | 11 +-- rules/Naming/ValueObject/ExpectedName.php | 18 +---- rules/Naming/ValueObject/ParamRename.php | 40 ++-------- rules/Naming/ValueObject/PropertyRename.php | 48 ++--------- .../ValueObject/VariableAndCallAssign.php | 42 ++-------- .../ValueObject/VariableAndCallForeach.php | 34 ++------ .../ValueObjectFactory/ParamRenameFactory.php | 18 +---- .../PropertyRenameFactory.php | 11 +-- rules/Naming/VariableRenamer.php | 40 ++-------- ...rderClassConstantsByIntegerValueRector.php | 18 +---- .../OrderConstantsByVisibilityRector.php | 24 +----- .../Class_/OrderMethodsByVisibilityRector.php | 24 +----- .../Class_/OrderPrivateMethodsByUseRector.php | 11 +-- .../OrderPropertiesByVisibilityRector.php | 24 +----- rules/Order/StmtOrder.php | 11 +-- rules/Order/StmtVisibilitySorter.php | 11 +-- .../Order/ValueObject/ClassConstRankeable.php | 25 ++---- .../ValueObject/ClassMethodRankeable.php | 32 ++------ rules/Order/ValueObject/PropertyRankeable.php | 32 ++------ ...tedClassMethodsAndOriginalClassMethods.php | 18 +---- .../ValueObject/ConditionalSetValue.php | 40 ++-------- .../Collector/RenamedClassesCollector.php | 11 +-- .../Composer/PSR4AutoloadPathsProvider.php | 11 +-- rules/PSR4/Composer/PSR4NamespaceMatcher.php | 11 +-- .../FileInfoDeletionAnalyzer.php | 18 +---- rules/PSR4/FileRelocationResolver.php | 11 +-- .../FullyQualifyStmtsAnalyzer.php | 32 +------- ...eNamespaceByPSR4ComposerAutoloadRector.php | 16 +--- .../MultipleClassFileToPsr4ClassesRector.php | 16 +--- .../AnonymousFunctionNodeFactory.php | 18 +---- .../FuncCall/PregReplaceEModifierRector.php | 18 +---- .../StringClassNameToClassConstantRector.php | 11 +-- rules/Php55/RegexMatcher.php | 11 +-- rules/Php70/EregToPcreTransformer.php | 11 +-- rules/Php70/NodeAnalyzer/VariableNaming.php | 24 +----- .../BreakNotInLoopOrSwitchToReturnRector.php | 11 +-- .../ClassMethod/Php4ConstructorRector.php | 11 +-- .../Rector/FuncCall/EregToPregMatchRector.php | 11 +-- ...VariableToVariableOnFunctionCallRector.php | 24 +----- ...isCallOnStaticMethodToStaticCallRector.php | 18 +---- ...ticCallOnNonStaticToInstanceCallRector.php | 32 +------- .../Php70/ValueObject/VariableAssignPair.php | 20 ++--- rules/Php71/IsArrayAndDualCheckToAble.php | 18 +---- .../Php71/NodeAnalyzer/CountableAnalyzer.php | 24 +----- .../EmptyStringDefaultPropertyFinder.php | 11 +-- .../Assign/AssignArrayToStringRector.php | 11 +-- .../Rector/BooleanOr/IsIterableRector.php | 16 +--- .../Rector/FuncCall/CountOnNullRector.php | 18 +---- .../FuncCall/RemoveExtraParametersRector.php | 11 +-- rules/Php71/ValueObject/TwoNodeMatch.php | 18 +---- .../NodeFactory/AnonymousFunctionFactory.php | 18 +---- rules/Php72/Rector/Assign/ListEachRector.php | 11 +-- ...reateFunctionToAnonymousFunctionRector.php | 24 +----- .../Rector/FuncCall/StringifyDefineRector.php | 11 +-- .../FuncCall/StringsAssertNakedRector.php | 11 +-- .../While_/WhileEachToForeachRector.php | 11 +-- .../NodeTypeAnalyzer/NodeTypeAnalyzer.php | 11 +-- .../Rector/BooleanOr/IsCountableRector.php | 16 +--- .../SensitiveConstantNameRector.php | 11 +-- .../FuncCall/ArrayKeyFirstLastRector.php | 11 +-- .../Rector/FuncCall/RegexDashEscapeRector.php | 11 +-- .../FuncCall/StringifyStrNeedlesRector.php | 11 +-- .../ClosureArrowFunctionAnalyzer.php | 18 +---- .../Closure/ClosureToArrowFunctionRector.php | 11 +-- .../ArraySpreadInsteadOfArrayMergeRector.php | 11 +-- .../Rector/Property/TypedPropertyRector.php | 40 ++-------- .../StrncmpMatchAndRefactor.php | 32 +------- .../StrposMatchAndRefactor.php | 24 +----- .../SubstrMatchAndRefactor.php | 32 +------- .../NodeManipulator/TokenManipulator.php | 48 ++--------- .../NodeResolver/PromotedPropertyResolver.php | 24 +----- .../OptionalParametersAfterRequiredRector.php | 24 +----- .../Class_/AnnotationToAttributeRector.php | 16 +--- ...ertyAssignToConstructorPromotionRector.php | 24 +----- .../Class_/StringableForToStringRector.php | 11 +-- .../FuncCall/TokenGetAllToObjectRector.php | 11 +-- .../Rector/FunctionLike/UnionTypesRector.php | 32 +------- .../Rector/Identical/StrEndsWithRector.php | 11 +-- .../Rector/Identical/StrStartsWithRector.php | 11 +-- .../Rector/If_/NullsafeOperatorRector.php | 18 +---- .../Switch_/ChangeSwitchToMatchRector.php | 18 +---- .../MethodReflectionClassMethodResolver.php | 16 +--- .../ValueObject/AnnotationToAttribute.php | 18 +---- .../ArrayDimFetchAndConstFetch.php | 18 +---- rules/Php80/ValueObject/CondAndExpr.php | 25 ++---- .../PropertyPromotionCandidate.php | 25 ++---- rules/Php80/ValueObject/StrStartsWith.php | 32 ++------ rules/PhpSpecToPHPUnit/LetManipulator.php | 18 +---- .../Naming/PhpSpecRenaming.php | 24 +----- .../NodeFactory/AssertMethodCallFactory.php | 24 +----- .../BeConstructedWithAssignFactory.php | 24 +----- .../NodeFactory/DuringMethodCallFactory.php | 18 +---- .../PHPUnitTypeDeclarationDecorator.php | 11 +-- .../PhpSpecToPHPUnit/PhpSpecMockCollector.php | 16 +--- .../PhpSpecMethodToPHPUnitMethodRector.php | 16 +--- .../Rector/Class_/AddMockPropertiesRector.php | 16 +--- .../PhpSpecClassToPHPUnitClassRector.php | 32 +------- .../PhpSpecMocksToPHPUnitMocksRector.php | 18 +---- .../PhpSpecPromisesToPHPUnitAssertRector.php | 40 ++-------- .../MockVariableToPropertyFetchRector.php | 11 +-- rules/Privatization/Naming/ConstantNaming.php | 11 +-- .../EventSubscriberMethodNamesResolver.php | 11 +-- .../PropertyFetchByMethodAnalyzer.php | 24 +----- .../NodeFactory/ClassConstantFactory.php | 18 +---- .../ClassConstantFetchValueFactory.php | 24 +----- .../PropertyFetchWithConstFetchReplacer.php | 40 ++-------- .../PropertyFetchWithVariableReplacer.php | 16 +--- ...hangeGlobalVariablesToPropertiesRector.php | 11 +-- .../PrivatizeFinalClassMethodRector.php | 11 +-- .../ChangeLocalPropertyToVariableRector.php | 32 +------- ...riableWithDefaultValueToConstantRector.php | 24 +----- .../FinalizeClassesWithoutChildrenRector.php | 11 +-- .../RepeatedLiteralToClassConstantRector.php | 24 +----- .../ReplaceStringWithClassConstantRector.php | 11 +-- ...opertyWithDefaultValueToConstantRector.php | 24 +----- ...zeLocalPropertyToPrivatePropertyRector.php | 17 +--- .../Reflection/ClassConstantsResolver.php | 11 +-- .../NormalizeTypeToRespectArrayScalarType.php | 11 +-- .../ValueObject/ConstantVisibility.php | 25 ++---- .../ReplaceStringWithClassConstant.php | 32 ++------ .../ClassMethodVisibilityGuard.php | 11 +-- .../NodeManipulator/ComplexNodeRemover.php | 64 ++------------- .../Rector/Class_/RemoveParentRector.php | 11 +-- .../Rector/Class_/RemoveTraitRector.php | 11 +-- .../Rector/FuncCall/RemoveFuncCallRector.php | 11 +-- .../Removing/ValueObject/ArgumentRemover.php | 32 ++------ rules/Removing/ValueObject/RemoveFuncCall.php | 18 +---- .../ValueObject/RemoveFuncCallArg.php | 18 +---- .../NodeAnalyzer/SetUpClassMethodUpdater.php | 11 +-- .../StaticCallPresenceAnalyzer.php | 18 +---- .../NodeFactory/SelfContainerFactory.php | 11 +-- .../NodeFactory/SetUpFactory.php | 11 +-- .../Printer/FactoryClassPrinter.php | 32 +------- ...llyCalledStaticMethodToNonStaticRector.php | 11 +-- .../DesiredClassTypeToDynamicRector.php | 17 +--- .../NewUniqueObjectToEntityFactoryRector.php | 18 +---- ...PHPUnitStaticToKernelTestCaseGetRector.php | 48 ++--------- .../PassFactoryToUniqueObjectRector.php | 40 ++-------- .../StaticTypeToSetterInjectionRector.php | 18 +---- .../DesiredStaticCallTypeToDynamicRector.php | 13 +-- ...StaticPropertyFetchTypeToDynamicRector.php | 13 +-- .../StaticTypesInClassResolver.php | 16 +--- .../UniqueObjectFactoryFactory.php | 48 ++--------- .../Renaming/NodeManipulator/ClassRenamer.php | 80 +++---------------- .../NodeManipulator/IdentifierManipulator.php | 11 +-- .../ClassMethod/RenameAnnotationRector.php | 11 +-- .../PseudoNamespaceToNamespaceRector.php | 11 +-- .../Rector/MethodCall/RenameMethodRector.php | 16 +--- .../Rector/Name/RenameClassRector.php | 18 +---- .../Namespace_/RenameNamespaceRector.php | 11 +-- .../Renaming/ValueObject/MethodCallRename.php | 25 ++---- .../MethodCallRenameWithArrayKey.php | 32 ++------ .../PseudoNamespaceToNamespace.php | 18 +---- .../Renaming/ValueObject/RenameAnnotation.php | 25 ++---- .../ValueObject/RenameClassAndConstFetch.php | 32 ++------ .../ValueObject/RenameClassConstFetch.php | 25 ++---- rules/Renaming/ValueObject/RenameProperty.php | 25 ++---- .../ValueObject/RenameStaticMethod.php | 32 ++------ .../Renaming/ValueObject/RenamedNamespace.php | 25 ++---- ...ngClassConstantReferenceToStringRector.php | 11 +-- .../InferParamFromClassMethodReturnRector.php | 24 +----- .../CompleteMissingDependencyInNewRector.php | 11 +-- .../ConstantReturnToParamTypeConverter.php | 11 +-- .../CompleteImportForPartialAnnotation.php | 18 +---- .../InferParamFromClassMethodReturn.php | 25 ++---- .../Naming/FullyQualifiedNameResolver.php | 18 +---- ...FuncCallStaticCallToMethodCallAnalyzer.php | 48 ++--------- .../SingletonClassMethodAnalyzer.php | 24 +----- .../NodeFactory/PropertyFetchFactory.php | 11 +-- ...rovideConfigFilePathClassMethodFactory.php | 11 +-- .../NodeFactory/StaticMethodClassFactory.php | 18 +---- .../TypeProvidingExprFromClassResolver.php | 32 +------- .../Assign/GetAndSetToMethodCallRector.php | 16 +--- .../ClassMethod/SingleToManyMethodRector.php | 11 +-- .../Class_/ChangeSingletonToServiceRector.php | 16 +--- .../Class_/ParentClassToTraitsRector.php | 18 +---- .../FunctionToStaticMethodRector.php | 24 +----- .../ArgumentFuncCallToMethodCallRector.php | 18 +---- .../FuncCall/FuncCallToMethodCallRector.php | 11 +-- .../CallableInMethodCallToVariableRector.php | 11 +-- ...viceGetterToConstructorInjectionRector.php | 18 +---- .../VariableMethodCallToServiceCallRector.php | 11 +-- .../New_/NewToConstructorInjectionRector.php | 18 +---- .../Rector/New_/NewToMethodCallRector.php | 11 +-- .../StaticCall/StaticCallToFuncCallRector.php | 13 +-- .../StaticCallToMethodCallRector.php | 11 +-- .../ArgumentFuncCallToMethodCall.php | 32 +------- .../ValueObject/ArrayFuncCallToMethodCall.php | 32 ++------ .../CallableInMethodCallToVariable.php | 25 ++---- .../ValueObject/ClassConstFetchToValue.php | 25 ++---- .../DimFetchAssignToMethodCall.php | 25 ++---- .../ValueObject/FuncCallToMethodCall.php | 25 ++---- .../ValueObject/FuncCallToStaticCall.php | 25 ++---- .../ValueObject/FunctionToStaticCall.php | 25 ++---- .../ValueObject/GetAndSetToMethodCall.php | 25 ++---- ...odCallToAnotherMethodCallWithArguments.php | 32 ++------ .../ValueObject/MethodCallToReturn.php | 18 +---- .../ValueObject/MethodCallToStaticCall.php | 32 ++------ .../ValueObject/NewArgToMethodCall.php | 25 ++---- .../Transform/ValueObject/NewToMethodCall.php | 25 ++---- .../Transform/ValueObject/NewToStaticCall.php | 25 ++---- .../ValueObject/ParentClassToTraits.php | 18 +---- .../PropertyAndClassMethodName.php | 18 +---- .../PropertyAssignToMethodCall.php | 25 ++---- .../ValueObject/PropertyFetchToMethodCall.php | 40 ++-------- .../ReplaceParentCallByPropertyCall.php | 25 ++---- .../ServiceGetterToConstructorInjection.php | 25 ++---- .../ValueObject/SingleToManyMethod.php | 25 ++---- .../ValueObject/StaticCallToFuncCall.php | 25 ++---- .../ValueObject/StaticCallToMethodCall.php | 32 ++------ .../Transform/ValueObject/StaticCallToNew.php | 18 +---- .../ValueObject/StringToClassConstant.php | 25 ++---- .../ValueObject/UnsetAndIssetToMethodCall.php | 25 ++---- .../VariableMethodCallToServiceCall.php | 40 ++-------- rules/Transform/ValueObject/WrapReturn.php | 25 ++---- .../ConstructorAssignDetector.php | 16 +--- .../NullTypeAssignDetector.php | 40 ++-------- .../ChildPopulator/ChildParamPopulator.php | 32 +------- .../ChildPopulator/ChildReturnPopulator.php | 24 +----- .../FunctionLikeReturnTypeResolver.php | 11 +-- .../Matcher/PropertyAssignMatcher.php | 11 +-- .../NodeAnalyzer/CallTypesResolver.php | 18 +---- .../ClassMethodAndPropertyAnalyzer.php | 11 +-- .../ClassMethodParamTypeCompleter.php | 16 +--- .../NodeAnalyzer/TypeNodeUnwrapper.php | 11 +-- .../NodeTypeAnalyzer/CallTypeAnalyzer.php | 24 +----- .../NodeTypeAnalyzer/ChildTypeResolver.php | 11 +-- .../NodeTypeAnalyzer/TraitTypeAnalyzer.php | 18 +---- .../PHPStan/Type/ObjectTypeSpecifier.php | 11 +-- .../PhpDoc/ShortClassExpander.php | 18 +---- .../NonInformativeReturnTagRemover.php | 18 +---- .../PhpDocParser/ParamPhpDocNodeFactory.php | 11 +-- .../TypeDeclaration/PhpParserTypeAnalyzer.php | 11 +-- .../AddArrayParamDocTypeRector.php | 24 +----- .../AddArrayReturnDocTypeRector.php | 56 ++----------- ...ddMethodCallBasedStrictParamTypeRector.php | 16 +--- .../AddParamTypeDeclarationRector.php | 11 +-- .../AddParamTypeFromCallersRector.php | 16 +--- .../AddReturnTypeDeclarationRector.php | 11 +-- .../AddVoidReturnTypeWhereNoReturnRector.php | 11 +-- .../ClassMethod/ReturnNeverTypeRector.php | 11 +-- .../ReturnTypeFromReturnNewRector.php | 11 +-- .../ReturnTypeFromStrictTypedCallRector.php | 18 +---- ...eturnTypeFromStrictTypedPropertyRector.php | 11 +-- .../Closure/AddClosureReturnTypeRector.php | 11 +-- .../ParamTypeDeclarationRector.php | 40 ++-------- .../ReturnTypeDeclarationRector.php | 64 ++------------- ...merNullableArgumentToScalarTypedRector.php | 11 +-- ...ParamTypeFromStrictTypedPropertyRector.php | 11 +-- .../CompleteVarDocTypePropertyRector.php | 18 +---- .../PropertyTypeDeclarationRector.php | 18 +---- ...pedPropertyFromStrictConstructorRector.php | 16 +--- .../Reflection/ReflectionTypeResolver.php | 32 +------- .../ReturnTypeAlreadyAddedChecker.php | 24 +----- .../TypeAnalyzer/AdvancedArrayAnalyzer.php | 18 +---- .../GenericClassStringTypeNormalizer.php | 11 +-- .../AssignToPropertyTypeInferer.php | 56 ++----------- .../TypeInferer/ParamTypeInferer.php | 16 +--- .../FunctionLikeDocParamTypeInferer.php | 24 +----- .../GetterNodeParamTypeInferer.php | 40 ++-------- .../KnownArrayParamTypeInferer.php | 18 +---- .../PHPUnitDataProviderParamTypeInferer.php | 24 +----- .../PropertyNodeParamTypeInferer.php | 40 ++-------- .../SplFixedArrayParamTypeInferer.php | 16 +--- .../TypeInferer/PropertyTypeInferer.php | 40 ++-------- .../AllAssignNodePropertyTypeInferer.php | 16 +--- .../ConstructorPropertyTypeInferer.php | 56 ++----------- .../DefaultValuePropertyTypeInferer.php | 11 +-- .../DoctrineColumnPropertyTypeInferer.php | 20 +---- .../DoctrineRelationPropertyTypeInferer.php | 32 +------- .../GetterPropertyTypeInferer.php | 40 ++-------- ...tterTypeDeclarationPropertyTypeInferer.php | 24 +----- ...eMethodAssignedNodePropertyTypeInferer.php | 24 +----- .../VarDocPropertyTypeInferer.php | 11 +-- .../TypeInferer/ReturnTypeInferer.php | 16 +--- .../ReturnTagReturnTypeInferer.php | 11 +-- ...ReturnTypeDeclarationReturnTypeInferer.php | 16 +--- .../ReturnedNodesReturnTypeInferer.php | 48 ++--------- .../SetterNodeReturnTypeInferer.php | 24 +----- .../YieldNodesReturnTypeInferer.php | 24 +----- .../TypeInferer/SilentVoidResolver.php | 11 +-- rules/TypeDeclaration/TypeNormalizer.php | 18 +---- .../ValueObject/AddParamTypeDeclaration.php | 32 ++------ .../ValueObject/AddReturnTypeDeclaration.php | 25 ++---- .../ValueObject/NestedArrayType.php | 25 ++---- .../ChangeMethodVisibilityRector.php | 11 +-- .../ValueObject/ChangeConstantVisibility.php | 25 ++---- .../ValueObject/ChangeMethodVisibility.php | 25 ++---- .../ClassMethodAssignManipulator.php | 56 ++----------- .../ClassMethodManipulator.php | 40 ++-------- .../ClassMethodPropertyFetchManipulator.php | 16 +--- src/NodeManipulator/FuncCallManipulator.php | 11 +-- .../FunctionLikeManipulator.php | 24 +----- src/NodeManipulator/IfManipulator.php | 48 ++--------- .../MagicPropertyFetchAnalyzer.php | 24 +----- src/NodeManipulator/MethodCallManipulator.php | 24 +----- .../PropertyFetchAssignManipulator.php | 16 +--- src/NodeManipulator/PropertyManipulator.php | 72 +++-------------- src/NodeManipulator/StmtsManipulator.php | 16 +--- src/NodeManipulator/VariableManipulator.php | 56 ++----------- src/NonPhpFile/NonPhpFileProcessor.php | 11 +-- .../Rector/RenameClassNonPhpRector.php | 16 +--- .../Reflection/CallReflectionResolver.php | 32 +------- ...stantArrayTypeToCallReflectionResolver.php | 11 +-- ...tantStringTypeToCallReflectionResolver.php | 11 +-- .../ObjectTypeToCallReflectionResolver.php | 11 +-- .../TypeToCallReflectionResolverRegistry.php | 11 +-- src/Php/PhpVersionProvider.php | 16 +--- .../ProjectComposerJsonPhpVersionResolver.php | 24 +----- .../Regex/RegexPatternArgumentManipulator.php | 40 ++-------- src/PhpParser/Comparing/NodeComparator.php | 18 +---- src/PhpParser/Node/BetterNodeFinder.php | 40 ++-------- .../Node/CustomNode/FileWithoutNamespace.php | 12 +-- src/PhpParser/Node/NodeFactory.php | 56 ++----------- src/PhpParser/Node/Value/ValueResolver.php | 40 ++-------- .../NodeFinder/PropertyFetchFinder.php | 24 +----- .../NodeTraverser/RectorNodeTraverser.php | 18 +---- src/PhpParser/Parser/InlineCodeParser.php | 32 +------- .../Parser/NikicPhpParserFactory.php | 18 +---- src/PhpParser/Parser/Parser.php | 18 +---- src/PhpParser/Parser/SimplePhpParser.php | 18 +---- .../Printer/BetterStandardPrinter.php | 17 +--- .../Printer/FormatPerservingPrinter.php | 18 +---- .../NodesWithFileDestinationPrinter.php | 24 +----- .../ClassMethodReflectionFactory.php | 11 +-- .../ClassReflectionToAstResolver.php | 32 +------- .../FunctionLikeReflectionParser.php | 56 ++----------- .../MethodReflectionToAstResolver.php | 24 +----- src/Reporting/MissingRectorRulesReporter.php | 18 +---- .../DynamicSourceLocatorDecorator.php | 24 +----- src/ValueObject/Application/File.php | 18 +---- src/ValueObject/Application/RectorError.php | 25 ++---- .../Bootstrap/BootstrapConfigs.php | 18 +---- src/ValueObject/ProcessResult.php | 24 +----- src/ValueObject/Reporting/FileDiff.php | 32 +------- src/ValueObject/SprintfStringAndArgs.php | 18 +---- .../Application/FileFactory.php | 18 +---- .../ProcessResultFactory.php | 16 +--- 585 files changed, 2118 insertions(+), 9897 deletions(-) diff --git a/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php b/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php index 71e08f646e9..2e659e94e9b 100644 --- a/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php +++ b/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php @@ -87,43 +87,18 @@ final class PhpDocInfoPrinter */ private $phpDocInfo; - /** - * @var EmptyPhpDocDetector - */ - private $emptyPhpDocDetector; - - /** - * @var DocBlockInliner - */ - private $docBlockInliner; - - /** - * @var RemoveNodesStartAndEndResolver - */ - private $removeNodesStartAndEndResolver; - - /** - * @var ChangedPhpDocNodeVisitor - */ - private $changedPhpDocNodeVisitor; - /** * @var PhpDocNodeTraverser */ private $changedPhpDocNodeTraverser; public function __construct( - EmptyPhpDocDetector $emptyPhpDocDetector, - DocBlockInliner $docBlockInliner, - RemoveNodesStartAndEndResolver $removeNodesStartAndEndResolver, - ChangedPhpDocNodeVisitor $changedPhpDocNodeVisitor, + private EmptyPhpDocDetector $emptyPhpDocDetector, + private DocBlockInliner $docBlockInliner, + private RemoveNodesStartAndEndResolver $removeNodesStartAndEndResolver, + private ChangedPhpDocNodeVisitor $changedPhpDocNodeVisitor, ChangedPhpDocNodeTraverserFactory $changedPhpDocNodeTraverserFactory ) { - $this->emptyPhpDocDetector = $emptyPhpDocDetector; - $this->docBlockInliner = $docBlockInliner; - $this->removeNodesStartAndEndResolver = $removeNodesStartAndEndResolver; - $this->changedPhpDocNodeVisitor = $changedPhpDocNodeVisitor; - $this->changedPhpDocNodeTraverser = $changedPhpDocNodeTraverserFactory->create(); } diff --git a/packages/FileFormatter/ValueObject/Indent.php b/packages/FileFormatter/ValueObject/Indent.php index 42ec1b6fa29..b1a909f2143 100644 --- a/packages/FileFormatter/ValueObject/Indent.php +++ b/packages/FileFormatter/ValueObject/Indent.php @@ -50,14 +50,9 @@ final class Indent */ private const PARSE_INDENT_REGEX = '/^(?P( +|\t+)).*/m'; - /** - * @var string - */ - private $string; - - private function __construct(string $string) - { - $this->string = $string; + private function __construct( + private string $string + ) { } public function __toString(): string diff --git a/packages/FileFormatter/ValueObject/NewLine.php b/packages/FileFormatter/ValueObject/NewLine.php index 25c1efe5f6c..e4804310b76 100644 --- a/packages/FileFormatter/ValueObject/NewLine.php +++ b/packages/FileFormatter/ValueObject/NewLine.php @@ -36,14 +36,9 @@ final class NewLine self::CARRIAGE_RETURN_LINE_FEED => "\r\n", ]; - /** - * @var string - */ - private $string; - - private function __construct(string $string) - { - $this->string = $string; + private function __construct( + private string $string + ) { } public function __toString(): string diff --git a/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php b/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php index 11ae76a3451..faaa9a64755 100644 --- a/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php +++ b/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php @@ -33,20 +33,10 @@ */ final class RemoveAlwaysTrueConditionSetInConstructorRector extends AbstractRector { - /** - * @var StaticTypeAnalyzer - */ - private $staticTypeAnalyzer; - - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(StaticTypeAnalyzer $staticTypeAnalyzer, TypeFactory $typeFactory) - { - $this->staticTypeAnalyzer = $staticTypeAnalyzer; - $this->typeFactory = $typeFactory; + public function __construct( + private StaticTypeAnalyzer $staticTypeAnalyzer, + private TypeFactory $typeFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php b/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php index 1ff79cfe83c..95830d4bdd2 100644 --- a/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php +++ b/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php @@ -30,14 +30,9 @@ */ final class FlipTypeControlToUseExclusiveTypeRector extends AbstractRector { - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - - public function __construct(PhpDocTagRemover $phpDocTagRemover) - { - $this->phpDocTagRemover = $phpDocTagRemover; + public function __construct( + private PhpDocTagRemover $phpDocTagRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php b/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php index f88bdceb1d2..3f89786efdb 100644 --- a/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php +++ b/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php @@ -30,14 +30,9 @@ final class GetClassToInstanceOfRector extends AbstractRector */ private const NO_NAMESPACED_CLASSNAMES = ['self', 'static']; - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php b/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php index bd9eb2b5bad..f697bc0d922 100644 --- a/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php +++ b/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php @@ -20,14 +20,9 @@ */ final class SimplifyArraySearchRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Identical/SimplifyConditionsRector.php b/rules/CodeQuality/Rector/Identical/SimplifyConditionsRector.php index fd9b7c6e91e..d40e1d01fac 100644 --- a/rules/CodeQuality/Rector/Identical/SimplifyConditionsRector.php +++ b/rules/CodeQuality/Rector/Identical/SimplifyConditionsRector.php @@ -22,20 +22,10 @@ */ final class SimplifyConditionsRector extends AbstractRector { - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(AssignAndBinaryMap $assignAndBinaryMap, BinaryOpManipulator $binaryOpManipulator) - { - $this->assignAndBinaryMap = $assignAndBinaryMap; - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private AssignAndBinaryMap $assignAndBinaryMap, + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/CombineIfRector.php b/rules/CodeQuality/Rector/If_/CombineIfRector.php index a8d29988091..2c73b7a8d51 100644 --- a/rules/CodeQuality/Rector/If_/CombineIfRector.php +++ b/rules/CodeQuality/Rector/If_/CombineIfRector.php @@ -17,14 +17,9 @@ */ final class CombineIfRector extends AbstractRector { - /** - * @var CommentsMerger - */ - private $commentsMerger; - - public function __construct(CommentsMerger $commentsMerger) - { - $this->commentsMerger = $commentsMerger; + public function __construct( + private CommentsMerger $commentsMerger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php index 2dcd0884ae9..93697e6b960 100644 --- a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php +++ b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php @@ -31,14 +31,9 @@ final class ConsecutiveNullCompareReturnsToNullCoalesceQueueRector extends Abstr */ private $coalescingNodes = []; - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php index bdc8322593d..0465f1ffe27 100644 --- a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php +++ b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php @@ -39,20 +39,10 @@ */ final class ExplicitBoolCompareRector extends AbstractRector { - /** - * @var StringTypeAnalyzer - */ - private $stringTypeAnalyzer; - - /** - * @var ArrayTypeAnalyzer - */ - private $arrayTypeAnalyzer; - - public function __construct(StringTypeAnalyzer $stringTypeAnalyzer, ArrayTypeAnalyzer $arrayTypeAnalyzer) - { - $this->stringTypeAnalyzer = $stringTypeAnalyzer; - $this->arrayTypeAnalyzer = $arrayTypeAnalyzer; + public function __construct( + private StringTypeAnalyzer $stringTypeAnalyzer, + private ArrayTypeAnalyzer $arrayTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php b/rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php index 09fccca7f89..aa74613dd92 100644 --- a/rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php +++ b/rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php @@ -18,14 +18,9 @@ */ final class SimplifyIfNotNullReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php b/rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php index 67a84e655ba..b342464bb44 100644 --- a/rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php +++ b/rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php @@ -31,29 +31,11 @@ */ final class SimplifyIfNullableReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var AssignVariableTypeResolver - */ - private $assignVariableTypeResolver; - - /** - * @var VarTagRemover - */ - private $varTagRemover; - public function __construct( - IfManipulator $ifManipulator, - AssignVariableTypeResolver $assignVariableTypeResolver, - VarTagRemover $varTagRemover + private IfManipulator $ifManipulator, + private AssignVariableTypeResolver $assignVariableTypeResolver, + private VarTagRemover $varTagRemover ) { - $this->ifManipulator = $ifManipulator; - $this->assignVariableTypeResolver = $assignVariableTypeResolver; - $this->varTagRemover = $varTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php b/rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php index c6da7325187..7d10cbbc24b 100644 --- a/rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php +++ b/rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php @@ -24,20 +24,10 @@ */ final class SimplifyIfReturnBoolRector extends AbstractRector { - /** - * @var CommentsMerger - */ - private $commentsMerger; - - /** - * @var ExprBoolCaster - */ - private $exprBoolCaster; - - public function __construct(CommentsMerger $commentsMerger, ExprBoolCaster $exprBoolCaster) - { - $this->commentsMerger = $commentsMerger; - $this->exprBoolCaster = $exprBoolCaster; + public function __construct( + private CommentsMerger $commentsMerger, + private ExprBoolCaster $exprBoolCaster + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php b/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php index 006b9ca0bb1..a6fcd2b7429 100644 --- a/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php +++ b/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php @@ -25,14 +25,9 @@ */ final class IssetOnPropertyObjectToPropertyExistsRector extends AbstractRector { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Name/FixClassCaseSensitivityNameRector.php b/rules/CodeQuality/Rector/Name/FixClassCaseSensitivityNameRector.php index e3c7fe69214..8ee717e1632 100644 --- a/rules/CodeQuality/Rector/Name/FixClassCaseSensitivityNameRector.php +++ b/rules/CodeQuality/Rector/Name/FixClassCaseSensitivityNameRector.php @@ -24,14 +24,9 @@ */ final class FixClassCaseSensitivityNameRector extends AbstractRector { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Return_/SimplifyUselessVariableRector.php b/rules/CodeQuality/Rector/Return_/SimplifyUselessVariableRector.php index 3836b6391eb..97ba5b1c4cc 100644 --- a/rules/CodeQuality/Rector/Return_/SimplifyUselessVariableRector.php +++ b/rules/CodeQuality/Rector/Return_/SimplifyUselessVariableRector.php @@ -24,14 +24,9 @@ */ final class SimplifyUselessVariableRector extends AbstractRector { - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - public function __construct(AssignAndBinaryMap $assignAndBinaryMap) - { - $this->assignAndBinaryMap = $assignAndBinaryMap; + public function __construct( + private AssignAndBinaryMap $assignAndBinaryMap + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php b/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php index 530d5ed9ac0..9c4bf18a2a4 100644 --- a/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php +++ b/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php @@ -18,14 +18,9 @@ */ final class SingularSwitchToIfRector extends AbstractRector { - /** - * @var SwitchManipulator - */ - private $switchManipulator; - - public function __construct(SwitchManipulator $switchManipulator) - { - $this->switchManipulator = $switchManipulator; + public function __construct( + private SwitchManipulator $switchManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php b/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php index 142cce57eeb..b3a4351b268 100644 --- a/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php +++ b/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php @@ -19,14 +19,9 @@ */ final class SimplifyTautologyTernaryRector extends AbstractRector { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php b/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php index e2e6295cd50..7bc0f432790 100644 --- a/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php +++ b/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php @@ -21,14 +21,9 @@ */ final class UnnecessaryTernaryExpressionRector extends AbstractRector { - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - public function __construct(AssignAndBinaryMap $assignAndBinaryMap) - { - $this->assignAndBinaryMap = $assignAndBinaryMap; + public function __construct( + private AssignAndBinaryMap $assignAndBinaryMap + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php b/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php index cb43818eddc..aacce8f6a8d 100644 --- a/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php +++ b/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php @@ -14,14 +14,9 @@ final class ArrayDimFetchTypeResolver { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function resolve(ArrayDimFetch $arrayDimFetch): ArrayType diff --git a/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php b/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php index 4f53d049e85..c37433b707c 100644 --- a/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php +++ b/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php @@ -11,14 +11,9 @@ final class AssignVariableTypeResolver { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function resolve(Assign $assign): Type diff --git a/rules/CodeQualityStrict/Rector/ClassMethod/ParamTypeToAssertTypeRector.php b/rules/CodeQualityStrict/Rector/ClassMethod/ParamTypeToAssertTypeRector.php index 1fa04384ea1..8f832b8f40c 100644 --- a/rules/CodeQualityStrict/Rector/ClassMethod/ParamTypeToAssertTypeRector.php +++ b/rules/CodeQualityStrict/Rector/ClassMethod/ParamTypeToAssertTypeRector.php @@ -23,20 +23,10 @@ */ final class ParamTypeToAssertTypeRector extends AbstractRector { - /** - * @var ClassConstFetchFactory - */ - private $classConstFetchFactory; - - /** - * @var SubTypeAnalyzer - */ - private $subTypeAnalyzer; - - public function __construct(ClassConstFetchFactory $classConstFetchFactory, SubTypeAnalyzer $subTypeAnalyzer) - { - $this->classConstFetchFactory = $classConstFetchFactory; - $this->subTypeAnalyzer = $subTypeAnalyzer; + public function __construct( + private ClassConstFetchFactory $classConstFetchFactory, + private SubTypeAnalyzer $subTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php b/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php index ae6cd62880b..874b924ea5d 100644 --- a/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php +++ b/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php @@ -25,14 +25,9 @@ */ final class MoveOutMethodCallInsideIfConditionRector extends AbstractRector { - /** - * @var MethodCallToVariableNameResolver - */ - private $methodCallToVariableNameResolver; - - public function __construct(MethodCallToVariableNameResolver $methodCallToVariableNameResolver) - { - $this->methodCallToVariableNameResolver = $methodCallToVariableNameResolver; + public function __construct( + private MethodCallToVariableNameResolver $methodCallToVariableNameResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQualityStrict/Rector/Variable/MoveVariableDeclarationNearReferenceRector.php b/rules/CodeQualityStrict/Rector/Variable/MoveVariableDeclarationNearReferenceRector.php index 138cf6682e8..2ba3fee9e56 100644 --- a/rules/CodeQualityStrict/Rector/Variable/MoveVariableDeclarationNearReferenceRector.php +++ b/rules/CodeQualityStrict/Rector/Variable/MoveVariableDeclarationNearReferenceRector.php @@ -38,20 +38,10 @@ */ final class MoveVariableDeclarationNearReferenceRector extends AbstractRector { - /** - * @var ScopeAwareNodeFinder - */ - private $scopeAwareNodeFinder; - - /** - * @var PureFunctionDetector - */ - private $pureFunctionDetector; - - public function __construct(ScopeAwareNodeFinder $scopeAwareNodeFinder, PureFunctionDetector $pureFunctionDetector) - { - $this->scopeAwareNodeFinder = $scopeAwareNodeFinder; - $this->pureFunctionDetector = $pureFunctionDetector; + public function __construct( + private ScopeAwareNodeFinder $scopeAwareNodeFinder, + private PureFunctionDetector $pureFunctionDetector + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Application/UseImportsAdder.php b/rules/CodingStyle/Application/UseImportsAdder.php index 80ba20c0e2c..ad58597fd87 100644 --- a/rules/CodingStyle/Application/UseImportsAdder.php +++ b/rules/CodingStyle/Application/UseImportsAdder.php @@ -17,14 +17,9 @@ final class UseImportsAdder { - /** - * @var UsedImportsResolver - */ - private $usedImportsResolver; - - public function __construct(UsedImportsResolver $usedImportsResolver) - { - $this->usedImportsResolver = $usedImportsResolver; + public function __construct( + private UsedImportsResolver $usedImportsResolver + ) { } /** diff --git a/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php b/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php index 8a1e8a9cf3c..b642fa0c2f6 100644 --- a/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php +++ b/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php @@ -11,20 +11,10 @@ final class AliasUsesResolver { - /** - * @var UseImportsTraverser - */ - private $useImportsTraverser; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(UseImportsTraverser $useImportsTraverser, BetterNodeFinder $betterNodeFinder) - { - $this->useImportsTraverser = $useImportsTraverser; - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private UseImportsTraverser $useImportsTraverser, + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php index 8a48eb3b3fa..be0221add21 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php @@ -21,14 +21,9 @@ */ final class AliasClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface { - /** - * @var AliasUsesResolver - */ - private $aliasUsesResolver; - - public function __construct(AliasUsesResolver $aliasUsesResolver) - { - $this->aliasUsesResolver = $aliasUsesResolver; + public function __construct( + private AliasUsesResolver $aliasUsesResolver + ) { } public function shouldSkip(FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php index 4d6e2ce3969..6ba4257d90c 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php @@ -20,14 +20,9 @@ */ final class ClassLikeNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface { - /** - * @var ShortNameResolver - */ - private $shortNameResolver; - - public function __construct(ShortNameResolver $shortNameResolver) - { - $this->shortNameResolver = $shortNameResolver; + public function __construct( + private ShortNameResolver $shortNameResolver + ) { } public function shouldSkip(FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php index ae1729bcd27..8dfd5207ef0 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php @@ -21,20 +21,10 @@ */ final class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface { - /** - * @var ShortNameResolver - */ - private $shortNameResolver; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - - public function __construct(ShortNameResolver $shortNameResolver, CurrentFileProvider $currentFileProvider) - { - $this->shortNameResolver = $shortNameResolver; - $this->currentFileProvider = $currentFileProvider; + public function __construct( + private ShortNameResolver $shortNameResolver, + private CurrentFileProvider $currentFileProvider + ) { } public function shouldSkip(FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php index 7e839a879fa..532f0f0ed96 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php @@ -18,14 +18,9 @@ */ final class UsesClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface { - /** - * @var UseNodesToAddCollector - */ - private $useNodesToAddCollector; - - public function __construct(UseNodesToAddCollector $useNodesToAddCollector) - { - $this->useNodesToAddCollector = $useNodesToAddCollector; + public function __construct( + private UseNodesToAddCollector $useNodesToAddCollector + ) { } public function shouldSkip(FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php index 80115067d23..5ffcf0cc4b4 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php @@ -14,17 +14,12 @@ final class ClassNameImportSkipper { - /** - * @var ClassNameImportSkipVoterInterface[] - */ - private $classNameImportSkipVoters = []; - /** * @param ClassNameImportSkipVoterInterface[] $classNameImportSkipVoters */ - public function __construct(array $classNameImportSkipVoters) - { - $this->classNameImportSkipVoters = $classNameImportSkipVoters; + public function __construct( + private array $classNameImportSkipVoters + ) { } public function shouldSkipNameForFullyQualifiedObjectType( diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php index ff3b727a053..e8b91423a04 100644 --- a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php +++ b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php @@ -43,48 +43,18 @@ final class ShortNameResolver */ private $shortNamesByFilePath = []; - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - /** * @var PhpDocInfoFactory */ private $phpDocInfoFactory; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeFinder - */ - private $nodeFinder; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - NodeFinder $nodeFinder, - ReflectionProvider $reflectionProvider, - BetterNodeFinder $betterNodeFinder + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private NodeFinder $nodeFinder, + private ReflectionProvider $reflectionProvider, + private BetterNodeFinder $betterNodeFinder ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeFinder = $nodeFinder; - $this->reflectionProvider = $reflectionProvider; - $this->betterNodeFinder = $betterNodeFinder; } /** diff --git a/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php b/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php index 25da48cdb58..1758a1b1209 100644 --- a/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php +++ b/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php @@ -13,22 +13,10 @@ final class UseImportsTraverser { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } /** diff --git a/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php b/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php index 15dc66e0c52..9eef9ca48c0 100644 --- a/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php +++ b/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php @@ -15,29 +15,11 @@ final class UsedImportsResolver { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var UseImportsTraverser - */ - private $useImportsTraverser; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - UseImportsTraverser $useImportsTraverser + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private UseImportsTraverser $useImportsTraverser ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->useImportsTraverser = $useImportsTraverser; } /** diff --git a/rules/CodingStyle/Naming/NameRenamer.php b/rules/CodingStyle/Naming/NameRenamer.php index 43e63540aec..1ad6f62f351 100644 --- a/rules/CodingStyle/Naming/NameRenamer.php +++ b/rules/CodingStyle/Naming/NameRenamer.php @@ -19,14 +19,9 @@ final class NameRenamer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/CodingStyle/Node/ConcatManipulator.php b/rules/CodingStyle/Node/ConcatManipulator.php index 128e43dad39..42499b68970 100644 --- a/rules/CodingStyle/Node/ConcatManipulator.php +++ b/rules/CodingStyle/Node/ConcatManipulator.php @@ -12,22 +12,10 @@ final class ConcatManipulator { - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeComparator $nodeComparator + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeComparator = $nodeComparator; } public function getFirstConcatItem(Concat $concat): Expr diff --git a/rules/CodingStyle/Node/DocAliasResolver.php b/rules/CodingStyle/Node/DocAliasResolver.php index 6a7ba10de18..e4a3295e9d8 100644 --- a/rules/CodingStyle/Node/DocAliasResolver.php +++ b/rules/CodingStyle/Node/DocAliasResolver.php @@ -22,22 +22,10 @@ final class DocAliasResolver */ private const DOC_ALIAS_REGEX = '#\@(?\w+)(\\\\)?#s'; - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - PhpDocInfoFactory $phpDocInfoFactory + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->phpDocInfoFactory = $phpDocInfoFactory; } /** diff --git a/rules/CodingStyle/Node/NameImporter.php b/rules/CodingStyle/Node/NameImporter.php index f5d73d1bf32..7df4080eb85 100644 --- a/rules/CodingStyle/Node/NameImporter.php +++ b/rules/CodingStyle/Node/NameImporter.php @@ -29,57 +29,15 @@ final class NameImporter */ private $aliasedUses = []; - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var AliasUsesResolver - */ - private $aliasUsesResolver; - - /** - * @var ClassNameImportSkipper - */ - private $classNameImportSkipper; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var UseNodesToAddCollector - */ - private $useNodesToAddCollector; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - AliasUsesResolver $aliasUsesResolver, - ClassNameImportSkipper $classNameImportSkipper, - NodeNameResolver $nodeNameResolver, - ParameterProvider $parameterProvider, - StaticTypeMapper $staticTypeMapper, - UseNodesToAddCollector $useNodesToAddCollector, - ReflectionProvider $reflectionProvider + private AliasUsesResolver $aliasUsesResolver, + private ClassNameImportSkipper $classNameImportSkipper, + private NodeNameResolver $nodeNameResolver, + private ParameterProvider $parameterProvider, + private StaticTypeMapper $staticTypeMapper, + private UseNodesToAddCollector $useNodesToAddCollector, + private ReflectionProvider $reflectionProvider ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->aliasUsesResolver = $aliasUsesResolver; - $this->classNameImportSkipper = $classNameImportSkipper; - $this->nodeNameResolver = $nodeNameResolver; - $this->parameterProvider = $parameterProvider; - $this->useNodesToAddCollector = $useNodesToAddCollector; - $this->reflectionProvider = $reflectionProvider; } public function importName(Name $name): ?Name diff --git a/rules/CodingStyle/Node/UseManipulator.php b/rules/CodingStyle/Node/UseManipulator.php index 2a1a686272c..991a54fff90 100644 --- a/rules/CodingStyle/Node/UseManipulator.php +++ b/rules/CodingStyle/Node/UseManipulator.php @@ -22,20 +22,10 @@ final class UseManipulator */ private $resolvedNodeNames = []; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/CodingStyle/Node/UseNameAliasToNameResolver.php b/rules/CodingStyle/Node/UseNameAliasToNameResolver.php index b6b4a0056c8..b4ba4c49e10 100644 --- a/rules/CodingStyle/Node/UseNameAliasToNameResolver.php +++ b/rules/CodingStyle/Node/UseNameAliasToNameResolver.php @@ -11,20 +11,10 @@ final class UseNameAliasToNameResolver { - /** - * @var ShortNameResolver - */ - private $shortNameResolver; - - /** - * @var ClassNaming - */ - private $classNaming; - - public function __construct(ClassNaming $classNaming, ShortNameResolver $shortNameResolver) - { - $this->shortNameResolver = $shortNameResolver; - $this->classNaming = $classNaming; + public function __construct( + private ClassNaming $classNaming, + private ShortNameResolver $shortNameResolver + ) { } /** diff --git a/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php b/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php index 82d764a065e..6a824158b70 100644 --- a/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php +++ b/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php @@ -11,14 +11,9 @@ final class ImplodeAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/CodingStyle/NodeFactory/JsonArrayFactory.php b/rules/CodingStyle/NodeFactory/JsonArrayFactory.php index 3728caf070f..fd955986e6b 100644 --- a/rules/CodingStyle/NodeFactory/JsonArrayFactory.php +++ b/rules/CodingStyle/NodeFactory/JsonArrayFactory.php @@ -18,29 +18,11 @@ final class JsonArrayFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var ImplodeAnalyzer - */ - private $implodeAnalyzer; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - NodeFactory $nodeFactory, - ImplodeAnalyzer $implodeAnalyzer, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private NodeFactory $nodeFactory, + private ImplodeAnalyzer $implodeAnalyzer, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->nodeFactory = $nodeFactory; - $this->implodeAnalyzer = $implodeAnalyzer; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function createFromJsonString(string $stringValue): Array_ diff --git a/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php b/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php index 93d17ddb231..588ddb9544e 100644 --- a/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php +++ b/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php @@ -18,14 +18,9 @@ */ final class JsonEncodeStaticCallFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - public function __construct(NodeFactory $nodeFactory) - { - $this->nodeFactory = $nodeFactory; + public function __construct( + private NodeFactory $nodeFactory + ) { } /** diff --git a/rules/CodingStyle/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php b/rules/CodingStyle/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php index 3fbb766d0f0..7bccc722889 100644 --- a/rules/CodingStyle/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php +++ b/rules/CodingStyle/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php @@ -43,36 +43,12 @@ final class ManualJsonStringToJsonEncodeArrayRector extends AbstractRector */ private const JSON_STRING_REGEX = '#{(.*?\:.*?)}#s'; - /** - * @var ConcatJoiner - */ - private $concatJoiner; - - /** - * @var ConcatManipulator - */ - private $concatManipulator; - - /** - * @var JsonEncodeStaticCallFactory - */ - private $jsonEncodeStaticCallFactory; - - /** - * @var JsonArrayFactory - */ - private $jsonArrayFactory; - public function __construct( - ConcatJoiner $concatJoiner, - ConcatManipulator $concatManipulator, - JsonEncodeStaticCallFactory $jsonEncodeStaticCallFactory, - JsonArrayFactory $jsonArrayFactory + private ConcatJoiner $concatJoiner, + private ConcatManipulator $concatManipulator, + private JsonEncodeStaticCallFactory $jsonEncodeStaticCallFactory, + private JsonArrayFactory $jsonArrayFactory ) { - $this->concatJoiner = $concatJoiner; - $this->concatManipulator = $concatManipulator; - $this->jsonEncodeStaticCallFactory = $jsonEncodeStaticCallFactory; - $this->jsonArrayFactory = $jsonArrayFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php b/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php index ee2bf421653..6474884885c 100644 --- a/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php +++ b/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php @@ -25,20 +25,10 @@ */ final class VarConstantCommentRector extends AbstractRector { - /** - * @var TypeComparator - */ - private $typeComparator; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(TypeComparator $typeComparator, PhpDocTypeChanger $phpDocTypeChanger) - { - $this->typeComparator = $typeComparator; - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private TypeComparator $typeComparator, + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php b/rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php index 5b26494945a..e5148f22e88 100644 --- a/rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php @@ -39,21 +39,10 @@ final class ReturnArrayClassMethodToYieldRector extends AbstractRector implement */ private $methodsToYields = []; - /** - * @var NodeTransformer - */ - private $nodeTransformer; - - /** - * @var CommentsMerger - */ - private $commentsMerger; - - public function __construct(NodeTransformer $nodeTransformer, CommentsMerger $commentsMerger) - { - $this->nodeTransformer = $nodeTransformer; - $this->commentsMerger = $commentsMerger; - + public function __construct( + private NodeTransformer $nodeTransformer, + private CommentsMerger $commentsMerger + ) { // default values $this->methodsToYields = [ new ReturnArrayClassMethodToYield('PHPUnit\Framework\TestCase', 'provideData'), diff --git a/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php b/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php index 7eaf8761c29..a14ea3a8b96 100644 --- a/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php @@ -19,14 +19,9 @@ */ final class UnSpreadOperatorRector extends AbstractRector { - /** - * @var SpreadVariablesCollector - */ - private $spreadVariablesCollector; - - public function __construct(SpreadVariablesCollector $spreadVariablesCollector) - { - $this->spreadVariablesCollector = $spreadVariablesCollector; + public function __construct( + private SpreadVariablesCollector $spreadVariablesCollector + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php b/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php index 5b5f91bc8e7..a5ddb84f38d 100644 --- a/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php @@ -30,23 +30,13 @@ final class YieldClassMethodToArrayClassMethodRector extends AbstractRector impl */ public const METHODS_BY_TYPE = 'methods_by_type'; - /** - * @var array - */ - private $methodsByType = []; - - /** - * @var NodeTransformer - */ - private $nodeTransformer; - /** * @param array $methodsByType */ - public function __construct(NodeTransformer $nodeTransformer, array $methodsByType = []) - { - $this->methodsByType = $methodsByType; - $this->nodeTransformer = $nodeTransformer; + public function __construct( + private NodeTransformer $nodeTransformer, + private array $methodsByType = [] + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php b/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php index c6bab94a2f5..0dc50777f19 100644 --- a/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php +++ b/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php @@ -29,22 +29,10 @@ */ final class AddArrayDefaultToArrayPropertyRector extends AbstractRector { - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var IterableTypeAnalyzer - */ - private $iterableTypeAnalyzer; - public function __construct( - PropertyFetchAnalyzer $propertyFetchAnalyzer, - IterableTypeAnalyzer $iterableTypeAnalyzer + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private IterableTypeAnalyzer $iterableTypeAnalyzer ) { - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->iterableTypeAnalyzer = $iterableTypeAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php b/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php index 3cd7d4c66d0..86e851d20f2 100644 --- a/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php +++ b/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php @@ -25,14 +25,9 @@ */ final class CallUserFuncArrayToVariadicRector extends AbstractRector { - /** - * @var ArrayCallableToMethodCallFactory - */ - private $arrayCallableToMethodCallFactory; - - public function __construct(ArrayCallableToMethodCallFactory $arrayCallableToMethodCallFactory) - { - $this->arrayCallableToMethodCallFactory = $arrayCallableToMethodCallFactory; + public function __construct( + private ArrayCallableToMethodCallFactory $arrayCallableToMethodCallFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php b/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php index 4f80c29694b..0549366d9fd 100644 --- a/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php +++ b/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php @@ -20,14 +20,9 @@ */ final class CallUserFuncToMethodCallRector extends AbstractRector { - /** - * @var ArrayCallableToMethodCallFactory - */ - private $arrayCallableToMethodCallFactory; - - public function __construct(ArrayCallableToMethodCallFactory $arrayCallableToMethodCallFactory) - { - $this->arrayCallableToMethodCallFactory = $arrayCallableToMethodCallFactory; + public function __construct( + private ArrayCallableToMethodCallFactory $arrayCallableToMethodCallFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php b/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php index c782a3924c6..45609c027e0 100644 --- a/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php +++ b/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php @@ -20,14 +20,9 @@ */ final class ConsistentImplodeRector extends AbstractRector { - /** - * @var StringTypeAnalyzer - */ - private $stringTypeAnalyzer; - - public function __construct(StringTypeAnalyzer $stringTypeAnalyzer) - { - $this->stringTypeAnalyzer = $stringTypeAnalyzer; + public function __construct( + private StringTypeAnalyzer $stringTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/String_/SplitStringClassConstantToClassConstFetchRector.php b/rules/CodingStyle/Rector/String_/SplitStringClassConstantToClassConstFetchRector.php index c5c3bb8e8ab..3af80cb55b1 100644 --- a/rules/CodingStyle/Rector/String_/SplitStringClassConstantToClassConstFetchRector.php +++ b/rules/CodingStyle/Rector/String_/SplitStringClassConstantToClassConstFetchRector.php @@ -19,14 +19,9 @@ */ final class SplitStringClassConstantToClassConstFetchRector extends AbstractRector { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php b/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php index c53319583ab..997edaf36b0 100644 --- a/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php +++ b/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php @@ -25,14 +25,9 @@ final class UseClassKeywordForClassNameResolutionRector extends AbstractRector */ private const CLASS_BEFORE_STATIC_ACCESS_REGEX = '#(?[\\\\a-zA-Z0-9_\\x80-\\xff]*)::#'; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector.php b/rules/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector.php index 5a17ac8bc08..6f3bd853a90 100644 --- a/rules/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector.php +++ b/rules/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector.php @@ -22,14 +22,9 @@ */ final class BinarySwitchToIfElseRector extends AbstractRector { - /** - * @var SwitchManipulator - */ - private $switchManipulator; - - public function __construct(SwitchManipulator $switchManipulator) - { - $this->switchManipulator = $switchManipulator; + public function __construct( + private SwitchManipulator $switchManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php b/rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php index cbcb7b86e29..80bca1f9f28 100644 --- a/rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php +++ b/rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php @@ -40,36 +40,12 @@ final class RemoveUnusedAliasRector extends AbstractRector */ private $resolvedDocPossibleAliases = []; - /** - * @var DocAliasResolver - */ - private $docAliasResolver; - - /** - * @var UseNameAliasToNameResolver - */ - private $useNameAliasToNameResolver; - - /** - * @var UseManipulator - */ - private $useManipulator; - - /** - * @var NameRenamer - */ - private $nameRenamer; - public function __construct( - DocAliasResolver $docAliasResolver, - UseManipulator $useManipulator, - UseNameAliasToNameResolver $useNameAliasToNameResolver, - NameRenamer $nameRenamer + private DocAliasResolver $docAliasResolver, + private UseManipulator $useManipulator, + private UseNameAliasToNameResolver $useNameAliasToNameResolver, + private NameRenamer $nameRenamer ) { - $this->docAliasResolver = $docAliasResolver; - $this->useNameAliasToNameResolver = $useNameAliasToNameResolver; - $this->useManipulator = $useManipulator; - $this->nameRenamer = $nameRenamer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodingStyle/ValueObject/ConcatStringAndPlaceholders.php b/rules/CodingStyle/ValueObject/ConcatStringAndPlaceholders.php index 96c1b9b41f0..58e0e3828d9 100644 --- a/rules/CodingStyle/ValueObject/ConcatStringAndPlaceholders.php +++ b/rules/CodingStyle/ValueObject/ConcatStringAndPlaceholders.php @@ -8,23 +8,13 @@ final class ConcatStringAndPlaceholders { - /** - * @var string - */ - private $content; - - /** - * @var Expr[] - */ - private $placeholderNodes = []; - /** * @param Expr[] $placeholderNodes */ - public function __construct(string $content, array $placeholderNodes) - { - $this->content = $content; - $this->placeholderNodes = $placeholderNodes; + public function __construct( + private string $content, + private array $placeholderNodes + ) { } public function getContent(): string diff --git a/rules/CodingStyle/ValueObject/NameAndParent.php b/rules/CodingStyle/ValueObject/NameAndParent.php index 6838789390f..6dd73109351 100644 --- a/rules/CodingStyle/ValueObject/NameAndParent.php +++ b/rules/CodingStyle/ValueObject/NameAndParent.php @@ -10,23 +10,13 @@ final class NameAndParent { - /** - * @var Node - */ - private $parentNode; - - /** - * @var Name|Identifier - */ - private $nameNode; - /** * @param Name|Identifier $nameNode */ - public function __construct(Node $nameNode, Node $parentNode) - { - $this->nameNode = $nameNode; - $this->parentNode = $parentNode; + public function __construct( + private Node $nameNode, + private Node $parentNode + ) { } /** diff --git a/rules/CodingStyle/ValueObject/NodeToRemoveAndConcatItem.php b/rules/CodingStyle/ValueObject/NodeToRemoveAndConcatItem.php index 194edc5d419..84d0b4f88ee 100644 --- a/rules/CodingStyle/ValueObject/NodeToRemoveAndConcatItem.php +++ b/rules/CodingStyle/ValueObject/NodeToRemoveAndConcatItem.php @@ -9,20 +9,10 @@ final class NodeToRemoveAndConcatItem { - /** - * @var Expr - */ - private $removedExpr; - - /** - * @var Node - */ - private $concatItemNode; - - public function __construct(Expr $removedExpr, Node $concatItemNode) - { - $this->removedExpr = $removedExpr; - $this->concatItemNode = $concatItemNode; + public function __construct( + private Expr $removedExpr, + private Node $concatItemNode + ) { } public function getRemovedExpr(): Expr diff --git a/rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php b/rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php index d66f14dfe3a..ea4c77da0e5 100644 --- a/rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php +++ b/rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php @@ -8,20 +8,10 @@ final class ReturnArrayClassMethodToYield { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $method; - - public function __construct(string $type, string $method) - { - $this->type = $type; - $this->method = $method; + public function __construct( + private string $type, + private string $method + ) { } public function getObjectType(): ObjectType diff --git a/rules/Composer/Application/FileProcessor/ComposerFileProcessor.php b/rules/Composer/Application/FileProcessor/ComposerFileProcessor.php index 6cdc77f5bcd..68206b188bc 100644 --- a/rules/Composer/Application/FileProcessor/ComposerFileProcessor.php +++ b/rules/Composer/Application/FileProcessor/ComposerFileProcessor.php @@ -14,32 +14,14 @@ final class ComposerFileProcessor implements FileProcessorInterface { - /** - * @var ComposerJsonFactory - */ - private $composerJsonFactory; - - /** - * @var ComposerJsonPrinter - */ - private $composerJsonPrinter; - - /** - * @var ComposerRectorInterface[] - */ - private $composerRectors = []; - /** * @param ComposerRectorInterface[] $composerRectors */ public function __construct( - ComposerJsonFactory $composerJsonFactory, - ComposerJsonPrinter $composerJsonPrinter, - array $composerRectors + private ComposerJsonFactory $composerJsonFactory, + private ComposerJsonPrinter $composerJsonPrinter, + private array $composerRectors ) { - $this->composerJsonFactory = $composerJsonFactory; - $this->composerJsonPrinter = $composerJsonPrinter; - $this->composerRectors = $composerRectors; } /** diff --git a/rules/Composer/Guard/VersionGuard.php b/rules/Composer/Guard/VersionGuard.php index 19bfaaf5191..0460f9c226a 100644 --- a/rules/Composer/Guard/VersionGuard.php +++ b/rules/Composer/Guard/VersionGuard.php @@ -9,14 +9,9 @@ final class VersionGuard { - /** - * @var VersionParser - */ - private $versionParser; - - public function __construct(VersionParser $versionParser) - { - $this->versionParser = $versionParser; + public function __construct( + private VersionParser $versionParser + ) { } /** diff --git a/rules/Composer/Rector/AddPackageToRequireComposerRector.php b/rules/Composer/Rector/AddPackageToRequireComposerRector.php index a17b1129ef9..872d17d2d5b 100644 --- a/rules/Composer/Rector/AddPackageToRequireComposerRector.php +++ b/rules/Composer/Rector/AddPackageToRequireComposerRector.php @@ -26,14 +26,9 @@ final class AddPackageToRequireComposerRector implements ComposerRectorInterface */ private $packagesAndVersions = []; - /** - * @var VersionGuard - */ - private $versionGuard; - - public function __construct(VersionGuard $versionGuard) - { - $this->versionGuard = $versionGuard; + public function __construct( + private VersionGuard $versionGuard + ) { } public function refactor(ComposerJson $composerJson): void diff --git a/rules/Composer/Rector/AddPackageToRequireDevComposerRector.php b/rules/Composer/Rector/AddPackageToRequireDevComposerRector.php index 8816fba2877..b3313209721 100644 --- a/rules/Composer/Rector/AddPackageToRequireDevComposerRector.php +++ b/rules/Composer/Rector/AddPackageToRequireDevComposerRector.php @@ -26,14 +26,9 @@ final class AddPackageToRequireDevComposerRector implements ComposerRectorInterf */ private $packageAndVersions = []; - /** - * @var VersionGuard - */ - private $versionGuard; - - public function __construct(VersionGuard $versionGuard) - { - $this->versionGuard = $versionGuard; + public function __construct( + private VersionGuard $versionGuard + ) { } public function refactor(ComposerJson $composerJson): void diff --git a/rules/Composer/Rector/ChangePackageVersionComposerRector.php b/rules/Composer/Rector/ChangePackageVersionComposerRector.php index 5d39ec02eb6..880cb2069e1 100644 --- a/rules/Composer/Rector/ChangePackageVersionComposerRector.php +++ b/rules/Composer/Rector/ChangePackageVersionComposerRector.php @@ -26,14 +26,9 @@ final class ChangePackageVersionComposerRector implements ComposerRectorInterfac */ private $packagesAndVersions = []; - /** - * @var VersionGuard - */ - private $versionGuard; - - public function __construct(VersionGuard $versionGuard) - { - $this->versionGuard = $versionGuard; + public function __construct( + private VersionGuard $versionGuard + ) { } public function refactor(ComposerJson $composerJson): void diff --git a/rules/Composer/Rector/ReplacePackageAndVersionComposerRector.php b/rules/Composer/Rector/ReplacePackageAndVersionComposerRector.php index 8cbe4b479f1..78bde458fe2 100644 --- a/rules/Composer/Rector/ReplacePackageAndVersionComposerRector.php +++ b/rules/Composer/Rector/ReplacePackageAndVersionComposerRector.php @@ -26,14 +26,9 @@ final class ReplacePackageAndVersionComposerRector implements ComposerRectorInte */ private $replacePackagesAndVersions = []; - /** - * @var VersionGuard - */ - private $versionGuard; - - public function __construct(VersionGuard $versionGuard) - { - $this->versionGuard = $versionGuard; + public function __construct( + private VersionGuard $versionGuard + ) { } public function refactor(ComposerJson $composerJson): void diff --git a/rules/Composer/ValueObject/PackageAndVersion.php b/rules/Composer/ValueObject/PackageAndVersion.php index 72e41884c16..cde69d71792 100644 --- a/rules/Composer/ValueObject/PackageAndVersion.php +++ b/rules/Composer/ValueObject/PackageAndVersion.php @@ -8,20 +8,10 @@ final class PackageAndVersion implements VersionAwareInterface { - /** - * @var string - */ - private $packageName; - - /** - * @var string - */ - private $version; - - public function __construct(string $packageName, string $version) - { - $this->packageName = $packageName; - $this->version = $version; + public function __construct( + private string $packageName, + private string $version + ) { } public function getPackageName(): string diff --git a/rules/Composer/ValueObject/ReplacePackageAndVersion.php b/rules/Composer/ValueObject/ReplacePackageAndVersion.php index a7951cd6f35..04b93395618 100644 --- a/rules/Composer/ValueObject/ReplacePackageAndVersion.php +++ b/rules/Composer/ValueObject/ReplacePackageAndVersion.php @@ -20,13 +20,11 @@ final class ReplacePackageAndVersion implements VersionAwareInterface */ private $newPackageName; - /** - * @var string - */ - private $version; - - public function __construct(string $oldPackageName, string $newPackageName, string $version) - { + public function __construct( + string $oldPackageName, + string $newPackageName, + private string $version + ) { Assert::notSame( $oldPackageName, $newPackageName, @@ -35,7 +33,6 @@ public function __construct(string $oldPackageName, string $newPackageName, stri $this->oldPackageName = $oldPackageName; $this->newPackageName = $newPackageName; - $this->version = $version; } public function getOldPackageName(): string diff --git a/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php b/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php index f6268bb32c0..2a184334e3d 100644 --- a/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php +++ b/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php @@ -21,43 +21,13 @@ final class CurrentAndParentClassMethodComparator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var MethodReflectionProvider - */ - private $methodReflectionProvider; - - /** - * @var ParameterDefaultsComparator - */ - private $parameterDefaultsComparator; - - /** - * @var ParameterTypeComparator - */ - private $parameterTypeComparator; - public function __construct( - NodeNameResolver $nodeNameResolver, - MethodReflectionProvider $methodReflectionProvider, - ParameterDefaultsComparator $parameterDefaultsComparator, - ParameterTypeComparator $parameterTypeComparator, - NodeComparator $nodeComparator + private NodeNameResolver $nodeNameResolver, + private MethodReflectionProvider $methodReflectionProvider, + private ParameterDefaultsComparator $parameterDefaultsComparator, + private ParameterTypeComparator $parameterTypeComparator, + private NodeComparator $nodeComparator ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->methodReflectionProvider = $methodReflectionProvider; - $this->parameterDefaultsComparator = $parameterDefaultsComparator; - $this->parameterTypeComparator = $parameterTypeComparator; - $this->nodeComparator = $nodeComparator; } public function isParentCallMatching(ClassMethod $classMethod, StaticCall $staticCall): bool diff --git a/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php b/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php index 54fe5a4137a..f60cd400564 100644 --- a/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php +++ b/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php @@ -19,14 +19,9 @@ final class ParameterDefaultsComparator { - /** - * @var ValueResolver - */ - private $valueResolver; - - public function __construct(ValueResolver $valueResolver) - { - $this->valueResolver = $valueResolver; + public function __construct( + private ValueResolver $valueResolver + ) { } public function areDefaultValuesDifferent(ParameterReflection $parameterReflection, Param $param): bool diff --git a/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php b/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php index 860369673e2..ac1f7ca1f2a 100644 --- a/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php +++ b/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php @@ -10,14 +10,9 @@ final class ParameterTypeComparator { - /** - * @var MethodReflectionProvider - */ - private $methodReflectionProvider; - - public function __construct(MethodReflectionProvider $methodReflectionProvider) - { - $this->methodReflectionProvider = $methodReflectionProvider; + public function __construct( + private MethodReflectionProvider $methodReflectionProvider + ) { } public function compareCurrentClassMethodAndParentStaticCall( diff --git a/rules/DeadCode/ConditionResolver.php b/rules/DeadCode/ConditionResolver.php index b2f369a53f1..aaf87f4c9d9 100644 --- a/rules/DeadCode/ConditionResolver.php +++ b/rules/DeadCode/ConditionResolver.php @@ -21,36 +21,12 @@ final class ConditionResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - /** - * @var PhpVersionFactory - */ - private $phpVersionFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - PhpVersionProvider $phpVersionProvider, - ValueResolver $valueResolver, - PhpVersionFactory $phpVersionFactory + private NodeNameResolver $nodeNameResolver, + private PhpVersionProvider $phpVersionProvider, + private ValueResolver $valueResolver, + private PhpVersionFactory $phpVersionFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; - $this->phpVersionProvider = $phpVersionProvider; - $this->phpVersionFactory = $phpVersionFactory; } public function resolveFromExpr(Expr $expr): ?ConditionInterface diff --git a/rules/DeadCode/FeatureSupport/FunctionSupportResolver.php b/rules/DeadCode/FeatureSupport/FunctionSupportResolver.php index 553920fe131..9e79a261ff9 100644 --- a/rules/DeadCode/FeatureSupport/FunctionSupportResolver.php +++ b/rules/DeadCode/FeatureSupport/FunctionSupportResolver.php @@ -27,14 +27,9 @@ final class FunctionSupportResolver PhpVersion::PHP_74 => ['get_mangled_object_vars', 'mb_str_split', 'password_algos'], ]; - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - public function __construct(PhpVersionProvider $phpVersionProvider) - { - $this->phpVersionProvider = $phpVersionProvider; + public function __construct( + private PhpVersionProvider $phpVersionProvider + ) { } public function isFunctionSupported(string $desiredFunction): bool diff --git a/rules/DeadCode/NodeAnalyzer/InstanceOfUniqueKeyResolver.php b/rules/DeadCode/NodeAnalyzer/InstanceOfUniqueKeyResolver.php index 5835068fcba..f1bcb11fda1 100644 --- a/rules/DeadCode/NodeAnalyzer/InstanceOfUniqueKeyResolver.php +++ b/rules/DeadCode/NodeAnalyzer/InstanceOfUniqueKeyResolver.php @@ -10,14 +10,9 @@ final class InstanceOfUniqueKeyResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function resolve(Instanceof_ $instanceof): ?string diff --git a/rules/DeadCode/NodeAnalyzer/UsedVariableNameAnalyzer.php b/rules/DeadCode/NodeAnalyzer/UsedVariableNameAnalyzer.php index d823e08db31..ec4ba5c84e4 100644 --- a/rules/DeadCode/NodeAnalyzer/UsedVariableNameAnalyzer.php +++ b/rules/DeadCode/NodeAnalyzer/UsedVariableNameAnalyzer.php @@ -12,14 +12,9 @@ final class UsedVariableNameAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function isVariableNamed(Node $node, Variable $variable): bool diff --git a/rules/DeadCode/NodeCollector/ModifiedVariableNamesCollector.php b/rules/DeadCode/NodeCollector/ModifiedVariableNamesCollector.php index d2ced33ed89..7e1c46b8e1a 100644 --- a/rules/DeadCode/NodeCollector/ModifiedVariableNamesCollector.php +++ b/rules/DeadCode/NodeCollector/ModifiedVariableNamesCollector.php @@ -16,22 +16,10 @@ final class ModifiedVariableNamesCollector { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/rules/DeadCode/NodeCollector/NodeByTypeAndPositionCollector.php b/rules/DeadCode/NodeCollector/NodeByTypeAndPositionCollector.php index e42b320feab..81eab71bc81 100644 --- a/rules/DeadCode/NodeCollector/NodeByTypeAndPositionCollector.php +++ b/rules/DeadCode/NodeCollector/NodeByTypeAndPositionCollector.php @@ -14,20 +14,10 @@ final class NodeByTypeAndPositionCollector { - /** - * @var FlowOfControlLocator - */ - private $flowOfControlLocator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(FlowOfControlLocator $flowOfControlLocator, NodeNameResolver $nodeNameResolver) - { - $this->flowOfControlLocator = $flowOfControlLocator; - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private FlowOfControlLocator $flowOfControlLocator, + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/DeadCode/NodeCollector/UnusedParameterResolver.php b/rules/DeadCode/NodeCollector/UnusedParameterResolver.php index 977cb79eb0d..9078bae0fda 100644 --- a/rules/DeadCode/NodeCollector/UnusedParameterResolver.php +++ b/rules/DeadCode/NodeCollector/UnusedParameterResolver.php @@ -12,22 +12,10 @@ final class UnusedParameterResolver { - /** - * @var ClassMethodManipulator - */ - private $classMethodManipulator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - ClassMethodManipulator $classMethodManipulator, - NodeNameResolver $nodeNameResolver + private ClassMethodManipulator $classMethodManipulator, + private NodeNameResolver $nodeNameResolver ) { - $this->classMethodManipulator = $classMethodManipulator; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/rules/DeadCode/NodeFinder/NextVariableUsageNodeFinder.php b/rules/DeadCode/NodeFinder/NextVariableUsageNodeFinder.php index fc679b4fac6..a9965f6690a 100644 --- a/rules/DeadCode/NodeFinder/NextVariableUsageNodeFinder.php +++ b/rules/DeadCode/NodeFinder/NextVariableUsageNodeFinder.php @@ -17,43 +17,13 @@ final class NextVariableUsageNodeFinder { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ParentScopeFinder - */ - private $parentScopeFinder; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - BetterNodeFinder $betterNodeFinder, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - ParentScopeFinder $parentScopeFinder, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private ParentScopeFinder $parentScopeFinder, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->parentScopeFinder = $parentScopeFinder; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; } public function find(Assign $assign): ?Node diff --git a/rules/DeadCode/NodeFinder/PreviousVariableAssignNodeFinder.php b/rules/DeadCode/NodeFinder/PreviousVariableAssignNodeFinder.php index bd3b445dfcb..feee37f302b 100644 --- a/rules/DeadCode/NodeFinder/PreviousVariableAssignNodeFinder.php +++ b/rules/DeadCode/NodeFinder/PreviousVariableAssignNodeFinder.php @@ -12,29 +12,11 @@ final class PreviousVariableAssignNodeFinder { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private NodeComparator $nodeComparator ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; } public function find(Assign $assign): ?Node diff --git a/rules/DeadCode/NodeFinder/VariableUseFinder.php b/rules/DeadCode/NodeFinder/VariableUseFinder.php index 0f91ca1d256..3c3743a05ea 100644 --- a/rules/DeadCode/NodeFinder/VariableUseFinder.php +++ b/rules/DeadCode/NodeFinder/VariableUseFinder.php @@ -14,29 +14,11 @@ final class VariableUseFinder { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private NodeComparator $nodeComparator ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/DeadCode/NodeManipulator/ControllerClassMethodManipulator.php b/rules/DeadCode/NodeManipulator/ControllerClassMethodManipulator.php index 962af312630..89454497a45 100644 --- a/rules/DeadCode/NodeManipulator/ControllerClassMethodManipulator.php +++ b/rules/DeadCode/NodeManipulator/ControllerClassMethodManipulator.php @@ -13,20 +13,10 @@ final class ControllerClassMethodManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(NodeNameResolver $nodeNameResolver, PhpDocInfoFactory $phpDocInfoFactory) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private PhpDocInfoFactory $phpDocInfoFactory + ) { } public function isControllerClassMethodWithBehaviorAnnotation(ClassMethod $classMethod): bool diff --git a/rules/DeadCode/NodeManipulator/CountManipulator.php b/rules/DeadCode/NodeManipulator/CountManipulator.php index 62f00c5031a..6f6dadbf8b1 100644 --- a/rules/DeadCode/NodeManipulator/CountManipulator.php +++ b/rules/DeadCode/NodeManipulator/CountManipulator.php @@ -17,20 +17,10 @@ final class CountManipulator { - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver, NodeComparator $nodeComparator) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private NodeComparator $nodeComparator + ) { } public function isCounterHigherThanOne(Node $node, Expr $expr): bool diff --git a/rules/DeadCode/NodeManipulator/LivingCodeManipulator.php b/rules/DeadCode/NodeManipulator/LivingCodeManipulator.php index 18ed27c986d..f65df0dda1e 100644 --- a/rules/DeadCode/NodeManipulator/LivingCodeManipulator.php +++ b/rules/DeadCode/NodeManipulator/LivingCodeManipulator.php @@ -34,14 +34,9 @@ final class LivingCodeManipulator { - /** - * @var NodesToAddCollector - */ - private $nodesToAddCollector; - - public function __construct(NodesToAddCollector $nodesToAddCollector) - { - $this->nodesToAddCollector = $nodesToAddCollector; + public function __construct( + private NodesToAddCollector $nodesToAddCollector + ) { } public function addLivingCodeBeforeNode(Expr $expr, Node $addBeforeThisNode): void diff --git a/rules/DeadCode/NodeManipulator/VariadicFunctionLikeDetector.php b/rules/DeadCode/NodeManipulator/VariadicFunctionLikeDetector.php index afa2022ec2e..761d05d9296 100644 --- a/rules/DeadCode/NodeManipulator/VariadicFunctionLikeDetector.php +++ b/rules/DeadCode/NodeManipulator/VariadicFunctionLikeDetector.php @@ -18,22 +18,10 @@ final class VariadicFunctionLikeDetector */ private const VARIADIC_FUNCTION_NAMES = ['func_get_arg', 'func_get_args', 'func_num_args']; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function isVariadic(FunctionLike $functionLike): bool diff --git a/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php index ce855755cf0..54e6845ee52 100644 --- a/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php +++ b/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php @@ -13,20 +13,10 @@ final class DeadParamTagValueNodeAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var TypeComparator - */ - private $typeComparator; - - public function __construct(NodeNameResolver $nodeNameResolver, TypeComparator $typeComparator) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->typeComparator = $typeComparator; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private TypeComparator $typeComparator + ) { } public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $functionLike): bool diff --git a/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php index c5e7f6b7cc9..134acbb8ddd 100644 --- a/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php +++ b/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php @@ -11,14 +11,9 @@ final class DeadReturnTagValueNodeAnalyzer { - /** - * @var TypeComparator - */ - private $typeComparator; - - public function __construct(TypeComparator $typeComparator) - { - $this->typeComparator = $typeComparator; + public function __construct( + private TypeComparator $typeComparator + ) { } public function isDead(ReturnTagValueNode $returnTagValueNode, FunctionLike $functionLike): bool diff --git a/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php index 5997264fff4..387d72cd203 100644 --- a/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php +++ b/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php @@ -10,14 +10,9 @@ final class DeadVarTagValueNodeAnalyzer { - /** - * @var TypeComparator - */ - private $typeComparator; - - public function __construct(TypeComparator $typeComparator) - { - $this->typeComparator = $typeComparator; + public function __construct( + private TypeComparator $typeComparator + ) { } public function isDead(VarTagValueNode $varTagValueNode, Property $property): bool diff --git a/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php index a218f6e90dd..2500f01e318 100644 --- a/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php +++ b/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php @@ -12,22 +12,10 @@ final class ParamTagRemover { - /** - * @var DeadParamTagValueNodeAnalyzer - */ - private $deadParamTagValueNodeAnalyzer; - - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - public function __construct( - DeadParamTagValueNodeAnalyzer $deadParamTagValueNodeAnalyzer, - PhpDocTagRemover $phpDocTagRemover + private DeadParamTagValueNodeAnalyzer $deadParamTagValueNodeAnalyzer, + private PhpDocTagRemover $phpDocTagRemover ) { - $this->deadParamTagValueNodeAnalyzer = $deadParamTagValueNodeAnalyzer; - $this->phpDocTagRemover = $phpDocTagRemover; } public function removeParamTagsIfUseless(PhpDocInfo $phpDocInfo, FunctionLike $functionLike): void diff --git a/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php index 3eae2c06262..52be9834c08 100644 --- a/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php +++ b/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php @@ -12,14 +12,9 @@ final class ReturnTagRemover { - /** - * @var DeadReturnTagValueNodeAnalyzer - */ - private $deadReturnTagValueNodeAnalyzer; - - public function __construct(DeadReturnTagValueNodeAnalyzer $deadReturnTagValueNodeAnalyzer) - { - $this->deadReturnTagValueNodeAnalyzer = $deadReturnTagValueNodeAnalyzer; + public function __construct( + private DeadReturnTagValueNodeAnalyzer $deadReturnTagValueNodeAnalyzer + ) { } public function removeReturnTagIfUseless(PhpDocInfo $phpDocInfo, FunctionLike $functionLike): void diff --git a/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php index 9d8d859a3aa..f995128bf03 100644 --- a/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php +++ b/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php @@ -25,43 +25,13 @@ final class VarTagRemover { - /** - * @var DoctrineTypeAnalyzer - */ - private $doctrineTypeAnalyzer; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var ClassLikeExistenceChecker - */ - private $classLikeExistenceChecker; - - /** - * @var DeadVarTagValueNodeAnalyzer - */ - private $deadVarTagValueNodeAnalyzer; - public function __construct( - DoctrineTypeAnalyzer $doctrineTypeAnalyzer, - StaticTypeMapper $staticTypeMapper, - PhpDocInfoFactory $phpDocInfoFactory, - ClassLikeExistenceChecker $classLikeExistenceChecker, - DeadVarTagValueNodeAnalyzer $deadVarTagValueNodeAnalyzer + private DoctrineTypeAnalyzer $doctrineTypeAnalyzer, + private StaticTypeMapper $staticTypeMapper, + private PhpDocInfoFactory $phpDocInfoFactory, + private ClassLikeExistenceChecker $classLikeExistenceChecker, + private DeadVarTagValueNodeAnalyzer $deadVarTagValueNodeAnalyzer ) { - $this->doctrineTypeAnalyzer = $doctrineTypeAnalyzer; - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->classLikeExistenceChecker = $classLikeExistenceChecker; - $this->deadVarTagValueNodeAnalyzer = $deadVarTagValueNodeAnalyzer; } public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, Property $property): void diff --git a/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php index 5f7d1555bdd..34142e6b412 100644 --- a/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php +++ b/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php @@ -25,14 +25,9 @@ */ final class RemoveDoubleAssignRector extends AbstractRector { - /** - * @var ScopeNestingComparator - */ - private $scopeNestingComparator; - - public function __construct(ScopeNestingComparator $scopeNestingComparator) - { - $this->scopeNestingComparator = $scopeNestingComparator; + public function __construct( + private ScopeNestingComparator $scopeNestingComparator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php index 028f7c11b48..1f0df17ac55 100644 --- a/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php +++ b/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php @@ -22,36 +22,12 @@ */ final class RemoveUnusedAssignVariableRector extends AbstractRector { - /** - * @var SideEffectNodeDetector - */ - private $sideEffectNodeDetector; - - /** - * @var PreviousVariableAssignNodeFinder - */ - private $previousVariableAssignNodeFinder; - - /** - * @var ScopeNestingComparator - */ - private $scopeNestingComparator; - - /** - * @var NextVariableUsageNodeFinder - */ - private $nextVariableUsageNodeFinder; - public function __construct( - NextVariableUsageNodeFinder $nextVariableUsageNodeFinder, - PreviousVariableAssignNodeFinder $previousVariableAssignNodeFinder, - ScopeNestingComparator $scopeNestingComparator, - SideEffectNodeDetector $sideEffectNodeDetector + private NextVariableUsageNodeFinder $nextVariableUsageNodeFinder, + private PreviousVariableAssignNodeFinder $previousVariableAssignNodeFinder, + private ScopeNestingComparator $scopeNestingComparator, + private SideEffectNodeDetector $sideEffectNodeDetector ) { - $this->sideEffectNodeDetector = $sideEffectNodeDetector; - $this->previousVariableAssignNodeFinder = $previousVariableAssignNodeFinder; - $this->scopeNestingComparator = $scopeNestingComparator; - $this->nextVariableUsageNodeFinder = $nextVariableUsageNodeFinder; } /** diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php index 1bf17c9a795..24d5feb8c8a 100644 --- a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php +++ b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php @@ -31,36 +31,12 @@ */ final class RemoveUnusedVariableAssignRector extends AbstractRector { - /** - * @var ReservedKeywordAnalyzer - */ - private $reservedKeywordAnalyzer; - - /** - * @var CompactFuncCallAnalyzer - */ - private $compactFuncCallAnalyzer; - - /** - * @var ConditionSearcher - */ - private $conditionSearcher; - - /** - * @var UsedVariableNameAnalyzer - */ - private $usedVariableNameAnalyzer; - public function __construct( - ReservedKeywordAnalyzer $reservedKeywordAnalyzer, - CompactFuncCallAnalyzer $compactFuncCallAnalyzer, - ConditionSearcher $conditionSearcher, - UsedVariableNameAnalyzer $usedVariableNameAnalyzer + private ReservedKeywordAnalyzer $reservedKeywordAnalyzer, + private CompactFuncCallAnalyzer $compactFuncCallAnalyzer, + private ConditionSearcher $conditionSearcher, + private UsedVariableNameAnalyzer $usedVariableNameAnalyzer ) { - $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer; - $this->compactFuncCallAnalyzer = $compactFuncCallAnalyzer; - $this->conditionSearcher = $conditionSearcher; - $this->usedVariableNameAnalyzer = $usedVariableNameAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector.php b/rules/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector.php index 56a2371d7ab..72324c797d1 100644 --- a/rules/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector.php +++ b/rules/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector.php @@ -17,14 +17,9 @@ */ final class RemoveDuplicatedInstanceOfRector extends AbstractRector { - /** - * @var InstanceOfUniqueKeyResolver - */ - private $instanceOfUniqueKeyResolver; - - public function __construct(InstanceOfUniqueKeyResolver $instanceOfUniqueKeyResolver) - { - $this->instanceOfUniqueKeyResolver = $instanceOfUniqueKeyResolver; + public function __construct( + private InstanceOfUniqueKeyResolver $instanceOfUniqueKeyResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php b/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php index 9fb326d2b2d..11e854aaacf 100644 --- a/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php +++ b/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php @@ -22,14 +22,9 @@ */ final class RemoveUnusedPrivateClassConstantRector extends AbstractRector { - /** - * @var ClassConstManipulator - */ - private $classConstManipulator; - - public function __construct(ClassConstManipulator $classConstManipulator) - { - $this->classConstManipulator = $classConstManipulator; + public function __construct( + private ClassConstManipulator $classConstManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php b/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php index cb572c6765c..f7921ddc04e 100644 --- a/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php +++ b/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php @@ -33,14 +33,9 @@ final class RemoveAnnotationRector extends AbstractRector implements Configurabl */ private $annotationsToRemove = []; - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - - public function __construct(PhpDocTagRemover $phpDocTagRemover) - { - $this->phpDocTagRemover = $phpDocTagRemover; + public function __construct( + private PhpDocTagRemover $phpDocTagRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php index 80c02862bff..b0eeacb1dbc 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php @@ -19,14 +19,9 @@ */ final class RemoveDeadConstructorRector extends AbstractRector { - /** - * @var ClassMethodManipulator - */ - private $classMethodManipulator; - - public function __construct(ClassMethodManipulator $classMethodManipulator) - { - $this->classMethodManipulator = $classMethodManipulator; + public function __construct( + private ClassMethodManipulator $classMethodManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php index 955cca0b8f5..75626686120 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php @@ -22,14 +22,9 @@ */ final class RemoveDelegatingParentCallRector extends AbstractRector { - /** - * @var CurrentAndParentClassMethodComparator - */ - private $currentAndParentClassMethodComparator; - - public function __construct(CurrentAndParentClassMethodComparator $currentAndParentClassMethodComparator) - { - $this->currentAndParentClassMethodComparator = $currentAndParentClassMethodComparator; + public function __construct( + private CurrentAndParentClassMethodComparator $currentAndParentClassMethodComparator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php index 5d1884a79f3..94c90bf9607 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php @@ -19,22 +19,10 @@ */ final class RemoveEmptyClassMethodRector extends AbstractRector { - /** - * @var ClassMethodManipulator - */ - private $classMethodManipulator; - - /** - * @var ControllerClassMethodManipulator - */ - private $controllerClassMethodManipulator; - public function __construct( - ClassMethodManipulator $classMethodManipulator, - ControllerClassMethodManipulator $controllerClassMethodManipulator + private ClassMethodManipulator $classMethodManipulator, + private ControllerClassMethodManipulator $controllerClassMethodManipulator ) { - $this->classMethodManipulator = $classMethodManipulator; - $this->controllerClassMethodManipulator = $controllerClassMethodManipulator; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php index f65d7effa4f..e197f4034ab 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php @@ -19,14 +19,9 @@ */ final class RemoveUnusedConstructorParamRector extends AbstractRector { - /** - * @var ParamAnalyzer - */ - private $paramAnalyzer; - - public function __construct(ParamAnalyzer $paramAnalyzer) - { - $this->paramAnalyzer = $paramAnalyzer; + public function __construct( + private ParamAnalyzer $paramAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php index 666a97c3a8a..ff4f7a537c0 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php @@ -21,29 +21,11 @@ */ final class RemoveUnusedPrivateMethodParameterRector extends AbstractRector { - /** - * @var VariadicFunctionLikeDetector - */ - private $variadicFunctionLikeDetector; - - /** - * @var UnusedParameterResolver - */ - private $unusedParameterResolver; - - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - public function __construct( - VariadicFunctionLikeDetector $variadicFunctionLikeDetector, - UnusedParameterResolver $unusedParameterResolver, - PhpDocTagRemover $phpDocTagRemover + private VariadicFunctionLikeDetector $variadicFunctionLikeDetector, + private UnusedParameterResolver $unusedParameterResolver, + private PhpDocTagRemover $phpDocTagRemover ) { - $this->variadicFunctionLikeDetector = $variadicFunctionLikeDetector; - $this->unusedParameterResolver = $unusedParameterResolver; - $this->phpDocTagRemover = $phpDocTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php index 54de5d5bc8d..bb4d91f4e7e 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php @@ -18,22 +18,10 @@ */ final class RemoveUselessParamTagRector extends AbstractRector { - /** - * @var DeadParamTagValueNodeAnalyzer - */ - private $deadParamTagValueNodeAnalyzer; - - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - public function __construct( - DeadParamTagValueNodeAnalyzer $deadParamTagValueNodeAnalyzer, - PhpDocTagRemover $phpDocTagRemover + private DeadParamTagValueNodeAnalyzer $deadParamTagValueNodeAnalyzer, + private PhpDocTagRemover $phpDocTagRemover ) { - $this->deadParamTagValueNodeAnalyzer = $deadParamTagValueNodeAnalyzer; - $this->phpDocTagRemover = $phpDocTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php index fa22a5dc51d..578e3189ecb 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php @@ -17,14 +17,9 @@ */ final class RemoveUselessReturnTagRector extends AbstractRector { - /** - * @var ReturnTagRemover - */ - private $returnTagRemover; - - public function __construct(ReturnTagRemover $returnTagRemover) - { - $this->returnTagRemover = $returnTagRemover; + public function __construct( + private ReturnTagRemover $returnTagRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php b/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php index fc4010105c3..5535032cb45 100644 --- a/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php +++ b/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php @@ -18,14 +18,9 @@ */ final class RemoveDeadStmtRector extends AbstractRector { - /** - * @var LivingCodeManipulator - */ - private $livingCodeManipulator; - - public function __construct(LivingCodeManipulator $livingCodeManipulator) - { - $this->livingCodeManipulator = $livingCodeManipulator; + public function __construct( + private LivingCodeManipulator $livingCodeManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php b/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php index 421cb0dbfd8..b5844dc659e 100644 --- a/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php +++ b/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php @@ -25,23 +25,11 @@ */ final class RemoveDuplicatedIfReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var ModifiedVariableNamesCollector - */ - private $modifiedVariableNamesCollector; - public function __construct( - IfManipulator $ifManipulator, - ModifiedVariableNamesCollector $modifiedVariableNamesCollector, + private IfManipulator $ifManipulator, + private ModifiedVariableNamesCollector $modifiedVariableNamesCollector, NodeComparator $nodeComparator ) { - $this->ifManipulator = $ifManipulator; - $this->modifiedVariableNamesCollector = $modifiedVariableNamesCollector; $this->nodeComparator = $nodeComparator; } diff --git a/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php b/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php index e7caea737d8..3eb9efaf3c8 100644 --- a/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php +++ b/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php @@ -22,29 +22,11 @@ */ final class RemoveOverriddenValuesRector extends AbstractRector { - /** - * @var ContextAnalyzer - */ - private $contextAnalyzer; - - /** - * @var NodeByTypeAndPositionCollector - */ - private $nodeByTypeAndPositionCollector; - - /** - * @var VariableUseFinder - */ - private $variableUseFinder; - public function __construct( - ContextAnalyzer $contextAnalyzer, - NodeByTypeAndPositionCollector $nodeByTypeAndPositionCollector, - VariableUseFinder $variableUseFinder + private ContextAnalyzer $contextAnalyzer, + private NodeByTypeAndPositionCollector $nodeByTypeAndPositionCollector, + private VariableUseFinder $variableUseFinder ) { - $this->contextAnalyzer = $contextAnalyzer; - $this->nodeByTypeAndPositionCollector = $nodeByTypeAndPositionCollector; - $this->variableUseFinder = $variableUseFinder; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php index db564a0ac4e..ca31e6af339 100644 --- a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php +++ b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php @@ -20,14 +20,9 @@ */ final class RemoveDeadInstanceOfRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php index 24d15dfe57a..66e82b25dd7 100644 --- a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php +++ b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php @@ -19,29 +19,11 @@ */ final class RemoveUnusedNonEmptyArrayBeforeForeachRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var UselessIfCondBeforeForeachDetector - */ - private $uselessIfCondBeforeForeachDetector; - - /** - * @var CountManipulator - */ - private $countManipulator; - public function __construct( - CountManipulator $countManipulator, - IfManipulator $ifManipulator, - UselessIfCondBeforeForeachDetector $uselessIfCondBeforeForeachDetector + private CountManipulator $countManipulator, + private IfManipulator $ifManipulator, + private UselessIfCondBeforeForeachDetector $uselessIfCondBeforeForeachDetector ) { - $this->ifManipulator = $ifManipulator; - $this->uselessIfCondBeforeForeachDetector = $uselessIfCondBeforeForeachDetector; - $this->countManipulator = $countManipulator; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector.php b/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector.php index 76dace95947..3805408e66a 100644 --- a/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector.php +++ b/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector.php @@ -21,20 +21,10 @@ */ final class UnwrapFutureCompatibleIfFunctionExistsRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var FunctionSupportResolver - */ - private $functionSupportResolver; - - public function __construct(FunctionSupportResolver $functionSupportResolver, IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; - $this->functionSupportResolver = $functionSupportResolver; + public function __construct( + private FunctionSupportResolver $functionSupportResolver, + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php b/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php index 48bc4d8e848..50126b33b9d 100644 --- a/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php +++ b/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php @@ -20,20 +20,10 @@ */ final class UnwrapFutureCompatibleIfPhpVersionRector extends AbstractRector { - /** - * @var ConditionEvaluator - */ - private $conditionEvaluator; - - /** - * @var ConditionResolver - */ - private $conditionResolver; - - public function __construct(ConditionEvaluator $conditionEvaluator, ConditionResolver $conditionResolver) - { - $this->conditionEvaluator = $conditionEvaluator; - $this->conditionResolver = $conditionResolver; + public function __construct( + private ConditionEvaluator $conditionEvaluator, + private ConditionResolver $conditionResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php b/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php index 2b7a496ae0c..cc3321c37e2 100644 --- a/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php +++ b/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php @@ -27,14 +27,9 @@ */ final class RemoveEmptyMethodCallRector extends AbstractRector { - /** - * @var ClassReflectionToAstResolver - */ - private $classReflectionToAstResolver; - - public function __construct(ClassReflectionToAstResolver $classReflectionToAstResolver) - { - $this->classReflectionToAstResolver = $classReflectionToAstResolver; + public function __construct( + private ClassReflectionToAstResolver $classReflectionToAstResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php b/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php index 5711bd55b5f..b70490b33d1 100644 --- a/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php +++ b/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php @@ -51,20 +51,10 @@ final class RemoveNonExistingVarAnnotationRector extends AbstractRector Nop::class, ]; - /** - * @var TypeChecker - */ - private $typeChecker; - - /** - * @var CommentRemover - */ - private $commentRemover; - - public function __construct(TypeChecker $typeChecker, CommentRemover $commentRemover) - { - $this->typeChecker = $typeChecker; - $this->commentRemover = $commentRemover; + public function __construct( + private TypeChecker $typeChecker, + private CommentRemover $commentRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Property/RemoveSetterOnlyPropertyAndMethodCallRector.php b/rules/DeadCode/Rector/Property/RemoveSetterOnlyPropertyAndMethodCallRector.php index 016397c9d52..121d1a8167b 100644 --- a/rules/DeadCode/Rector/Property/RemoveSetterOnlyPropertyAndMethodCallRector.php +++ b/rules/DeadCode/Rector/Property/RemoveSetterOnlyPropertyAndMethodCallRector.php @@ -28,36 +28,12 @@ */ final class RemoveSetterOnlyPropertyAndMethodCallRector extends AbstractRector { - /** - * @var PropertyManipulator - */ - private $propertyManipulator; - - /** - * @var VendorLockResolver - */ - private $vendorLockResolver; - - /** - * @var PropertyFetchFinder - */ - private $propertyFetchFinder; - - /** - * @var ComplexNodeRemover - */ - private $complexNodeRemover; - public function __construct( - PropertyManipulator $propertyManipulator, - VendorLockResolver $vendorLockResolver, - PropertyFetchFinder $propertyFetchFinder, - ComplexNodeRemover $complexNodeRemover + private PropertyManipulator $propertyManipulator, + private VendorLockResolver $vendorLockResolver, + private PropertyFetchFinder $propertyFetchFinder, + private ComplexNodeRemover $complexNodeRemover ) { - $this->propertyManipulator = $propertyManipulator; - $this->vendorLockResolver = $vendorLockResolver; - $this->propertyFetchFinder = $propertyFetchFinder; - $this->complexNodeRemover = $complexNodeRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php b/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php index a3e024c53cc..44ff00582fa 100644 --- a/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php +++ b/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php @@ -21,20 +21,10 @@ */ final class RemoveUnusedPrivatePropertyRector extends AbstractRector { - /** - * @var PropertyManipulator - */ - private $propertyManipulator; - - /** - * @var ComplexNodeRemover - */ - private $complexNodeRemover; - - public function __construct(PropertyManipulator $propertyManipulator, ComplexNodeRemover $complexNodeRemover) - { - $this->propertyManipulator = $propertyManipulator; - $this->complexNodeRemover = $complexNodeRemover; + public function __construct( + private PropertyManipulator $propertyManipulator, + private ComplexNodeRemover $complexNodeRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php b/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php index cdecf1970bd..bce2bacab7d 100644 --- a/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php +++ b/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php @@ -17,14 +17,9 @@ */ final class RemoveUselessVarTagRector extends AbstractRector { - /** - * @var VarTagRemover - */ - private $varTagRemover; - - public function __construct(VarTagRemover $varTagRemover) - { - $this->varTagRemover = $varTagRemover; + public function __construct( + private VarTagRemover $varTagRemover + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector.php b/rules/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector.php index 69bd2a1d6a0..266df8360e6 100644 --- a/rules/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector.php +++ b/rules/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector.php @@ -22,29 +22,11 @@ */ final class RemoveParentCallWithoutParentRector extends AbstractRector { - /** - * @var ClassMethodManipulator - */ - private $classMethodManipulator; - - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - ClassMethodManipulator $classMethodManipulator, - ParentClassScopeResolver $parentClassScopeResolver, - ClassAnalyzer $classAnalyzer + private ClassMethodManipulator $classMethodManipulator, + private ParentClassScopeResolver $parentClassScopeResolver, + private ClassAnalyzer $classAnalyzer ) { - $this->classMethodManipulator = $classMethodManipulator; - $this->parentClassScopeResolver = $parentClassScopeResolver; - $this->classAnalyzer = $classAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DeadCode/SideEffect/PureFunctionDetector.php b/rules/DeadCode/SideEffect/PureFunctionDetector.php index 0b7de4da76a..5ea0877a236 100644 --- a/rules/DeadCode/SideEffect/PureFunctionDetector.php +++ b/rules/DeadCode/SideEffect/PureFunctionDetector.php @@ -108,14 +108,9 @@ final class PureFunctionDetector 'json_encode', 'json_decode', 'json_last_error', ]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function detect(FuncCall $funcCall): bool diff --git a/rules/DeadCode/SideEffect/SideEffectNodeDetector.php b/rules/DeadCode/SideEffect/SideEffectNodeDetector.php index b36f413234f..5312d2b70b0 100644 --- a/rules/DeadCode/SideEffect/SideEffectNodeDetector.php +++ b/rules/DeadCode/SideEffect/SideEffectNodeDetector.php @@ -23,20 +23,10 @@ final class SideEffectNodeDetector */ private const SIDE_EFFECT_NODE_TYPES = [Encapsed::class, New_::class, Concat::class, PropertyFetch::class]; - /** - * @var PureFunctionDetector - */ - private $pureFunctionDetector; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver, PureFunctionDetector $pureFunctionDetector) - { - $this->pureFunctionDetector = $pureFunctionDetector; - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private PureFunctionDetector $pureFunctionDetector + ) { } public function detect(Expr $expr): bool diff --git a/rules/DeadCode/UselessIfCondBeforeForeachDetector.php b/rules/DeadCode/UselessIfCondBeforeForeachDetector.php index 218f9a3a1b0..dc7542ebea1 100644 --- a/rules/DeadCode/UselessIfCondBeforeForeachDetector.php +++ b/rules/DeadCode/UselessIfCondBeforeForeachDetector.php @@ -18,20 +18,10 @@ final class UselessIfCondBeforeForeachDetector { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - public function __construct(NodeTypeResolver $nodeTypeResolver, NodeComparator $nodeComparator) - { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeComparator = $nodeComparator; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private NodeComparator $nodeComparator + ) { } /** diff --git a/rules/DeadCode/ValueObject/BinaryToVersionCompareCondition.php b/rules/DeadCode/ValueObject/BinaryToVersionCompareCondition.php index 0672abac6a0..479187301e3 100644 --- a/rules/DeadCode/ValueObject/BinaryToVersionCompareCondition.php +++ b/rules/DeadCode/ValueObject/BinaryToVersionCompareCondition.php @@ -8,32 +8,14 @@ final class BinaryToVersionCompareCondition implements ConditionInterface { - /** - * @var string - */ - private $binaryClass; - - /** - * @var VersionCompareCondition - */ - private $versionCompareCondition; - - /** - * @var mixed - */ - private $expectedValue; - /** * @param mixed $expectedValue */ public function __construct( - VersionCompareCondition $versionCompareCondition, - string $binaryClass, - $expectedValue + private VersionCompareCondition $versionCompareCondition, + private string $binaryClass, + private $expectedValue ) { - $this->versionCompareCondition = $versionCompareCondition; - $this->binaryClass = $binaryClass; - $this->expectedValue = $expectedValue; } public function getVersionCompareCondition(): VersionCompareCondition diff --git a/rules/DeadCode/ValueObject/VariableNodeUse.php b/rules/DeadCode/ValueObject/VariableNodeUse.php index cf6ab95fe2f..3a3ecf07cef 100644 --- a/rules/DeadCode/ValueObject/VariableNodeUse.php +++ b/rules/DeadCode/ValueObject/VariableNodeUse.php @@ -21,43 +21,13 @@ final class VariableNodeUse */ public const TYPE_ASSIGN = 'assign'; - /** - * @var int - */ - private $startTokenPosition; - - /** - * @var string - */ - private $variableName; - - /** - * @var string - */ - private $type; - - /** - * @var Variable - */ - private $variable; - - /** - * @var string|null - */ - private $nestingHash; - public function __construct( - int $startTokenPosition, - string $variableName, - string $type, - Variable $variable, - ?string $nestingHash = null + private int $startTokenPosition, + private string $variableName, + private string $type, + private Variable $variable, + private ?string $nestingHash = null ) { - $this->startTokenPosition = $startTokenPosition; - $this->variableName = $variableName; - $this->type = $type; - $this->variable = $variable; - $this->nestingHash = $nestingHash; } public function isName(string $name): bool diff --git a/rules/DeadCode/ValueObject/VersionCompareCondition.php b/rules/DeadCode/ValueObject/VersionCompareCondition.php index a97a260d7d5..d61c19870ee 100644 --- a/rules/DeadCode/ValueObject/VersionCompareCondition.php +++ b/rules/DeadCode/ValueObject/VersionCompareCondition.php @@ -8,26 +8,11 @@ final class VersionCompareCondition implements ConditionInterface { - /** - * @var int - */ - private $firstVersion; - - /** - * @var int - */ - private $secondVersion; - - /** - * @var string|null - */ - private $compareSign; - - public function __construct(int $firstVersion, int $secondVersion, ?string $compareSign) - { - $this->firstVersion = $firstVersion; - $this->secondVersion = $secondVersion; - $this->compareSign = $compareSign; + public function __construct( + private int $firstVersion, + private int $secondVersion, + private ?string $compareSign + ) { } public function getFirstVersion(): int diff --git a/rules/Defluent/ConflictGuard/ParentClassMethodTypeOverrideGuard.php b/rules/Defluent/ConflictGuard/ParentClassMethodTypeOverrideGuard.php index 60719e56efa..0568f45021b 100644 --- a/rules/Defluent/ConflictGuard/ParentClassMethodTypeOverrideGuard.php +++ b/rules/Defluent/ConflictGuard/ParentClassMethodTypeOverrideGuard.php @@ -14,20 +14,10 @@ final class ParentClassMethodTypeOverrideGuard { - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeRepository $nodeRepository, NodeNameResolver $nodeNameResolver) - { - $this->nodeRepository = $nodeRepository; - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeRepository $nodeRepository, + private NodeNameResolver $nodeNameResolver + ) { } public function hasParentMethodOutsideVendor(ClassMethod $classMethod): bool diff --git a/rules/Defluent/Matcher/AssignAndRootExprAndNodesToAddMatcher.php b/rules/Defluent/Matcher/AssignAndRootExprAndNodesToAddMatcher.php index f835a642bda..df808ec7e6f 100644 --- a/rules/Defluent/Matcher/AssignAndRootExprAndNodesToAddMatcher.php +++ b/rules/Defluent/Matcher/AssignAndRootExprAndNodesToAddMatcher.php @@ -15,43 +15,13 @@ final class AssignAndRootExprAndNodesToAddMatcher { - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - /** - * @var NonFluentChainMethodCallFactory - */ - private $nonFluentChainMethodCallFactory; - - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - - /** - * @var FluentChainMethodCallRootExtractor - */ - private $fluentChainMethodCallRootExtractor; - - /** - * @var SameClassMethodCallAnalyzer - */ - private $sameClassMethodCallAnalyzer; - public function __construct( - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, - FluentChainMethodCallRootExtractor $fluentChainMethodCallRootExtractor, - NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory, - SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer, - FluentMethodCallSkipper $fluentMethodCallSkipper + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, + private FluentChainMethodCallRootExtractor $fluentChainMethodCallRootExtractor, + private NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory, + private SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer, + private FluentMethodCallSkipper $fluentMethodCallSkipper ) { - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; - $this->fluentChainMethodCallRootExtractor = $fluentChainMethodCallRootExtractor; - $this->nonFluentChainMethodCallFactory = $nonFluentChainMethodCallFactory; - $this->sameClassMethodCallAnalyzer = $sameClassMethodCallAnalyzer; - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; } public function match(MethodCall $methodCall, string $kind): ?AssignAndRootExprAndNodesToAdd diff --git a/rules/Defluent/NodeAnalyzer/ExprStringTypeResolver.php b/rules/Defluent/NodeAnalyzer/ExprStringTypeResolver.php index ae919b79186..c048c5e4598 100644 --- a/rules/Defluent/NodeAnalyzer/ExprStringTypeResolver.php +++ b/rules/Defluent/NodeAnalyzer/ExprStringTypeResolver.php @@ -12,20 +12,10 @@ final class ExprStringTypeResolver { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - public function __construct(NodeTypeResolver $nodeTypeResolver, TypeUnwrapper $typeUnwrapper) - { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeUnwrapper = $typeUnwrapper; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private TypeUnwrapper $typeUnwrapper + ) { } public function resolve(Expr $expr): ?string diff --git a/rules/Defluent/NodeAnalyzer/FluentCallStaticTypeResolver.php b/rules/Defluent/NodeAnalyzer/FluentCallStaticTypeResolver.php index e06e1b6562b..ea1ef7f1431 100644 --- a/rules/Defluent/NodeAnalyzer/FluentCallStaticTypeResolver.php +++ b/rules/Defluent/NodeAnalyzer/FluentCallStaticTypeResolver.php @@ -9,20 +9,10 @@ final class FluentCallStaticTypeResolver { - /** - * @var ExprStringTypeResolver - */ - private $exprStringTypeResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ExprStringTypeResolver $exprStringTypeResolver, ReflectionProvider $reflectionProvider) - { - $this->exprStringTypeResolver = $exprStringTypeResolver; - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ExprStringTypeResolver $exprStringTypeResolver, + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/rules/Defluent/NodeAnalyzer/FluentChainMethodCallNodeAnalyzer.php b/rules/Defluent/NodeAnalyzer/FluentChainMethodCallNodeAnalyzer.php index 6bdf0665a46..3d8460554fd 100644 --- a/rules/Defluent/NodeAnalyzer/FluentChainMethodCallNodeAnalyzer.php +++ b/rules/Defluent/NodeAnalyzer/FluentChainMethodCallNodeAnalyzer.php @@ -35,36 +35,12 @@ final class FluentChainMethodCallNodeAnalyzer */ private const KNOWN_FACTORY_FLUENT_TYPES = ['PHPStan\Analyser\MutatingScope']; - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeFinder - */ - private $nodeFinder; - - /** - * @var MethodCallToClassMethodParser - */ - private $methodCallToClassMethodParser; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - NodeFinder $nodeFinder, - MethodCallToClassMethodParser $methodCallToClassMethodParser + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private NodeFinder $nodeFinder, + private MethodCallToClassMethodParser $methodCallToClassMethodParser ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeFinder = $nodeFinder; - $this->methodCallToClassMethodParser = $methodCallToClassMethodParser; } /** diff --git a/rules/Defluent/NodeAnalyzer/FluentChainMethodCallRootExtractor.php b/rules/Defluent/NodeAnalyzer/FluentChainMethodCallRootExtractor.php index 784f8a156a2..b85b011c577 100644 --- a/rules/Defluent/NodeAnalyzer/FluentChainMethodCallRootExtractor.php +++ b/rules/Defluent/NodeAnalyzer/FluentChainMethodCallRootExtractor.php @@ -28,50 +28,14 @@ */ final class FluentChainMethodCallRootExtractor { - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var VariableNaming - */ - private $variableNaming; - - /** - * @var ExprStringTypeResolver - */ - private $exprStringTypeResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - PropertyNaming $propertyNaming, - VariableNaming $variableNaming, - ExprStringTypeResolver $exprStringTypeResolver, - NodeTypeResolver $nodeTypeResolver + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private PropertyNaming $propertyNaming, + private VariableNaming $variableNaming, + private ExprStringTypeResolver $exprStringTypeResolver, + private NodeTypeResolver $nodeTypeResolver ) { - $this->propertyNaming = $propertyNaming; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->variableNaming = $variableNaming; - $this->exprStringTypeResolver = $exprStringTypeResolver; - $this->nodeTypeResolver = $nodeTypeResolver; } /** diff --git a/rules/Defluent/NodeAnalyzer/GetterMethodCallAnalyzer.php b/rules/Defluent/NodeAnalyzer/GetterMethodCallAnalyzer.php index 20e819587c8..265b5583a1e 100644 --- a/rules/Defluent/NodeAnalyzer/GetterMethodCallAnalyzer.php +++ b/rules/Defluent/NodeAnalyzer/GetterMethodCallAnalyzer.php @@ -9,14 +9,9 @@ final class GetterMethodCallAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function isGetterMethodCall(MethodCall $methodCall): bool diff --git a/rules/Defluent/NodeAnalyzer/MethodCallSkipAnalyzer.php b/rules/Defluent/NodeAnalyzer/MethodCallSkipAnalyzer.php index 102e1175039..e34a4e1d5d4 100644 --- a/rules/Defluent/NodeAnalyzer/MethodCallSkipAnalyzer.php +++ b/rules/Defluent/NodeAnalyzer/MethodCallSkipAnalyzer.php @@ -10,22 +10,10 @@ final class MethodCallSkipAnalyzer { - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - public function __construct( - FluentMethodCallSkipper $fluentMethodCallSkipper, - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer + private FluentMethodCallSkipper $fluentMethodCallSkipper, + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer ) { - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; } public function shouldSkipMethodCallIncludingNew(MethodCall $methodCall): bool diff --git a/rules/Defluent/NodeAnalyzer/NewFluentChainMethodCallNodeAnalyzer.php b/rules/Defluent/NodeAnalyzer/NewFluentChainMethodCallNodeAnalyzer.php index 28b86fda7fb..abdfbf8b238 100644 --- a/rules/Defluent/NodeAnalyzer/NewFluentChainMethodCallNodeAnalyzer.php +++ b/rules/Defluent/NodeAnalyzer/NewFluentChainMethodCallNodeAnalyzer.php @@ -11,14 +11,9 @@ final class NewFluentChainMethodCallNodeAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function isNewMethodCallReturningSelf(MethodCall $methodCall): bool diff --git a/rules/Defluent/NodeAnalyzer/SameClassMethodCallAnalyzer.php b/rules/Defluent/NodeAnalyzer/SameClassMethodCallAnalyzer.php index e3ba551e599..6fd884e5c3b 100644 --- a/rules/Defluent/NodeAnalyzer/SameClassMethodCallAnalyzer.php +++ b/rules/Defluent/NodeAnalyzer/SameClassMethodCallAnalyzer.php @@ -12,14 +12,9 @@ final class SameClassMethodCallAnalyzer { - /** - * @var NodeRepository - */ - private $nodeRepository; - - public function __construct(NodeRepository $nodeRepository) - { - $this->nodeRepository = $nodeRepository; + public function __construct( + private NodeRepository $nodeRepository + ) { } /** diff --git a/rules/Defluent/NodeFactory/NonFluentChainMethodCallFactory.php b/rules/Defluent/NodeFactory/NonFluentChainMethodCallFactory.php index 8b93a70f6f2..dd15f76d7e4 100644 --- a/rules/Defluent/NodeFactory/NonFluentChainMethodCallFactory.php +++ b/rules/Defluent/NodeFactory/NonFluentChainMethodCallFactory.php @@ -19,29 +19,11 @@ final class NonFluentChainMethodCallFactory { - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - /** - * @var VariableNaming - */ - private $variableNaming; - - /** - * @var FirstMethodCallVarResolver - */ - private $firstMethodCallVarResolver; - public function __construct( - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, - VariableNaming $variableNaming, - FirstMethodCallVarResolver $firstMethodCallVarResolver + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, + private VariableNaming $variableNaming, + private FirstMethodCallVarResolver $firstMethodCallVarResolver ) { - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; - $this->variableNaming = $variableNaming; - $this->firstMethodCallVarResolver = $firstMethodCallVarResolver; } /** diff --git a/rules/Defluent/NodeFactory/ReturnFluentMethodCallFactory.php b/rules/Defluent/NodeFactory/ReturnFluentMethodCallFactory.php index 3c6736df5e0..c406c850846 100644 --- a/rules/Defluent/NodeFactory/ReturnFluentMethodCallFactory.php +++ b/rules/Defluent/NodeFactory/ReturnFluentMethodCallFactory.php @@ -16,29 +16,11 @@ final class ReturnFluentMethodCallFactory { - /** - * @var FluentChainMethodCallRootExtractor - */ - private $fluentChainMethodCallRootExtractor; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - public function __construct( - FluentChainMethodCallRootExtractor $fluentChainMethodCallRootExtractor, - NodeTypeResolver $nodeTypeResolver, - PropertyNaming $propertyNaming + private FluentChainMethodCallRootExtractor $fluentChainMethodCallRootExtractor, + private NodeTypeResolver $nodeTypeResolver, + private PropertyNaming $propertyNaming ) { - $this->fluentChainMethodCallRootExtractor = $fluentChainMethodCallRootExtractor; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->propertyNaming = $propertyNaming; } public function createFromFluentMethodCalls(FluentMethodCalls $fluentMethodCalls): ?FirstAssignFluentCall diff --git a/rules/Defluent/NodeFactory/SeparateReturnMethodCallFactory.php b/rules/Defluent/NodeFactory/SeparateReturnMethodCallFactory.php index 789c8326d86..6431aa6c48a 100644 --- a/rules/Defluent/NodeFactory/SeparateReturnMethodCallFactory.php +++ b/rules/Defluent/NodeFactory/SeparateReturnMethodCallFactory.php @@ -14,14 +14,9 @@ final class SeparateReturnMethodCallFactory { - /** - * @var FirstMethodCallVarResolver - */ - private $firstMethodCallVarResolver; - - public function __construct(FirstMethodCallVarResolver $firstMethodCallVarResolver) - { - $this->firstMethodCallVarResolver = $firstMethodCallVarResolver; + public function __construct( + private FirstMethodCallVarResolver $firstMethodCallVarResolver + ) { } /** diff --git a/rules/Defluent/NodeFactory/VariableFromNewFactory.php b/rules/Defluent/NodeFactory/VariableFromNewFactory.php index a051fe89a76..3fec9e149ad 100644 --- a/rules/Defluent/NodeFactory/VariableFromNewFactory.php +++ b/rules/Defluent/NodeFactory/VariableFromNewFactory.php @@ -11,14 +11,9 @@ final class VariableFromNewFactory { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function create(New_ $new): Variable diff --git a/rules/Defluent/Rector/ClassMethod/ReturnThisRemoveRector.php b/rules/Defluent/Rector/ClassMethod/ReturnThisRemoveRector.php index 8837195b75c..7b1a7748ab3 100644 --- a/rules/Defluent/Rector/ClassMethod/ReturnThisRemoveRector.php +++ b/rules/Defluent/Rector/ClassMethod/ReturnThisRemoveRector.php @@ -23,14 +23,9 @@ */ final class ReturnThisRemoveRector extends AbstractRector { - /** - * @var ParentClassMethodTypeOverrideGuard - */ - private $parentClassMethodTypeOverrideGuard; - - public function __construct(ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard) - { - $this->parentClassMethodTypeOverrideGuard = $parentClassMethodTypeOverrideGuard; + public function __construct( + private ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/MethodCall/FluentChainMethodCallToNormalMethodCallRector.php b/rules/Defluent/Rector/MethodCall/FluentChainMethodCallToNormalMethodCallRector.php index 360f71d9b90..4e6d43c92a7 100644 --- a/rules/Defluent/Rector/MethodCall/FluentChainMethodCallToNormalMethodCallRector.php +++ b/rules/Defluent/Rector/MethodCall/FluentChainMethodCallToNormalMethodCallRector.php @@ -26,29 +26,11 @@ */ final class FluentChainMethodCallToNormalMethodCallRector extends AbstractRector { - /** - * @var FluentNodeRemover - */ - private $fluentNodeRemover; - - /** - * @var MethodCallSkipAnalyzer - */ - private $methodCallSkipAnalyzer; - - /** - * @var AssignAndRootExprAndNodesToAddMatcher - */ - private $assignAndRootExprAndNodesToAddMatcher; - public function __construct( - FluentNodeRemover $fluentNodeRemover, - MethodCallSkipAnalyzer $methodCallSkipAnalyzer, - AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher + private FluentNodeRemover $fluentNodeRemover, + private MethodCallSkipAnalyzer $methodCallSkipAnalyzer, + private AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher ) { - $this->fluentNodeRemover = $fluentNodeRemover; - $this->methodCallSkipAnalyzer = $methodCallSkipAnalyzer; - $this->assignAndRootExprAndNodesToAddMatcher = $assignAndRootExprAndNodesToAddMatcher; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/MethodCall/InArgFluentChainMethodCallToStandaloneMethodCallRector.php b/rules/Defluent/Rector/MethodCall/InArgFluentChainMethodCallToStandaloneMethodCallRector.php index a34070f772f..1ac3ead8b2b 100644 --- a/rules/Defluent/Rector/MethodCall/InArgFluentChainMethodCallToStandaloneMethodCallRector.php +++ b/rules/Defluent/Rector/MethodCall/InArgFluentChainMethodCallToStandaloneMethodCallRector.php @@ -26,50 +26,14 @@ */ final class InArgFluentChainMethodCallToStandaloneMethodCallRector extends AbstractRector { - /** - * @var NewFluentChainMethodCallNodeAnalyzer - */ - private $newFluentChainMethodCallNodeAnalyzer; - - /** - * @var VariableFromNewFactory - */ - private $variableFromNewFactory; - - /** - * @var FluentMethodCallAsArgFactory - */ - private $fluentMethodCallAsArgFactory; - - /** - * @var AssignAndRootExprAndNodesToAddMatcher - */ - private $assignAndRootExprAndNodesToAddMatcher; - - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - /** - * @var NonFluentChainMethodCallFactory - */ - private $nonFluentChainMethodCallFactory; - public function __construct( - NewFluentChainMethodCallNodeAnalyzer $newFluentChainMethodCallNodeAnalyzer, - VariableFromNewFactory $variableFromNewFactory, - FluentMethodCallAsArgFactory $fluentMethodCallAsArgFactory, - AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, - NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory + private NewFluentChainMethodCallNodeAnalyzer $newFluentChainMethodCallNodeAnalyzer, + private VariableFromNewFactory $variableFromNewFactory, + private FluentMethodCallAsArgFactory $fluentMethodCallAsArgFactory, + private AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, + private NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory ) { - $this->newFluentChainMethodCallNodeAnalyzer = $newFluentChainMethodCallNodeAnalyzer; - $this->variableFromNewFactory = $variableFromNewFactory; - $this->fluentMethodCallAsArgFactory = $fluentMethodCallAsArgFactory; - $this->assignAndRootExprAndNodesToAddMatcher = $assignAndRootExprAndNodesToAddMatcher; - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; - $this->nonFluentChainMethodCallFactory = $nonFluentChainMethodCallFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/MethodCall/MethodCallOnSetterMethodCallToStandaloneAssignRector.php b/rules/Defluent/Rector/MethodCall/MethodCallOnSetterMethodCallToStandaloneAssignRector.php index 76fb71e28bf..ee67c7bcb88 100644 --- a/rules/Defluent/Rector/MethodCall/MethodCallOnSetterMethodCallToStandaloneAssignRector.php +++ b/rules/Defluent/Rector/MethodCall/MethodCallOnSetterMethodCallToStandaloneAssignRector.php @@ -23,43 +23,13 @@ */ final class MethodCallOnSetterMethodCallToStandaloneAssignRector extends AbstractRector { - /** - * @var NewFluentChainMethodCallNodeAnalyzer - */ - private $newFluentChainMethodCallNodeAnalyzer; - - /** - * @var VariableFromNewFactory - */ - private $variableFromNewFactory; - - /** - * @var NonFluentChainMethodCallFactory - */ - private $nonFluentChainMethodCallFactory; - - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - public function __construct( - NewFluentChainMethodCallNodeAnalyzer $newFluentChainMethodCallNodeAnalyzer, - VariableFromNewFactory $variableFromNewFactory, - NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory, - FluentMethodCallSkipper $fluentMethodCallSkipper, - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer + private NewFluentChainMethodCallNodeAnalyzer $newFluentChainMethodCallNodeAnalyzer, + private VariableFromNewFactory $variableFromNewFactory, + private NonFluentChainMethodCallFactory $nonFluentChainMethodCallFactory, + private FluentMethodCallSkipper $fluentMethodCallSkipper, + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer ) { - $this->newFluentChainMethodCallNodeAnalyzer = $newFluentChainMethodCallNodeAnalyzer; - $this->variableFromNewFactory = $variableFromNewFactory; - $this->nonFluentChainMethodCallFactory = $nonFluentChainMethodCallFactory; - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/MethodCall/NewFluentChainMethodCallToNonFluentRector.php b/rules/Defluent/Rector/MethodCall/NewFluentChainMethodCallToNonFluentRector.php index aa7b85590cd..ec7ef7f1cc7 100644 --- a/rules/Defluent/Rector/MethodCall/NewFluentChainMethodCallToNonFluentRector.php +++ b/rules/Defluent/Rector/MethodCall/NewFluentChainMethodCallToNonFluentRector.php @@ -27,36 +27,12 @@ */ final class NewFluentChainMethodCallToNonFluentRector extends AbstractRector { - /** - * @var TypeChecker - */ - private $typeChecker; - - /** - * @var FluentNodeRemover - */ - private $fluentNodeRemover; - - /** - * @var AssignAndRootExprAndNodesToAddMatcher - */ - private $assignAndRootExprAndNodesToAddMatcher; - - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - public function __construct( - TypeChecker $typeChecker, - FluentNodeRemover $fluentNodeRemover, - AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, - FluentMethodCallSkipper $fluentMethodCallSkipper + private TypeChecker $typeChecker, + private FluentNodeRemover $fluentNodeRemover, + private AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, + private FluentMethodCallSkipper $fluentMethodCallSkipper ) { - $this->typeChecker = $typeChecker; - $this->fluentNodeRemover = $fluentNodeRemover; - $this->assignAndRootExprAndNodesToAddMatcher = $assignAndRootExprAndNodesToAddMatcher; - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php b/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php index dc122b482c0..87d094dc2aa 100644 --- a/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php +++ b/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php @@ -19,14 +19,9 @@ */ final class DefluentReturnMethodCallRector extends AbstractRector { - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - public function __construct(FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer) - { - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; + public function __construct( + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/Return_/ReturnFluentChainMethodCallToNormalMethodCallRector.php b/rules/Defluent/Rector/Return_/ReturnFluentChainMethodCallToNormalMethodCallRector.php index 2694295f817..1e3c663103e 100644 --- a/rules/Defluent/Rector/Return_/ReturnFluentChainMethodCallToNormalMethodCallRector.php +++ b/rules/Defluent/Rector/Return_/ReturnFluentChainMethodCallToNormalMethodCallRector.php @@ -26,50 +26,14 @@ */ final class ReturnFluentChainMethodCallToNormalMethodCallRector extends AbstractRector { - /** - * @var ReturnFluentMethodCallFactory - */ - private $returnFluentMethodCallFactory; - - /** - * @var FluentMethodCallsFactory - */ - private $fluentMethodCallsFactory; - - /** - * @var SeparateReturnMethodCallFactory - */ - private $separateReturnMethodCallFactory; - - /** - * @var FluentNodeRemover - */ - private $fluentNodeRemover; - - /** - * @var MethodCallSkipAnalyzer - */ - private $methodCallSkipAnalyzer; - - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - public function __construct( - ReturnFluentMethodCallFactory $returnFluentMethodCallFactory, - FluentMethodCallsFactory $fluentMethodCallsFactory, - SeparateReturnMethodCallFactory $separateReturnMethodCallFactory, - FluentNodeRemover $fluentNodeRemover, - MethodCallSkipAnalyzer $methodCallSkipAnalyzer, - FluentMethodCallSkipper $fluentMethodCallSkipper + private ReturnFluentMethodCallFactory $returnFluentMethodCallFactory, + private FluentMethodCallsFactory $fluentMethodCallsFactory, + private SeparateReturnMethodCallFactory $separateReturnMethodCallFactory, + private FluentNodeRemover $fluentNodeRemover, + private MethodCallSkipAnalyzer $methodCallSkipAnalyzer, + private FluentMethodCallSkipper $fluentMethodCallSkipper ) { - $this->returnFluentMethodCallFactory = $returnFluentMethodCallFactory; - $this->fluentMethodCallsFactory = $fluentMethodCallsFactory; - $this->separateReturnMethodCallFactory = $separateReturnMethodCallFactory; - $this->fluentNodeRemover = $fluentNodeRemover; - $this->methodCallSkipAnalyzer = $methodCallSkipAnalyzer; - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Rector/Return_/ReturnNewFluentChainMethodCallToNonFluentRector.php b/rules/Defluent/Rector/Return_/ReturnNewFluentChainMethodCallToNonFluentRector.php index 3e9b7ba104a..5595004f10d 100644 --- a/rules/Defluent/Rector/Return_/ReturnNewFluentChainMethodCallToNonFluentRector.php +++ b/rules/Defluent/Rector/Return_/ReturnNewFluentChainMethodCallToNonFluentRector.php @@ -25,29 +25,11 @@ */ final class ReturnNewFluentChainMethodCallToNonFluentRector extends AbstractRector { - /** - * @var FluentNodeRemover - */ - private $fluentNodeRemover; - - /** - * @var AssignAndRootExprAndNodesToAddMatcher - */ - private $assignAndRootExprAndNodesToAddMatcher; - - /** - * @var FluentMethodCallSkipper - */ - private $fluentMethodCallSkipper; - public function __construct( - FluentNodeRemover $fluentNodeRemover, - AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, - FluentMethodCallSkipper $fluentMethodCallSkipper + private FluentNodeRemover $fluentNodeRemover, + private AssignAndRootExprAndNodesToAddMatcher $assignAndRootExprAndNodesToAddMatcher, + private FluentMethodCallSkipper $fluentMethodCallSkipper ) { - $this->fluentNodeRemover = $fluentNodeRemover; - $this->assignAndRootExprAndNodesToAddMatcher = $assignAndRootExprAndNodesToAddMatcher; - $this->fluentMethodCallSkipper = $fluentMethodCallSkipper; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Defluent/Reflection/MethodCallToClassMethodParser.php b/rules/Defluent/Reflection/MethodCallToClassMethodParser.php index 007bce5cde2..8494acbea10 100644 --- a/rules/Defluent/Reflection/MethodCallToClassMethodParser.php +++ b/rules/Defluent/Reflection/MethodCallToClassMethodParser.php @@ -14,36 +14,12 @@ final class MethodCallToClassMethodParser { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var FunctionLikeReflectionParser - */ - private $functionLikeReflectionParser; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider, - FunctionLikeReflectionParser $functionLikeReflectionParser + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider, + private FunctionLikeReflectionParser $functionLikeReflectionParser ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; - $this->functionLikeReflectionParser = $functionLikeReflectionParser; } public function parseMethodCall(MethodCall $methodCall): ?ClassMethod diff --git a/rules/Defluent/Skipper/FluentMethodCallSkipper.php b/rules/Defluent/Skipper/FluentMethodCallSkipper.php index e416e74f93b..e734e5a3995 100644 --- a/rules/Defluent/Skipper/FluentMethodCallSkipper.php +++ b/rules/Defluent/Skipper/FluentMethodCallSkipper.php @@ -38,36 +38,12 @@ final class FluentMethodCallSkipper 'DateTimeInterface', ]; - /** - * @var FluentCallStaticTypeResolver - */ - private $fluentCallStaticTypeResolver; - - /** - * @var SameClassMethodCallAnalyzer - */ - private $sameClassMethodCallAnalyzer; - - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - /** - * @var GetterMethodCallAnalyzer - */ - private $getterMethodCallAnalyzer; - public function __construct( - FluentCallStaticTypeResolver $fluentCallStaticTypeResolver, - SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer, - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, - GetterMethodCallAnalyzer $getterMethodCallAnalyzer + private FluentCallStaticTypeResolver $fluentCallStaticTypeResolver, + private SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer, + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, + private GetterMethodCallAnalyzer $getterMethodCallAnalyzer ) { - $this->fluentCallStaticTypeResolver = $fluentCallStaticTypeResolver; - $this->sameClassMethodCallAnalyzer = $sameClassMethodCallAnalyzer; - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; - $this->getterMethodCallAnalyzer = $getterMethodCallAnalyzer; } public function shouldSkipRootMethodCall(MethodCall $methodCall): bool diff --git a/rules/Defluent/ValueObject/AssignAndRootExpr.php b/rules/Defluent/ValueObject/AssignAndRootExpr.php index e2ebe9c090b..4c204b95f99 100644 --- a/rules/Defluent/ValueObject/AssignAndRootExpr.php +++ b/rules/Defluent/ValueObject/AssignAndRootExpr.php @@ -14,20 +14,14 @@ final class AssignAndRootExpr extends AbstractRootExpr implements RootExprAwareInterface, FirstCallFactoryAwareInterface { - /** - * @var Variable|null - */ - private $silentVariable; - public function __construct( Expr $assignExpr, Expr $rootExpr, - ?Variable $silentVariable = null, + private ?Variable $silentVariable = null, bool $isFirstCallFactory = false ) { $this->assignExpr = $assignExpr; $this->rootExpr = $rootExpr; - $this->silentVariable = $silentVariable; $this->isFirstCallFactory = $isFirstCallFactory; } diff --git a/rules/Defluent/ValueObject/AssignAndRootExprAndNodesToAdd.php b/rules/Defluent/ValueObject/AssignAndRootExprAndNodesToAdd.php index e8fdc3b9742..20477c1ed31 100644 --- a/rules/Defluent/ValueObject/AssignAndRootExprAndNodesToAdd.php +++ b/rules/Defluent/ValueObject/AssignAndRootExprAndNodesToAdd.php @@ -9,23 +9,13 @@ final class AssignAndRootExprAndNodesToAdd { - /** - * @var array - */ - private $nodesToAdd = []; - - /** - * @var AssignAndRootExpr - */ - private $assignAndRootExpr; - /** * @param array $nodesToAdd */ - public function __construct(AssignAndRootExpr $assignAndRootExpr, array $nodesToAdd) - { - $this->assignAndRootExpr = $assignAndRootExpr; - $this->nodesToAdd = $nodesToAdd; + public function __construct( + private AssignAndRootExpr $assignAndRootExpr, + private array $nodesToAdd + ) { } /** diff --git a/rules/Defluent/ValueObject/FirstAssignFluentCall.php b/rules/Defluent/ValueObject/FirstAssignFluentCall.php index a949e76d9e9..644d016ac3d 100644 --- a/rules/Defluent/ValueObject/FirstAssignFluentCall.php +++ b/rules/Defluent/ValueObject/FirstAssignFluentCall.php @@ -12,21 +12,15 @@ final class FirstAssignFluentCall extends AbstractRootExpr implements RootExprAwareInterface, FirstCallFactoryAwareInterface { - /** - * @var FluentMethodCalls - */ - private $fluentMethodCalls; - public function __construct( Expr $assignExpr, Expr $rootExpr, bool $isFirstCallFactory, - FluentMethodCalls $fluentMethodCalls + private FluentMethodCalls $fluentMethodCalls ) { $this->assignExpr = $assignExpr; $this->rootExpr = $rootExpr; $this->isFirstCallFactory = $isFirstCallFactory; - $this->fluentMethodCalls = $fluentMethodCalls; } public function getAssignExpr(): Expr diff --git a/rules/Defluent/ValueObject/FluentMethodCalls.php b/rules/Defluent/ValueObject/FluentMethodCalls.php index 139ae19ed9b..8e079c7c036 100644 --- a/rules/Defluent/ValueObject/FluentMethodCalls.php +++ b/rules/Defluent/ValueObject/FluentMethodCalls.php @@ -8,29 +8,14 @@ final class FluentMethodCalls { - /** - * @var MethodCall[] - */ - private $fluentMethodCalls = []; - - /** - * @var MethodCall - */ - private $rootMethodCall; - - /** - * @var MethodCall - */ - private $lastMethodCall; - /** * @param MethodCall[] $fluentMethodCalls */ - public function __construct(MethodCall $rootMethodCall, array $fluentMethodCalls, MethodCall $lastMethodCall) - { - $this->rootMethodCall = $rootMethodCall; - $this->fluentMethodCalls = $fluentMethodCalls; - $this->lastMethodCall = $lastMethodCall; + public function __construct( + private MethodCall $rootMethodCall, + private array $fluentMethodCalls, + private MethodCall $lastMethodCall + ) { } public function getRootMethodCall(): MethodCall diff --git a/rules/Defluent/ValueObject/NormalToFluent.php b/rules/Defluent/ValueObject/NormalToFluent.php index d3d3f28726c..14d899578c2 100644 --- a/rules/Defluent/ValueObject/NormalToFluent.php +++ b/rules/Defluent/ValueObject/NormalToFluent.php @@ -8,23 +8,13 @@ final class NormalToFluent { - /** - * @var string - */ - private $class; - - /** - * @var string[] - */ - private $methodNames = []; - /** * @param string[] $methodNames */ - public function __construct(string $class, array $methodNames) - { - $this->class = $class; - $this->methodNames = $methodNames; + public function __construct( + private string $class, + private array $methodNames + ) { } public function getObjectType(): ObjectType diff --git a/rules/Defluent/ValueObjectFactory/FluentMethodCallsFactory.php b/rules/Defluent/ValueObjectFactory/FluentMethodCallsFactory.php index 24484d683b7..1d4db22195c 100644 --- a/rules/Defluent/ValueObjectFactory/FluentMethodCallsFactory.php +++ b/rules/Defluent/ValueObjectFactory/FluentMethodCallsFactory.php @@ -11,22 +11,10 @@ final class FluentMethodCallsFactory { - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - - /** - * @var SameClassMethodCallAnalyzer - */ - private $sameClassMethodCallAnalyzer; - public function __construct( - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, - SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer, + private SameClassMethodCallAnalyzer $sameClassMethodCallAnalyzer ) { - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; - $this->sameClassMethodCallAnalyzer = $sameClassMethodCallAnalyzer; } public function createFromLastMethodCall(MethodCall $lastMethodCall): ?FluentMethodCalls diff --git a/rules/DependencyInjection/NodeFactory/InjectMethodFactory.php b/rules/DependencyInjection/NodeFactory/InjectMethodFactory.php index dca93b6cdb6..780d9d7421b 100644 --- a/rules/DependencyInjection/NodeFactory/InjectMethodFactory.php +++ b/rules/DependencyInjection/NodeFactory/InjectMethodFactory.php @@ -20,43 +20,13 @@ final class InjectMethodFactory { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var ClassNaming - */ - private $classNaming; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var NodeFactory - */ - private $nodeFactory; - public function __construct( - ClassNaming $classNaming, - NodeFactory $nodeFactory, - PhpDocInfoFactory $phpDocInfoFactory, - PropertyNaming $propertyNaming, - TypeFactory $typeFactory + private ClassNaming $classNaming, + private NodeFactory $nodeFactory, + private PhpDocInfoFactory $phpDocInfoFactory, + private PropertyNaming $propertyNaming, + private TypeFactory $typeFactory ) { - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->propertyNaming = $propertyNaming; - $this->classNaming = $classNaming; - $this->typeFactory = $typeFactory; - $this->nodeFactory = $nodeFactory; } /** diff --git a/rules/DependencyInjection/NodeManipulator/PropertyConstructorInjectionManipulator.php b/rules/DependencyInjection/NodeManipulator/PropertyConstructorInjectionManipulator.php index 31017eef6ef..b6596766373 100644 --- a/rules/DependencyInjection/NodeManipulator/PropertyConstructorInjectionManipulator.php +++ b/rules/DependencyInjection/NodeManipulator/PropertyConstructorInjectionManipulator.php @@ -18,43 +18,13 @@ final class PropertyConstructorInjectionManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - - /** - * @var PropertyAdder - */ - private $propertyAdder; - public function __construct( - NodeNameResolver $nodeNameResolver, - PhpDocInfoFactory $phpDocInfoFactory, - PhpDocTypeChanger $phpDocTypeChanger, - PhpDocTagRemover $phpDocTagRemover, - PropertyAdder $propertyAdder + private NodeNameResolver $nodeNameResolver, + private PhpDocInfoFactory $phpDocInfoFactory, + private PhpDocTypeChanger $phpDocTypeChanger, + private PhpDocTagRemover $phpDocTagRemover, + private PropertyAdder $propertyAdder ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->phpDocTagRemover = $phpDocTagRemover; - $this->propertyAdder = $propertyAdder; } public function refactor( diff --git a/rules/DependencyInjection/NodeRemover/ClassMethodNodeRemover.php b/rules/DependencyInjection/NodeRemover/ClassMethodNodeRemover.php index 08d78ec0c11..e49c5c1767e 100644 --- a/rules/DependencyInjection/NodeRemover/ClassMethodNodeRemover.php +++ b/rules/DependencyInjection/NodeRemover/ClassMethodNodeRemover.php @@ -18,29 +18,11 @@ final class ClassMethodNodeRemover { - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - NodesToRemoveCollector $nodesToRemoveCollector + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private NodesToRemoveCollector $nodesToRemoveCollector ) { - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function removeClassMethodIfUseless(ClassMethod $classMethod): void diff --git a/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php b/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php index ee29eec68a2..c1532639540 100644 --- a/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php +++ b/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php @@ -20,22 +20,10 @@ */ final class ActionInjectionToConstructorInjectionRector extends AbstractRector { - /** - * @var VariablesToPropertyFetchCollection - */ - private $variablesToPropertyFetchCollection; - - /** - * @var ServiceMapProvider - */ - private $applicationServiceMapProvider; - public function __construct( - ServiceMapProvider $applicationServiceMapProvider, - VariablesToPropertyFetchCollection $variablesToPropertyFetchCollection + private ServiceMapProvider $applicationServiceMapProvider, + private VariablesToPropertyFetchCollection $variablesToPropertyFetchCollection ) { - $this->variablesToPropertyFetchCollection = $variablesToPropertyFetchCollection; - $this->applicationServiceMapProvider = $applicationServiceMapProvider; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DependencyInjection/Rector/Class_/MultiParentingToAbstractDependencyRector.php b/rules/DependencyInjection/Rector/Class_/MultiParentingToAbstractDependencyRector.php index 460314bb39c..b95f9f3fd21 100644 --- a/rules/DependencyInjection/Rector/Class_/MultiParentingToAbstractDependencyRector.php +++ b/rules/DependencyInjection/Rector/Class_/MultiParentingToAbstractDependencyRector.php @@ -43,31 +43,13 @@ final class MultiParentingToAbstractDependencyRector extends AbstractRector impl */ private $injectObjectTypes = []; - /** - * @var ClassMethodNodeRemover - */ - private $classMethodNodeRemover; - - /** - * @var InjectMethodFactory - */ - private $injectMethodFactory; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - public function __construct( - ClassMethodNodeRemover $classMethodNodeRemover, - InjectMethodFactory $injectMethodFactory, + private ClassMethodNodeRemover $classMethodNodeRemover, + private InjectMethodFactory $injectMethodFactory, PhpDocInfoFactory $phpDocInfoFactory, - ClassInsertManipulator $classInsertManipulator + private ClassInsertManipulator $classInsertManipulator ) { - $this->injectMethodFactory = $injectMethodFactory; - $this->classMethodNodeRemover = $classMethodNodeRemover; $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->classInsertManipulator = $classInsertManipulator; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DependencyInjection/Rector/Variable/ReplaceVariableByPropertyFetchRector.php b/rules/DependencyInjection/Rector/Variable/ReplaceVariableByPropertyFetchRector.php index 9a83fb47370..06922a6e193 100644 --- a/rules/DependencyInjection/Rector/Variable/ReplaceVariableByPropertyFetchRector.php +++ b/rules/DependencyInjection/Rector/Variable/ReplaceVariableByPropertyFetchRector.php @@ -20,14 +20,9 @@ */ final class ReplaceVariableByPropertyFetchRector extends AbstractRector { - /** - * @var VariablesToPropertyFetchCollection - */ - private $variablesToPropertyFetchCollection; - - public function __construct(VariablesToPropertyFetchCollection $variablesToPropertyFetchCollection) - { - $this->variablesToPropertyFetchCollection = $variablesToPropertyFetchCollection; + public function __construct( + private VariablesToPropertyFetchCollection $variablesToPropertyFetchCollection + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector.php b/rules/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector.php index f8ea9ea6cf0..7b9462341dc 100644 --- a/rules/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector.php +++ b/rules/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector.php @@ -34,14 +34,9 @@ */ final class DowngradeScalarTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php b/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php index 5e1c2db2360..e9efb11fe4f 100644 --- a/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php +++ b/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php @@ -24,27 +24,15 @@ final class DowngradeAnonymousClassRector extends AbstractRector */ private const ANONYMOUS_CLASS_PREFIX = 'Anonymous__'; - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - /** - * @var ClassFromAnonymousFactory - */ - private $classFromAnonymousFactory; - /** * @var Class_[] */ private $classes = []; public function __construct( - ClassAnalyzer $classAnalyzer, - ClassFromAnonymousFactory $classFromAnonymousFactory + private ClassAnalyzer $classAnalyzer, + private ClassFromAnonymousFactory $classFromAnonymousFactory ) { - $this->classAnalyzer = $classAnalyzer; - $this->classFromAnonymousFactory = $classFromAnonymousFactory; } /** diff --git a/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php b/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php index 5964a7fcffa..e1372fce83a 100644 --- a/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php +++ b/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php @@ -30,14 +30,9 @@ */ final class DowngradeSpaceshipRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } /** diff --git a/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php b/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php index 38386bff5eb..d88202083ae 100644 --- a/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php +++ b/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php @@ -42,18 +42,12 @@ final class DowngradeGeneratedScalarTypesRector extends AbstractRector */ private $phpRectors = []; - /** - * @var InlineCodeParser - */ - private $inlineCodeParser; - public function __construct( - InlineCodeParser $inlineCodeParser, + private InlineCodeParser $inlineCodeParser, DowngradeScalarTypeDeclarationRector $downgradeScalarTypeDeclarationRector, DowngradeVoidTypeDeclarationRector $downgradeVoidTypeDeclarationRector ) { $this->phpRectors = [$downgradeScalarTypeDeclarationRector, $downgradeVoidTypeDeclarationRector]; - $this->inlineCodeParser = $inlineCodeParser; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector.php b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector.php index 1f9764b4dfa..4c81c37f7f6 100644 --- a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector.php +++ b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector.php @@ -21,14 +21,9 @@ */ final class DowngradeIterablePseudoTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector.php b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector.php index f2d02a38716..1959bd82191 100644 --- a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector.php +++ b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector.php @@ -23,22 +23,10 @@ */ final class DowngradeNullableTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - public function __construct( - PhpDocTypeChanger $phpDocTypeChanger, - PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + private PhpDocTypeChanger $phpDocTypeChanger, + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator ) { - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; } /** diff --git a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector.php b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector.php index d2089a52425..3f651301c57 100644 --- a/rules/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector.php +++ b/rules/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector.php @@ -21,14 +21,9 @@ */ final class DowngradeVoidTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp71/Rector/List_/DowngradeKeysInListRector.php b/rules/DowngradePhp71/Rector/List_/DowngradeKeysInListRector.php index 2917f3c0d15..a4b619c8ffe 100644 --- a/rules/DowngradePhp71/Rector/List_/DowngradeKeysInListRector.php +++ b/rules/DowngradePhp71/Rector/List_/DowngradeKeysInListRector.php @@ -26,20 +26,10 @@ */ final class DowngradeKeysInListRector extends AbstractRector { - /** - * @var InflectorSingularResolver - */ - private $inflectorSingularResolver; - - /** - * @var ForeachAnalyzer - */ - private $foreachAnalyzer; - - public function __construct(InflectorSingularResolver $inflectorSingularResolver, ForeachAnalyzer $foreachAnalyzer) - { - $this->inflectorSingularResolver = $inflectorSingularResolver; - $this->foreachAnalyzer = $foreachAnalyzer; + public function __construct( + private InflectorSingularResolver $inflectorSingularResolver, + private ForeachAnalyzer $foreachAnalyzer + ) { } /** diff --git a/rules/DowngradePhp71/TypeDeclaration/PhpDocFromTypeDeclarationDecorator.php b/rules/DowngradePhp71/TypeDeclaration/PhpDocFromTypeDeclarationDecorator.php index c2a9e1b67e0..5d0a25cbf14 100644 --- a/rules/DowngradePhp71/TypeDeclaration/PhpDocFromTypeDeclarationDecorator.php +++ b/rules/DowngradePhp71/TypeDeclaration/PhpDocFromTypeDeclarationDecorator.php @@ -20,43 +20,13 @@ final class PhpDocFromTypeDeclarationDecorator { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - public function __construct( - StaticTypeMapper $staticTypeMapper, - PhpDocInfoFactory $phpDocInfoFactory, - NodeNameResolver $nodeNameResolver, - PhpDocTypeChanger $phpDocTypeChanger, - TypeUnwrapper $typeUnwrapper + private StaticTypeMapper $staticTypeMapper, + private PhpDocInfoFactory $phpDocInfoFactory, + private NodeNameResolver $nodeNameResolver, + private PhpDocTypeChanger $phpDocTypeChanger, + private TypeUnwrapper $typeUnwrapper ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->typeUnwrapper = $typeUnwrapper; } /** diff --git a/rules/DowngradePhp72/NodeAnalyzer/ClassLikeParentResolver.php b/rules/DowngradePhp72/NodeAnalyzer/ClassLikeParentResolver.php index fa4d0a43092..b9c9edbb292 100644 --- a/rules/DowngradePhp72/NodeAnalyzer/ClassLikeParentResolver.php +++ b/rules/DowngradePhp72/NodeAnalyzer/ClassLikeParentResolver.php @@ -11,14 +11,9 @@ final class ClassLikeParentResolver { - /** - * @var NodeRepository - */ - private $nodeRepository; - - public function __construct(NodeRepository $nodeRepository) - { - $this->nodeRepository = $nodeRepository; + public function __construct( + private NodeRepository $nodeRepository + ) { } /** diff --git a/rules/DowngradePhp72/NodeAnalyzer/ClassLikeWithTraitsClassMethodResolver.php b/rules/DowngradePhp72/NodeAnalyzer/ClassLikeWithTraitsClassMethodResolver.php index f37f9330230..519741de2d2 100644 --- a/rules/DowngradePhp72/NodeAnalyzer/ClassLikeWithTraitsClassMethodResolver.php +++ b/rules/DowngradePhp72/NodeAnalyzer/ClassLikeWithTraitsClassMethodResolver.php @@ -15,14 +15,9 @@ final class ClassLikeWithTraitsClassMethodResolver { - /** - * @var NodeRepository - */ - private $nodeRepository; - - public function __construct(NodeRepository $nodeRepository) - { - $this->nodeRepository = $nodeRepository; + public function __construct( + private NodeRepository $nodeRepository + ) { } /** diff --git a/rules/DowngradePhp72/NodeAnalyzer/NativeTypeClassTreeResolver.php b/rules/DowngradePhp72/NodeAnalyzer/NativeTypeClassTreeResolver.php index a2c4a2c50b6..8993fc19ceb 100644 --- a/rules/DowngradePhp72/NodeAnalyzer/NativeTypeClassTreeResolver.php +++ b/rules/DowngradePhp72/NodeAnalyzer/NativeTypeClassTreeResolver.php @@ -16,20 +16,10 @@ final class NativeTypeClassTreeResolver { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PrivatesAccessor - */ - private $privatesAccessor; - - public function __construct(StaticTypeMapper $staticTypeMapper, PrivatesAccessor $privatesAccessor) - { - $this->staticTypeMapper = $staticTypeMapper; - $this->privatesAccessor = $privatesAccessor; + public function __construct( + private StaticTypeMapper $staticTypeMapper, + private PrivatesAccessor $privatesAccessor + ) { } public function resolveParameterReflectionType( diff --git a/rules/DowngradePhp72/NodeAnalyzer/ParamContravariantDetector.php b/rules/DowngradePhp72/NodeAnalyzer/ParamContravariantDetector.php index a40d63ad2fe..5fc924ca719 100644 --- a/rules/DowngradePhp72/NodeAnalyzer/ParamContravariantDetector.php +++ b/rules/DowngradePhp72/NodeAnalyzer/ParamContravariantDetector.php @@ -12,20 +12,10 @@ final class ParamContravariantDetector { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - public function __construct(NodeNameResolver $nodeNameResolver, NodeRepository $nodeRepository) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeRepository = $nodeRepository; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private NodeRepository $nodeRepository + ) { } public function hasParentMethod(ClassMethod $classMethod, Scope $scope): bool diff --git a/rules/DowngradePhp72/NodeAnalyzer/ParentChildClassMethodTypeResolver.php b/rules/DowngradePhp72/NodeAnalyzer/ParentChildClassMethodTypeResolver.php index 103c716e376..3e8408a81b9 100644 --- a/rules/DowngradePhp72/NodeAnalyzer/ParentChildClassMethodTypeResolver.php +++ b/rules/DowngradePhp72/NodeAnalyzer/ParentChildClassMethodTypeResolver.php @@ -13,36 +13,12 @@ final class ParentChildClassMethodTypeResolver { - /** - * @var NativeTypeClassTreeResolver - */ - private $nativeTypeClassTreeResolver; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NativeTypeClassTreeResolver $nativeTypeClassTreeResolver, - NodeRepository $nodeRepository, - ReflectionProvider $reflectionProvider, - NodeNameResolver $nodeNameResolver + private NativeTypeClassTreeResolver $nativeTypeClassTreeResolver, + private NodeRepository $nodeRepository, + private ReflectionProvider $reflectionProvider, + private NodeNameResolver $nodeNameResolver ) { - $this->nativeTypeClassTreeResolver = $nativeTypeClassTreeResolver; - $this->nodeRepository = $nodeRepository; - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php b/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php index 8090d90103b..a54280cd996 100644 --- a/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php +++ b/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php @@ -17,43 +17,13 @@ final class NativeParamToPhpDocDecorator { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var ValueResolver - */ - private $valueResolver; - public function __construct( - PhpDocInfoFactory $phpDocInfoFactory, - NodeNameResolver $nodeNameResolver, - StaticTypeMapper $staticTypeMapper, - PhpDocTypeChanger $phpDocTypeChanger, - ValueResolver $valueResolver + private PhpDocInfoFactory $phpDocInfoFactory, + private NodeNameResolver $nodeNameResolver, + private StaticTypeMapper $staticTypeMapper, + private PhpDocTypeChanger $phpDocTypeChanger, + private ValueResolver $valueResolver ) { - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->valueResolver = $valueResolver; } public function decorate(ClassMethod $classMethod, Param $param): void diff --git a/rules/DowngradePhp72/Rector/Class_/DowngradeParameterTypeWideningRector.php b/rules/DowngradePhp72/Rector/Class_/DowngradeParameterTypeWideningRector.php index 6b83671cc25..2dec1d3b3b4 100644 --- a/rules/DowngradePhp72/Rector/Class_/DowngradeParameterTypeWideningRector.php +++ b/rules/DowngradePhp72/Rector/Class_/DowngradeParameterTypeWideningRector.php @@ -30,43 +30,13 @@ */ final class DowngradeParameterTypeWideningRector extends AbstractRector { - /** - * @var ClassLikeWithTraitsClassMethodResolver - */ - private $classLikeWithTraitsClassMethodResolver; - - /** - * @var ParentChildClassMethodTypeResolver - */ - private $parentChildClassMethodTypeResolver; - - /** - * @var NativeParamToPhpDocDecorator - */ - private $nativeParamToPhpDocDecorator; - - /** - * @var ParamContravariantDetector - */ - private $paramContravariantDetector; - - /** - * @var TypeFactory - */ - private $typeFactory; - public function __construct( - ClassLikeWithTraitsClassMethodResolver $classLikeWithTraitsClassMethodResolver, - ParentChildClassMethodTypeResolver $parentChildClassMethodTypeResolver, - NativeParamToPhpDocDecorator $nativeParamToPhpDocDecorator, - ParamContravariantDetector $paramContravariantDetector, - TypeFactory $typeFactory + private ClassLikeWithTraitsClassMethodResolver $classLikeWithTraitsClassMethodResolver, + private ParentChildClassMethodTypeResolver $parentChildClassMethodTypeResolver, + private NativeParamToPhpDocDecorator $nativeParamToPhpDocDecorator, + private ParamContravariantDetector $paramContravariantDetector, + private TypeFactory $typeFactory ) { - $this->classLikeWithTraitsClassMethodResolver = $classLikeWithTraitsClassMethodResolver; - $this->parentChildClassMethodTypeResolver = $parentChildClassMethodTypeResolver; - $this->nativeParamToPhpDocDecorator = $nativeParamToPhpDocDecorator; - $this->paramContravariantDetector = $paramContravariantDetector; - $this->typeFactory = $typeFactory; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php b/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php index 77abf535968..adcabb73ec8 100644 --- a/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php +++ b/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php @@ -44,14 +44,9 @@ final class DowngradePregUnmatchedAsNullConstantRector extends AbstractRector */ private const FLAG = 'PREG_UNMATCHED_AS_NULL'; - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } /** diff --git a/rules/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector.php b/rules/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector.php index 11761506e6a..0fce446593c 100644 --- a/rules/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector.php +++ b/rules/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector.php @@ -23,14 +23,9 @@ */ final class DowngradeStreamIsattyRector extends AbstractRector { - /** - * @var InlineCodeParser - */ - private $inlineCodeParser; - - public function __construct(InlineCodeParser $inlineCodeParser) - { - $this->inlineCodeParser = $inlineCodeParser; + public function __construct( + private InlineCodeParser $inlineCodeParser + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector.php b/rules/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector.php index a21e24ece13..8d454d97502 100644 --- a/rules/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector.php +++ b/rules/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector.php @@ -18,14 +18,9 @@ */ final class DowngradeObjectTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php b/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php index 631dc9b3f1d..cbd84b8ce57 100644 --- a/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php +++ b/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php @@ -19,14 +19,9 @@ */ final class DowngradeTrailingCommasInFunctionCallsRector extends AbstractRector { - /** - * @var FollowedByCommaAnalyzer - */ - private $followedByCommaAnalyzer; - - public function __construct(FollowedByCommaAnalyzer $followedByCommaAnalyzer) - { - $this->followedByCommaAnalyzer = $followedByCommaAnalyzer; + public function __construct( + private FollowedByCommaAnalyzer $followedByCommaAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php b/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php index c69757ff7da..6bf18be166a 100644 --- a/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php +++ b/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php @@ -33,14 +33,9 @@ */ final class DowngradeArraySpreadRector extends AbstractRector { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php index 32c3c4985d3..fdd974f5a3a 100644 --- a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php +++ b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php @@ -19,14 +19,9 @@ */ final class ArrowFunctionToAnonymousFunctionRector extends AbstractRector { - /** - * @var AnonymousFunctionFactory - */ - private $anonymousFunctionFactory; - - public function __construct(AnonymousFunctionFactory $anonymousFunctionFactory) - { - $this->anonymousFunctionFactory = $anonymousFunctionFactory; + public function __construct( + private AnonymousFunctionFactory $anonymousFunctionFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php index 02b018254c4..482c60ca70d 100644 --- a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php +++ b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php @@ -30,14 +30,9 @@ */ final class DowngradeContravariantArgumentTypeRector extends AbstractRector { - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocTypeChanger $phpDocTypeChanger + ) { } /** diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php index fdaca2f024c..f04f1b2c302 100644 --- a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php +++ b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php @@ -29,29 +29,11 @@ */ final class DowngradeCovariantReturnTypeRector extends AbstractRector { - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var PrivatesCaller - */ - private $privatesCaller; - - /** - * @var ReturnTagRemover - */ - private $returnTagRemover; - public function __construct( - PhpDocTypeChanger $phpDocTypeChanger, - PrivatesCaller $privatesCaller, - ReturnTagRemover $returnTagRemover + private PhpDocTypeChanger $phpDocTypeChanger, + private PrivatesCaller $privatesCaller, + private ReturnTagRemover $returnTagRemover ) { - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->privatesCaller = $privatesCaller; - $this->returnTagRemover = $returnTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector.php index f1f95f354eb..67074a30a0c 100644 --- a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector.php +++ b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector.php @@ -20,22 +20,10 @@ */ final class DowngradeSelfTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator, - ReflectionProvider $reflectionProvider + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator, + private ReflectionProvider $reflectionProvider ) { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php b/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php index 95554751532..4cdfb0e09db 100644 --- a/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php +++ b/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php @@ -31,14 +31,9 @@ */ final class DowngradeStripTagsCallWithArrayRector extends AbstractRector { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector.php b/rules/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector.php index f4ebadb258b..84997714f12 100644 --- a/rules/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector.php +++ b/rules/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector.php @@ -16,14 +16,9 @@ */ final class DowngradeTypedPropertyRector extends AbstractRector { - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocTypeChanger $phpDocTypeChanger + ) { } /** diff --git a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php index 1d96d16916d..538ad3f649c 100644 --- a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php +++ b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php @@ -20,22 +20,10 @@ */ final class DowngradeStaticTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator, - ReflectionProvider $reflectionProvider + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator, + private ReflectionProvider $reflectionProvider ) { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php index 364458751ff..114f623070b 100644 --- a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php +++ b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php @@ -26,14 +26,9 @@ */ final class DowngradeTrailingCommasInParamUseRector extends AbstractRector { - /** - * @var FollowedByCommaAnalyzer - */ - private $followedByCommaAnalyzer; - - public function __construct(FollowedByCommaAnalyzer $followedByCommaAnalyzer) - { - $this->followedByCommaAnalyzer = $followedByCommaAnalyzer; + public function __construct( + private FollowedByCommaAnalyzer $followedByCommaAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php index 50886e7ebbf..46a7b064f86 100644 --- a/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php +++ b/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php @@ -23,14 +23,9 @@ */ final class DowngradePropertyPromotionRector extends AbstractRector { - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - public function __construct(ClassInsertManipulator $classInsertManipulator) - { - $this->classInsertManipulator = $classInsertManipulator; + public function __construct( + private ClassInsertManipulator $classInsertManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector.php b/rules/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector.php index 1028e52c771..bca4c11833d 100644 --- a/rules/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector.php +++ b/rules/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector.php @@ -18,14 +18,9 @@ */ final class DowngradeMixedTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector.php b/rules/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector.php index b39b51cac07..c979dd34ed5 100644 --- a/rules/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector.php +++ b/rules/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector.php @@ -20,14 +20,9 @@ */ final class DowngradeUnionTypeDeclarationRector extends AbstractRector { - /** - * @var PhpDocFromTypeDeclarationDecorator - */ - private $phpDocFromTypeDeclarationDecorator; - - public function __construct(PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator) - { - $this->phpDocFromTypeDeclarationDecorator = $phpDocFromTypeDeclarationDecorator; + public function __construct( + private PhpDocFromTypeDeclarationDecorator $phpDocFromTypeDeclarationDecorator + ) { } /** diff --git a/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php b/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php index 63570336359..ed851bdf939 100644 --- a/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php +++ b/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php @@ -23,14 +23,9 @@ */ final class DowngradeNullsafeToTernaryOperatorRector extends AbstractRector { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector.php b/rules/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector.php index b0f35519556..70ce0e41b86 100644 --- a/rules/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector.php +++ b/rules/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector.php @@ -17,14 +17,9 @@ */ final class DowngradeUnionTypeTypedPropertyRector extends AbstractRector { - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocTypeChanger $phpDocTypeChanger + ) { } /** diff --git a/rules/EarlyReturn/NodeFactory/InvertedIfFactory.php b/rules/EarlyReturn/NodeFactory/InvertedIfFactory.php index 3b61a0b6508..2e114672d74 100644 --- a/rules/EarlyReturn/NodeFactory/InvertedIfFactory.php +++ b/rules/EarlyReturn/NodeFactory/InvertedIfFactory.php @@ -17,29 +17,11 @@ final class InvertedIfFactory { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ConditionInverter - */ - private $conditionInverter; - - /** - * @var ContextAnalyzer - */ - private $contextAnalyzer; - public function __construct( - BetterNodeFinder $betterNodeFinder, - ConditionInverter $conditionInverter, - ContextAnalyzer $contextAnalyzer + private BetterNodeFinder $betterNodeFinder, + private ConditionInverter $conditionInverter, + private ContextAnalyzer $contextAnalyzer ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->conditionInverter = $conditionInverter; - $this->contextAnalyzer = $contextAnalyzer; } /** diff --git a/rules/EarlyReturn/NodeTransformer/ConditionInverter.php b/rules/EarlyReturn/NodeTransformer/ConditionInverter.php index b080bf92010..e4194b61b64 100644 --- a/rules/EarlyReturn/NodeTransformer/ConditionInverter.php +++ b/rules/EarlyReturn/NodeTransformer/ConditionInverter.php @@ -12,14 +12,9 @@ final class ConditionInverter { - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator) - { - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator + ) { } public function createInvertedCondition(Expr $expr): Expr diff --git a/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php b/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php index 86f4372b6f1..878b07f0025 100644 --- a/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php +++ b/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php @@ -26,20 +26,10 @@ */ final class ChangeNestedForeachIfsToEarlyContinueRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var ConditionInverter - */ - private $conditionInverter; - - public function __construct(ConditionInverter $conditionInverter, IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; - $this->conditionInverter = $conditionInverter; + public function __construct( + private ConditionInverter $conditionInverter, + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php index 261df61a77e..3d8a105dd8f 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php @@ -26,36 +26,12 @@ */ final class ChangeAndIfToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var InvertedIfFactory - */ - private $invertedIfFactory; - - /** - * @var ContextAnalyzer - */ - private $contextAnalyzer; - - /** - * @var BooleanAndAnalyzer - */ - private $booleanAndAnalyzer; - public function __construct( - IfManipulator $ifManipulator, - InvertedIfFactory $invertedIfFactory, - ContextAnalyzer $contextAnalyzer, - BooleanAndAnalyzer $booleanAndAnalyzer + private IfManipulator $ifManipulator, + private InvertedIfFactory $invertedIfFactory, + private ContextAnalyzer $contextAnalyzer, + private BooleanAndAnalyzer $booleanAndAnalyzer ) { - $this->ifManipulator = $ifManipulator; - $this->invertedIfFactory = $invertedIfFactory; - $this->contextAnalyzer = $contextAnalyzer; - $this->booleanAndAnalyzer = $booleanAndAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php index 18e3213b02a..9a6d6956946 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php @@ -25,20 +25,10 @@ */ final class ChangeIfElseValueAssignToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var StmtsManipulator - */ - private $stmtsManipulator; - - public function __construct(IfManipulator $ifManipulator, StmtsManipulator $stmtsManipulator) - { - $this->ifManipulator = $ifManipulator; - $this->stmtsManipulator = $stmtsManipulator; + public function __construct( + private IfManipulator $ifManipulator, + private StmtsManipulator $stmtsManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php index bc7cb788563..3a9bf14ccb6 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php @@ -21,20 +21,10 @@ */ final class ChangeNestedIfsToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var ConditionInverter - */ - private $conditionInverter; - - public function __construct(ConditionInverter $conditionInverter, IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; - $this->conditionInverter = $conditionInverter; + public function __construct( + private ConditionInverter $conditionInverter, + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php b/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php index ea3444d75fc..1dfcd1e1ea5 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php @@ -19,14 +19,9 @@ */ final class ChangeOrIfContinueToMultiContinueRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php index f3b4004b186..92d615b8517 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php @@ -20,14 +20,9 @@ */ final class ChangeOrIfReturnToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php b/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php index 4261aab1f38..2ebd7e74bde 100644 --- a/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php @@ -22,14 +22,9 @@ */ final class PreparedValueToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - public function __construct(IfManipulator $ifManipulator) - { - $this->ifManipulator = $ifManipulator; + public function __construct( + private IfManipulator $ifManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector.php b/rules/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector.php index 6c5c7a34ef9..2b65c9a8004 100644 --- a/rules/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector.php @@ -21,29 +21,11 @@ */ final class ReturnBinaryAndToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - /** - * @var CallAnalyzer - */ - private $callAnalyzer; - public function __construct( - IfManipulator $ifManipulator, - AssignAndBinaryMap $assignAndBinaryMap, - CallAnalyzer $callAnalyzer + private IfManipulator $ifManipulator, + private AssignAndBinaryMap $assignAndBinaryMap, + private CallAnalyzer $callAnalyzer ) { - $this->ifManipulator = $ifManipulator; - $this->assignAndBinaryMap = $assignAndBinaryMap; - $this->callAnalyzer = $callAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector.php b/rules/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector.php index 44cd3e43a7c..83527a27e22 100644 --- a/rules/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector.php @@ -22,29 +22,11 @@ */ final class ReturnBinaryOrToEarlyReturnRector extends AbstractRector { - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var AssignAndBinaryMap - */ - private $assignAndBinaryMap; - - /** - * @var CallAnalyzer - */ - private $callAnalyzer; - public function __construct( - IfManipulator $ifManipulator, - AssignAndBinaryMap $assignAndBinaryMap, - CallAnalyzer $callAnalyzer + private IfManipulator $ifManipulator, + private AssignAndBinaryMap $assignAndBinaryMap, + private CallAnalyzer $callAnalyzer ) { - $this->ifManipulator = $ifManipulator; - $this->assignAndBinaryMap = $assignAndBinaryMap; - $this->callAnalyzer = $callAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Generics/Filter/UnnededMethodTagValueNodeFilter.php b/rules/Generics/Filter/UnnededMethodTagValueNodeFilter.php index 5a0c1e70334..0f963bf1d7d 100644 --- a/rules/Generics/Filter/UnnededMethodTagValueNodeFilter.php +++ b/rules/Generics/Filter/UnnededMethodTagValueNodeFilter.php @@ -13,14 +13,9 @@ final class UnnededMethodTagValueNodeFilter { - /** - * @var ClassMethodAnalyzer - */ - private $classMethodAnalyzer; - - public function __construct(ClassMethodAnalyzer $classMethodAnalyzer) - { - $this->classMethodAnalyzer = $classMethodAnalyzer; + public function __construct( + private ClassMethodAnalyzer $classMethodAnalyzer + ) { } /** diff --git a/rules/Generics/NodeType/GenericTypeSpecifier.php b/rules/Generics/NodeType/GenericTypeSpecifier.php index 892e3442c63..3b44247dc89 100644 --- a/rules/Generics/NodeType/GenericTypeSpecifier.php +++ b/rules/Generics/NodeType/GenericTypeSpecifier.php @@ -13,22 +13,10 @@ final class GenericTypeSpecifier { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var ExtendsTemplateTypeMapFallbackFactory - */ - private $extendsTemplateTypeMapFallbackFactory; - public function __construct( - StaticTypeMapper $staticTypeMapper, - ExtendsTemplateTypeMapFallbackFactory $extendsTemplateTypeMapFallbackFactory + private StaticTypeMapper $staticTypeMapper, + private ExtendsTemplateTypeMapFallbackFactory $extendsTemplateTypeMapFallbackFactory ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->extendsTemplateTypeMapFallbackFactory = $extendsTemplateTypeMapFallbackFactory; } /** diff --git a/rules/Generics/Rector/Class_/GenericsPHPStormMethodAnnotationRector.php b/rules/Generics/Rector/Class_/GenericsPHPStormMethodAnnotationRector.php index 37c4163b29d..334cd191fdd 100644 --- a/rules/Generics/Rector/Class_/GenericsPHPStormMethodAnnotationRector.php +++ b/rules/Generics/Rector/Class_/GenericsPHPStormMethodAnnotationRector.php @@ -24,36 +24,12 @@ */ final class GenericsPHPStormMethodAnnotationRector extends AbstractRector { - /** - * @var ClassGenericMethodResolver - */ - private $classGenericMethodResolver; - - /** - * @var GenericTypeSpecifier - */ - private $genericTypeSpecifier; - - /** - * @var GenericClassReflectionAnalyzer - */ - private $genericClassReflectionAnalyzer; - - /** - * @var UnnededMethodTagValueNodeFilter - */ - private $unnededMethodTagValueNodeFilter; - public function __construct( - ClassGenericMethodResolver $classGenericMethodResolver, - GenericTypeSpecifier $genericTypeSpecifier, - GenericClassReflectionAnalyzer $genericClassReflectionAnalyzer, - UnnededMethodTagValueNodeFilter $unnededMethodTagValueNodeFilter + private ClassGenericMethodResolver $classGenericMethodResolver, + private GenericTypeSpecifier $genericTypeSpecifier, + private GenericClassReflectionAnalyzer $genericClassReflectionAnalyzer, + private UnnededMethodTagValueNodeFilter $unnededMethodTagValueNodeFilter ) { - $this->classGenericMethodResolver = $classGenericMethodResolver; - $this->genericTypeSpecifier = $genericTypeSpecifier; - $this->genericClassReflectionAnalyzer = $genericClassReflectionAnalyzer; - $this->unnededMethodTagValueNodeFilter = $unnededMethodTagValueNodeFilter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Generics/Reflection/ClassGenericMethodResolver.php b/rules/Generics/Reflection/ClassGenericMethodResolver.php index 9f2266ed006..1dcf9107990 100644 --- a/rules/Generics/Reflection/ClassGenericMethodResolver.php +++ b/rules/Generics/Reflection/ClassGenericMethodResolver.php @@ -14,22 +14,10 @@ final class ClassGenericMethodResolver { - /** - * @var SimplePhpDocParser - */ - private $simplePhpDocParser; - - /** - * @var MethodTagValueNodeFactory - */ - private $methodTagValueNodeFactory; - public function __construct( - SimplePhpDocParser $simplePhpDocParser, - MethodTagValueNodeFactory $methodTagValueNodeFactory + private SimplePhpDocParser $simplePhpDocParser, + private MethodTagValueNodeFactory $methodTagValueNodeFactory ) { - $this->simplePhpDocParser = $simplePhpDocParser; - $this->methodTagValueNodeFactory = $methodTagValueNodeFactory; } /** diff --git a/rules/Generics/TagValueNodeFactory/MethodTagValueNodeFactory.php b/rules/Generics/TagValueNodeFactory/MethodTagValueNodeFactory.php index 383b8084bbd..53557635dbe 100644 --- a/rules/Generics/TagValueNodeFactory/MethodTagValueNodeFactory.php +++ b/rules/Generics/TagValueNodeFactory/MethodTagValueNodeFactory.php @@ -21,22 +21,10 @@ final class MethodTagValueNodeFactory { - /** - * @var MethodTagValueParameterNodeFactory - */ - private $methodTagValueParameterNodeFactory; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - public function __construct( - StaticTypeMapper $staticTypeMapper, - MethodTagValueParameterNodeFactory $methodTagValueParameterNodeFactory + private StaticTypeMapper $staticTypeMapper, + private MethodTagValueParameterNodeFactory $methodTagValueParameterNodeFactory ) { - $this->methodTagValueParameterNodeFactory = $methodTagValueParameterNodeFactory; - $this->staticTypeMapper = $staticTypeMapper; } public function createFromMethodReflectionAndReturnTagValueNode( diff --git a/rules/Generics/TagValueNodeFactory/MethodTagValueParameterNodeFactory.php b/rules/Generics/TagValueNodeFactory/MethodTagValueParameterNodeFactory.php index 2383ee6e0e2..22cd8e4d349 100644 --- a/rules/Generics/TagValueNodeFactory/MethodTagValueParameterNodeFactory.php +++ b/rules/Generics/TagValueNodeFactory/MethodTagValueParameterNodeFactory.php @@ -11,14 +11,9 @@ final class MethodTagValueParameterNodeFactory { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } public function createFromParamReflection(ParameterReflection $parameterReflection): MethodTagValueParameterNode diff --git a/rules/Generics/ValueObject/ChildParentClassReflections.php b/rules/Generics/ValueObject/ChildParentClassReflections.php index 0cdb11993e3..7e5ec56107d 100644 --- a/rules/Generics/ValueObject/ChildParentClassReflections.php +++ b/rules/Generics/ValueObject/ChildParentClassReflections.php @@ -9,20 +9,10 @@ final class ChildParentClassReflections { - /** - * @var ClassReflection - */ - private $childClassReflection; - - /** - * @var ClassReflection - */ - private $parentClassReflection; - - public function __construct(ClassReflection $childClassReflection, ClassReflection $parentClassReflection) - { - $this->childClassReflection = $childClassReflection; - $this->parentClassReflection = $parentClassReflection; + public function __construct( + private ClassReflection $childClassReflection, + private ClassReflection $parentClassReflection + ) { } public function getChildClassReflection(): ClassReflection diff --git a/rules/MockeryToProphecy/Collector/MockVariableCollector.php b/rules/MockeryToProphecy/Collector/MockVariableCollector.php index 9f2e79063ad..03581310517 100644 --- a/rules/MockeryToProphecy/Collector/MockVariableCollector.php +++ b/rules/MockeryToProphecy/Collector/MockVariableCollector.php @@ -15,20 +15,10 @@ final class MockVariableCollector { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - public function __construct(NodeNameResolver $nodeNameResolver, ValueResolver $valueResolver) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver + ) { } /** diff --git a/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php b/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php index ac782ae563b..7c222c67ef3 100644 --- a/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php +++ b/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php @@ -28,20 +28,10 @@ final class MockeryCreateMockToProphizeRector extends AbstractRector */ private $mockVariableTypesByNames = []; - /** - * @var MockVariableCollector - */ - private $mockVariableCollector; - - /** - * @var TestsNodeAnalyzer - */ - private $testsNodeAnalyzer; - - public function __construct(MockVariableCollector $mockVariableCollector, TestsNodeAnalyzer $testsNodeAnalyzer) - { - $this->mockVariableCollector = $mockVariableCollector; - $this->testsNodeAnalyzer = $testsNodeAnalyzer; + public function __construct( + private MockVariableCollector $mockVariableCollector, + private TestsNodeAnalyzer $testsNodeAnalyzer + ) { } /** diff --git a/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php b/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php index ffa58184c70..217413b1840 100644 --- a/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php +++ b/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php @@ -17,14 +17,9 @@ */ final class MockeryCloseRemoveRector extends AbstractRector { - /** - * @var TestsNodeAnalyzer - */ - private $testsNodeAnalyzer; - - public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer) - { - $this->testsNodeAnalyzer = $testsNodeAnalyzer; + public function __construct( + private TestsNodeAnalyzer $testsNodeAnalyzer + ) { } /** diff --git a/rules/Naming/ArrayDimFetchRenamer.php b/rules/Naming/ArrayDimFetchRenamer.php index 1fdb1a2a1a8..65ae1d55453 100644 --- a/rules/Naming/ArrayDimFetchRenamer.php +++ b/rules/Naming/ArrayDimFetchRenamer.php @@ -17,22 +17,10 @@ final class ArrayDimFetchRenamer { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeComparator $nodeComparator + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/Naming/Guard/BreakingVariableRenameGuard.php b/rules/Naming/Guard/BreakingVariableRenameGuard.php index 573fe2261e7..6536cfdb3ba 100644 --- a/rules/Naming/Guard/BreakingVariableRenameGuard.php +++ b/rules/Naming/Guard/BreakingVariableRenameGuard.php @@ -37,50 +37,14 @@ final class BreakingVariableRenameGuard */ private const AT_NAMING_REGEX = '#[\w+]At$#'; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ConflictingNameResolver - */ - private $conflictingNameResolver; - - /** - * @var OverridenExistingNamesResolver - */ - private $overridenExistingNamesResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - BetterNodeFinder $betterNodeFinder, - ConflictingNameResolver $conflictingNameResolver, - NodeTypeResolver $nodeTypeResolver, - OverridenExistingNamesResolver $overridenExistingNamesResolver, - TypeUnwrapper $typeUnwrapper, - NodeNameResolver $nodeNameResolver + private BetterNodeFinder $betterNodeFinder, + private ConflictingNameResolver $conflictingNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private OverridenExistingNamesResolver $overridenExistingNamesResolver, + private TypeUnwrapper $typeUnwrapper, + private NodeNameResolver $nodeNameResolver ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->conflictingNameResolver = $conflictingNameResolver; - $this->overridenExistingNamesResolver = $overridenExistingNamesResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeUnwrapper = $typeUnwrapper; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/rules/Naming/Guard/DateTimeAtNamingConventionGuard.php b/rules/Naming/Guard/DateTimeAtNamingConventionGuard.php index 2f2f1be5a6c..25a6f577c90 100644 --- a/rules/Naming/Guard/DateTimeAtNamingConventionGuard.php +++ b/rules/Naming/Guard/DateTimeAtNamingConventionGuard.php @@ -21,20 +21,10 @@ final class DateTimeAtNamingConventionGuard implements ConflictingNameGuardInter */ private const AT_NAMING_REGEX = '#[\w+]At$#'; - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - public function __construct(NodeTypeResolver $nodeTypeResolver, TypeUnwrapper $typeUnwrapper) - { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeUnwrapper = $typeUnwrapper; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private TypeUnwrapper $typeUnwrapper + ) { } /** diff --git a/rules/Naming/Guard/HasMagicGetSetGuard.php b/rules/Naming/Guard/HasMagicGetSetGuard.php index f038432f8f2..fb26baa1dce 100644 --- a/rules/Naming/Guard/HasMagicGetSetGuard.php +++ b/rules/Naming/Guard/HasMagicGetSetGuard.php @@ -11,14 +11,9 @@ final class HasMagicGetSetGuard implements ConflictingNameGuardInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/rules/Naming/Guard/PropertyConflictingNameGuard/BoolPropertyConflictingNameGuard.php b/rules/Naming/Guard/PropertyConflictingNameGuard/BoolPropertyConflictingNameGuard.php index 817b9b24a56..068648dc595 100644 --- a/rules/Naming/Guard/PropertyConflictingNameGuard/BoolPropertyConflictingNameGuard.php +++ b/rules/Naming/Guard/PropertyConflictingNameGuard/BoolPropertyConflictingNameGuard.php @@ -12,29 +12,11 @@ final class BoolPropertyConflictingNameGuard { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ArrayFilter - */ - private $arrayFilter; - - /** - * @var BoolPropertyExpectedNameResolver - */ - private $boolPropertyExpectedNameResolver; - public function __construct( - BoolPropertyExpectedNameResolver $boolPropertyExpectedNameResolver, - NodeNameResolver $nodeNameResolver, - ArrayFilter $arrayFilter + private BoolPropertyExpectedNameResolver $boolPropertyExpectedNameResolver, + private NodeNameResolver $nodeNameResolver, + private ArrayFilter $arrayFilter ) { - $this->boolPropertyExpectedNameResolver = $boolPropertyExpectedNameResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->arrayFilter = $arrayFilter; } public function isConflicting(PropertyRename $propertyRename): bool diff --git a/rules/Naming/Guard/PropertyConflictingNameGuard/MatchPropertyTypeConflictingNameGuard.php b/rules/Naming/Guard/PropertyConflictingNameGuard/MatchPropertyTypeConflictingNameGuard.php index 3d81461432c..6bce4d6bc2d 100644 --- a/rules/Naming/Guard/PropertyConflictingNameGuard/MatchPropertyTypeConflictingNameGuard.php +++ b/rules/Naming/Guard/PropertyConflictingNameGuard/MatchPropertyTypeConflictingNameGuard.php @@ -13,29 +13,11 @@ final class MatchPropertyTypeConflictingNameGuard { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ArrayFilter - */ - private $arrayFilter; - - /** - * @var MatchPropertyTypeExpectedNameResolver - */ - private $matchPropertyTypeExpectedNameResolver; - public function __construct( - MatchPropertyTypeExpectedNameResolver $matchPropertyTypeExpectedNameResolver, - NodeNameResolver $nodeNameResolver, - ArrayFilter $arrayFilter + private MatchPropertyTypeExpectedNameResolver $matchPropertyTypeExpectedNameResolver, + private NodeNameResolver $nodeNameResolver, + private ArrayFilter $arrayFilter ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->arrayFilter = $arrayFilter; - $this->matchPropertyTypeExpectedNameResolver = $matchPropertyTypeExpectedNameResolver; } /** diff --git a/rules/Naming/Guard/RamseyUuidInterfaceGuard.php b/rules/Naming/Guard/RamseyUuidInterfaceGuard.php index 30da9b16332..b933be288ee 100644 --- a/rules/Naming/Guard/RamseyUuidInterfaceGuard.php +++ b/rules/Naming/Guard/RamseyUuidInterfaceGuard.php @@ -12,14 +12,9 @@ final class RamseyUuidInterfaceGuard implements ConflictingNameGuardInterface { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } /** diff --git a/rules/Naming/Matcher/ForeachMatcher.php b/rules/Naming/Matcher/ForeachMatcher.php index 0bd01b2cc9d..d6ce76e52bf 100644 --- a/rules/Naming/Matcher/ForeachMatcher.php +++ b/rules/Naming/Matcher/ForeachMatcher.php @@ -16,29 +16,11 @@ final class ForeachMatcher { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var CallMatcher - */ - private $callMatcher; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeNameResolver $nodeNameResolver, - CallMatcher $callMatcher, - BetterNodeFinder $betterNodeFinder + private NodeNameResolver $nodeNameResolver, + private CallMatcher $callMatcher, + private BetterNodeFinder $betterNodeFinder ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->callMatcher = $callMatcher; - $this->betterNodeFinder = $betterNodeFinder; } public function match(Foreach_ $foreach): ?VariableAndCallForeach diff --git a/rules/Naming/Matcher/VariableAndCallAssignMatcher.php b/rules/Naming/Matcher/VariableAndCallAssignMatcher.php index 5e346a3ca28..834df13a672 100644 --- a/rules/Naming/Matcher/VariableAndCallAssignMatcher.php +++ b/rules/Naming/Matcher/VariableAndCallAssignMatcher.php @@ -17,29 +17,11 @@ final class VariableAndCallAssignMatcher { - /** - * @var CallMatcher - */ - private $callMatcher; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - CallMatcher $callMatcher, - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder + private CallMatcher $callMatcher, + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder ) { - $this->callMatcher = $callMatcher; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; } public function match(Assign $assign): ?VariableAndCallAssign diff --git a/rules/Naming/Naming/ConflictingNameResolver.php b/rules/Naming/Naming/ConflictingNameResolver.php index f2906cedee4..2be5a5a3745 100644 --- a/rules/Naming/Naming/ConflictingNameResolver.php +++ b/rules/Naming/Naming/ConflictingNameResolver.php @@ -21,43 +21,13 @@ final class ConflictingNameResolver */ private $conflictingVariableNamesByClassMethod = []; - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ArrayFilter - */ - private $arrayFilter; - - /** - * @var MatchParamTypeExpectedNameResolver - */ - private $matchParamTypeExpectedNameResolver; - public function __construct( - ArrayFilter $arrayFilter, - BetterNodeFinder $betterNodeFinder, - ExpectedNameResolver $expectedNameResolver, - NodeNameResolver $nodeNameResolver, - MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver + private ArrayFilter $arrayFilter, + private BetterNodeFinder $betterNodeFinder, + private ExpectedNameResolver $expectedNameResolver, + private NodeNameResolver $nodeNameResolver, + private MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver ) { - $this->expectedNameResolver = $expectedNameResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->arrayFilter = $arrayFilter; - $this->matchParamTypeExpectedNameResolver = $matchParamTypeExpectedNameResolver; } /** diff --git a/rules/Naming/Naming/ExpectedNameResolver.php b/rules/Naming/Naming/ExpectedNameResolver.php index 7ee0200e8f6..82fb0668894 100644 --- a/rules/Naming/Naming/ExpectedNameResolver.php +++ b/rules/Naming/Naming/ExpectedNameResolver.php @@ -28,36 +28,12 @@ final class ExpectedNameResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var MatchParamTypeExpectedNameResolver - */ - private $matchParamTypeExpectedNameResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - PropertyNaming $propertyNaming, - MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private PropertyNaming $propertyNaming, + private MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->propertyNaming = $propertyNaming; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->matchParamTypeExpectedNameResolver = $matchParamTypeExpectedNameResolver; } public function resolveForParamIfNotYet(Param $param): ?string diff --git a/rules/Naming/Naming/MethodNameResolver.php b/rules/Naming/Naming/MethodNameResolver.php index 1d1c37221d7..4c59459a5f6 100644 --- a/rules/Naming/Naming/MethodNameResolver.php +++ b/rules/Naming/Naming/MethodNameResolver.php @@ -9,14 +9,9 @@ final class MethodNameResolver { - /** - * @var VariableNaming - */ - private $variableNaming; - - public function __construct(VariableNaming $variableNaming) - { - $this->variableNaming = $variableNaming; + public function __construct( + private VariableNaming $variableNaming + ) { } public function resolveGetterFromReturnedExpr(Expr $expr): ?string diff --git a/rules/Naming/Naming/OverridenExistingNamesResolver.php b/rules/Naming/Naming/OverridenExistingNamesResolver.php index 43ca8eb0a6b..5415af01480 100644 --- a/rules/Naming/Naming/OverridenExistingNamesResolver.php +++ b/rules/Naming/Naming/OverridenExistingNamesResolver.php @@ -21,29 +21,11 @@ final class OverridenExistingNamesResolver */ private $overridenExistingVariableNamesByClassMethod = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ArrayFilter - */ - private $arrayFilter; - public function __construct( - ArrayFilter $arrayFilter, - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver + private ArrayFilter $arrayFilter, + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->arrayFilter = $arrayFilter; } /** diff --git a/rules/Naming/Naming/PropertyNaming.php b/rules/Naming/Naming/PropertyNaming.php index f74514aeece..c800b19f4bc 100644 --- a/rules/Naming/Naming/PropertyNaming.php +++ b/rules/Naming/Naming/PropertyNaming.php @@ -60,50 +60,14 @@ final class PropertyNaming */ private const GET_PREFIX_REGEX = '#^get(?[A-Z].+)#'; - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - /** - * @var RectorNamingInflector - */ - private $rectorNamingInflector; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - TypeUnwrapper $typeUnwrapper, - RectorNamingInflector $rectorNamingInflector, - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - ReflectionProvider $reflectionProvider + private TypeUnwrapper $typeUnwrapper, + private RectorNamingInflector $rectorNamingInflector, + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private ReflectionProvider $reflectionProvider ) { - $this->typeUnwrapper = $typeUnwrapper; - $this->rectorNamingInflector = $rectorNamingInflector; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->reflectionProvider = $reflectionProvider; } public function getExpectedNameFromMethodName(string $methodName): ?ExpectedName diff --git a/rules/Naming/Naming/VariableNaming.php b/rules/Naming/Naming/VariableNaming.php index 2eb0b7adcee..d75815822a5 100644 --- a/rules/Naming/Naming/VariableNaming.php +++ b/rules/Naming/Naming/VariableNaming.php @@ -28,29 +28,11 @@ final class VariableNaming { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver, - NodeTypeResolver $nodeTypeResolver + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver, + private NodeTypeResolver $nodeTypeResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; - $this->nodeTypeResolver = $nodeTypeResolver; } public function resolveFromNode(Node $node): ?string diff --git a/rules/Naming/NamingConvention/NamingConventionAnalyzer.php b/rules/Naming/NamingConvention/NamingConventionAnalyzer.php index c31ed0cdc47..ba8056875cd 100644 --- a/rules/Naming/NamingConvention/NamingConventionAnalyzer.php +++ b/rules/Naming/NamingConvention/NamingConventionAnalyzer.php @@ -13,14 +13,9 @@ final class NamingConventionAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Naming/NodeRenamer/MethodCallRenamer.php b/rules/Naming/NodeRenamer/MethodCallRenamer.php index b6c0608a2a7..0c8897c1003 100644 --- a/rules/Naming/NodeRenamer/MethodCallRenamer.php +++ b/rules/Naming/NodeRenamer/MethodCallRenamer.php @@ -11,14 +11,9 @@ final class MethodCallRenamer { - /** - * @var NodeRepository - */ - private $nodeRepository; - - public function __construct(NodeRepository $nodeRepository) - { - $this->nodeRepository = $nodeRepository; + public function __construct( + private NodeRepository $nodeRepository + ) { } public function updateClassMethodCalls(ClassMethod $classMethod, string $desiredMethodName): void diff --git a/rules/Naming/ParamRenamer/ParamRenamer.php b/rules/Naming/ParamRenamer/ParamRenamer.php index 84c83a8592b..f88de5c9f9a 100644 --- a/rules/Naming/ParamRenamer/ParamRenamer.php +++ b/rules/Naming/ParamRenamer/ParamRenamer.php @@ -11,22 +11,10 @@ final class ParamRenamer { - /** - * @var VariableRenamer - */ - private $variableRenamer; - - /** - * @var PropertyDocBlockManipulator - */ - private $propertyDocBlockManipulator; - public function __construct( - VariableRenamer $variableRenamer, - PropertyDocBlockManipulator $propertyDocBlockManipulator + private VariableRenamer $variableRenamer, + private PropertyDocBlockManipulator $propertyDocBlockManipulator ) { - $this->variableRenamer = $variableRenamer; - $this->propertyDocBlockManipulator = $propertyDocBlockManipulator; } public function rename(ParamRename $paramRename): void diff --git a/rules/Naming/PropertyRenamer/BoolPropertyRenamer.php b/rules/Naming/PropertyRenamer/BoolPropertyRenamer.php index b0877bd947e..ec7819219e7 100644 --- a/rules/Naming/PropertyRenamer/BoolPropertyRenamer.php +++ b/rules/Naming/PropertyRenamer/BoolPropertyRenamer.php @@ -10,22 +10,10 @@ final class BoolPropertyRenamer { - /** - * @var BoolPropertyConflictingNameGuard - */ - private $boolPropertyConflictingNameGuard; - - /** - * @var PropertyRenamer - */ - private $propertyRenamer; - public function __construct( - BoolPropertyConflictingNameGuard $boolPropertyConflictingNameGuard, - PropertyRenamer $propertyRenamer + private BoolPropertyConflictingNameGuard $boolPropertyConflictingNameGuard, + private PropertyRenamer $propertyRenamer ) { - $this->boolPropertyConflictingNameGuard = $boolPropertyConflictingNameGuard; - $this->propertyRenamer = $propertyRenamer; } public function rename(PropertyRename $propertyRename): ?Property diff --git a/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php b/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php index 3d037abcc7b..48da04168d2 100644 --- a/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php +++ b/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php @@ -10,22 +10,10 @@ final class MatchTypePropertyRenamer { - /** - * @var MatchPropertyTypeConflictingNameGuard - */ - private $matchPropertyTypeConflictingNameGuard; - - /** - * @var PropertyRenamer - */ - private $propertyRenamer; - public function __construct( - PropertyRenamer $propertyRenamer, - MatchPropertyTypeConflictingNameGuard $matchPropertyTypeConflictingNameGuard + private PropertyRenamer $propertyRenamer, + private MatchPropertyTypeConflictingNameGuard $matchPropertyTypeConflictingNameGuard ) { - $this->matchPropertyTypeConflictingNameGuard = $matchPropertyTypeConflictingNameGuard; - $this->propertyRenamer = $propertyRenamer; } public function rename(PropertyRename $propertyRename): ?Property diff --git a/rules/Naming/PropertyRenamer/PropertyFetchRenamer.php b/rules/Naming/PropertyRenamer/PropertyFetchRenamer.php index 5602a059da2..e2ed8907f7c 100644 --- a/rules/Naming/PropertyRenamer/PropertyFetchRenamer.php +++ b/rules/Naming/PropertyRenamer/PropertyFetchRenamer.php @@ -15,22 +15,10 @@ final class PropertyFetchRenamer { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; } public function renamePropertyFetchesInClass(ClassLike $classLike, string $currentName, string $expectedName): void diff --git a/rules/Naming/PropertyRenamer/PropertyRenamer.php b/rules/Naming/PropertyRenamer/PropertyRenamer.php index 834ca436084..f0bd3a5eeb8 100644 --- a/rules/Naming/PropertyRenamer/PropertyRenamer.php +++ b/rules/Naming/PropertyRenamer/PropertyRenamer.php @@ -11,22 +11,10 @@ final class PropertyRenamer { - /** - * @var PropertyFetchRenamer - */ - private $propertyFetchRenamer; - - /** - * @var PropertyRenameGuard - */ - private $propertyRenameGuard; - public function __construct( - PropertyRenameGuard $propertyRenameGuard, - PropertyFetchRenamer $propertyFetchRenamer + private PropertyRenameGuard $propertyRenameGuard, + private PropertyFetchRenamer $propertyFetchRenamer ) { - $this->propertyRenameGuard = $propertyRenameGuard; - $this->propertyFetchRenamer = $propertyFetchRenamer; } public function rename(PropertyRename $propertyRename): ?Property diff --git a/rules/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector.php b/rules/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector.php index 27723a1aa67..4d4c9c1a47f 100644 --- a/rules/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector.php +++ b/rules/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector.php @@ -32,71 +32,17 @@ */ final class RenameVariableToMatchMethodCallReturnTypeRector extends AbstractRector { - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - /** - * @var VariableRenamer - */ - private $variableRenamer; - - /** - * @var BreakingVariableRenameGuard - */ - private $breakingVariableRenameGuard; - - /** - * @var VariableAndCallAssignMatcher - */ - private $variableAndCallAssignMatcher; - - /** - * @var NamingConventionAnalyzer - */ - private $namingConventionAnalyzer; - - /** - * @var VarTagValueNodeRenamer - */ - private $varTagValueNodeRenamer; - - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var FamilyRelationsAnalyzer - */ - private $familyRelationsAnalyzer; - public function __construct( - BreakingVariableRenameGuard $breakingVariableRenameGuard, - ExpectedNameResolver $expectedNameResolver, - NamingConventionAnalyzer $namingConventionAnalyzer, - VarTagValueNodeRenamer $varTagValueNodeRenamer, - VariableAndCallAssignMatcher $variableAndCallAssignMatcher, - VariableRenamer $variableRenamer, - TypeUnwrapper $typeUnwrapper, - ReflectionProvider $reflectionProvider, - FamilyRelationsAnalyzer $familyRelationsAnalyzer + private BreakingVariableRenameGuard $breakingVariableRenameGuard, + private ExpectedNameResolver $expectedNameResolver, + private NamingConventionAnalyzer $namingConventionAnalyzer, + private VarTagValueNodeRenamer $varTagValueNodeRenamer, + private VariableAndCallAssignMatcher $variableAndCallAssignMatcher, + private VariableRenamer $variableRenamer, + private TypeUnwrapper $typeUnwrapper, + private ReflectionProvider $reflectionProvider, + private FamilyRelationsAnalyzer $familyRelationsAnalyzer ) { - $this->expectedNameResolver = $expectedNameResolver; - $this->variableRenamer = $variableRenamer; - $this->breakingVariableRenameGuard = $breakingVariableRenameGuard; - $this->variableAndCallAssignMatcher = $variableAndCallAssignMatcher; - $this->namingConventionAnalyzer = $namingConventionAnalyzer; - $this->varTagValueNodeRenamer = $varTagValueNodeRenamer; - $this->typeUnwrapper = $typeUnwrapper; - $this->reflectionProvider = $reflectionProvider; - $this->familyRelationsAnalyzer = $familyRelationsAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/ClassMethod/MakeGetterClassMethodNameStartWithGetRector.php b/rules/Naming/Rector/ClassMethod/MakeGetterClassMethodNameStartWithGetRector.php index 7a2df74bb8f..7ae299656af 100644 --- a/rules/Naming/Rector/ClassMethod/MakeGetterClassMethodNameStartWithGetRector.php +++ b/rules/Naming/Rector/ClassMethod/MakeGetterClassMethodNameStartWithGetRector.php @@ -27,20 +27,10 @@ final class MakeGetterClassMethodNameStartWithGetRector extends AbstractRector */ private const GETTER_NAME_PATTERN = '#^(is|should|has|was|must|get|provide|__)#'; - /** - * @var MethodNameResolver - */ - private $methodNameResolver; - - /** - * @var MethodCallRenamer - */ - private $methodCallRenamer; - - public function __construct(MethodNameResolver $methodNameResolver, MethodCallRenamer $methodCallRenamer) - { - $this->methodNameResolver = $methodNameResolver; - $this->methodCallRenamer = $methodCallRenamer; + public function __construct( + private MethodNameResolver $methodNameResolver, + private MethodCallRenamer $methodCallRenamer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/ClassMethod/MakeIsserClassMethodNameStartWithIsRector.php b/rules/Naming/Rector/ClassMethod/MakeIsserClassMethodNameStartWithIsRector.php index f8670be1765..3708e684ebe 100644 --- a/rules/Naming/Rector/ClassMethod/MakeIsserClassMethodNameStartWithIsRector.php +++ b/rules/Naming/Rector/ClassMethod/MakeIsserClassMethodNameStartWithIsRector.php @@ -28,20 +28,10 @@ final class MakeIsserClassMethodNameStartWithIsRector extends AbstractRector */ private const ISSER_NAME_REGEX = '#^(is|has|was|must|does|have|should|__)#'; - /** - * @var MethodNameResolver - */ - private $methodNameResolver; - - /** - * @var MethodCallRenamer - */ - private $methodCallRenamer; - - public function __construct(MethodNameResolver $methodNameResolver, MethodCallRenamer $methodCallRenamer) - { - $this->methodNameResolver = $methodNameResolver; - $this->methodCallRenamer = $methodCallRenamer; + public function __construct( + private MethodNameResolver $methodNameResolver, + private MethodCallRenamer $methodCallRenamer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector.php b/rules/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector.php index b47e7ee4f75..b8ec799b015 100644 --- a/rules/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector.php +++ b/rules/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector.php @@ -28,43 +28,13 @@ final class RenameParamToMatchTypeRector extends AbstractRector */ private $hasChanged = false; - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - /** - * @var BreakingVariableRenameGuard - */ - private $breakingVariableRenameGuard; - - /** - * @var ParamRenamer - */ - private $paramRenamer; - - /** - * @var ParamRenameFactory - */ - private $paramRenameFactory; - - /** - * @var MatchParamTypeExpectedNameResolver - */ - private $matchParamTypeExpectedNameResolver; - public function __construct( - BreakingVariableRenameGuard $breakingVariableRenameGuard, - ExpectedNameResolver $expectedNameResolver, - MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver, - ParamRenameFactory $paramRenameFactory, - ParamRenamer $paramRenamer + private BreakingVariableRenameGuard $breakingVariableRenameGuard, + private ExpectedNameResolver $expectedNameResolver, + private MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver, + private ParamRenameFactory $paramRenameFactory, + private ParamRenamer $paramRenamer ) { - $this->expectedNameResolver = $expectedNameResolver; - $this->breakingVariableRenameGuard = $breakingVariableRenameGuard; - $this->paramRenameFactory = $paramRenameFactory; - $this->paramRenamer = $paramRenamer; - $this->matchParamTypeExpectedNameResolver = $matchParamTypeExpectedNameResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector.php b/rules/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector.php index b06a3a2fd7f..7ff46cb95b3 100644 --- a/rules/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector.php +++ b/rules/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector.php @@ -21,29 +21,11 @@ */ final class RenameVariableToMatchNewTypeRector extends AbstractRector { - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - /** - * @var BreakingVariableRenameGuard - */ - private $breakingVariableRenameGuard; - - /** - * @var VariableRenamer - */ - private $variableRenamer; - public function __construct( - BreakingVariableRenameGuard $breakingVariableRenameGuard, - ExpectedNameResolver $expectedNameResolver, - VariableRenamer $variableRenamer + private BreakingVariableRenameGuard $breakingVariableRenameGuard, + private ExpectedNameResolver $expectedNameResolver, + private VariableRenamer $variableRenamer ) { - $this->expectedNameResolver = $expectedNameResolver; - $this->breakingVariableRenameGuard = $breakingVariableRenameGuard; - $this->variableRenamer = $variableRenamer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php b/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php index 1bde9378413..b3ad2c22cda 100644 --- a/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php +++ b/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php @@ -32,43 +32,13 @@ final class RenamePropertyToMatchTypeRector extends AbstractRector */ private $hasChanged = false; - /** - * @var PropertyRenameFactory - */ - private $propertyRenameFactory; - - /** - * @var MatchTypePropertyRenamer - */ - private $matchTypePropertyRenamer; - - /** - * @var MatchPropertyTypeExpectedNameResolver - */ - private $matchPropertyTypeExpectedNameResolver; - - /** - * @var MatchParamTypeExpectedNameResolver - */ - private $matchParamTypeExpectedNameResolver; - - /** - * @var PropertyFetchRenamer - */ - private $propertyFetchRenamer; - public function __construct( - MatchTypePropertyRenamer $matchTypePropertyRenamer, - PropertyRenameFactory $propertyRenameFactory, - MatchPropertyTypeExpectedNameResolver $matchPropertyTypeExpectedNameResolver, - MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver, - PropertyFetchRenamer $propertyFetchRenamer + private MatchTypePropertyRenamer $matchTypePropertyRenamer, + private PropertyRenameFactory $propertyRenameFactory, + private MatchPropertyTypeExpectedNameResolver $matchPropertyTypeExpectedNameResolver, + private MatchParamTypeExpectedNameResolver $matchParamTypeExpectedNameResolver, + private PropertyFetchRenamer $propertyFetchRenamer ) { - $this->propertyRenameFactory = $propertyRenameFactory; - $this->matchTypePropertyRenamer = $matchTypePropertyRenamer; - $this->matchPropertyTypeExpectedNameResolver = $matchPropertyTypeExpectedNameResolver; - $this->matchParamTypeExpectedNameResolver = $matchParamTypeExpectedNameResolver; - $this->propertyFetchRenamer = $propertyFetchRenamer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php index ecac4dd9345..1ea748a8e16 100644 --- a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php +++ b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php @@ -21,20 +21,10 @@ */ final class RenameForeachValueVariableToMatchExprVariableRector extends AbstractRector { - /** - * @var InflectorSingularResolver - */ - private $inflectorSingularResolver; - - /** - * @var ForeachAnalyzer - */ - private $foreachAnalyzer; - - public function __construct(InflectorSingularResolver $inflectorSingularResolver, ForeachAnalyzer $foreachAnalyzer) - { - $this->inflectorSingularResolver = $inflectorSingularResolver; - $this->foreachAnalyzer = $foreachAnalyzer; + public function __construct( + private InflectorSingularResolver $inflectorSingularResolver, + private ForeachAnalyzer $foreachAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php index 023063a99c4..e99d03d5671 100644 --- a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php +++ b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php @@ -21,43 +21,13 @@ */ final class RenameForeachValueVariableToMatchMethodCallReturnTypeRector extends AbstractRector { - /** - * @var ExpectedNameResolver - */ - private $expectedNameResolver; - - /** - * @var VariableRenamer - */ - private $variableRenamer; - - /** - * @var ForeachMatcher - */ - private $varValueAndCallForeachMatcher; - - /** - * @var BreakingVariableRenameGuard - */ - private $breakingVariableRenameGuard; - - /** - * @var NamingConventionAnalyzer - */ - private $namingConventionAnalyzer; - public function __construct( - BreakingVariableRenameGuard $breakingVariableRenameGuard, - ExpectedNameResolver $expectedNameResolver, - NamingConventionAnalyzer $namingConventionAnalyzer, - VariableRenamer $variableRenamer, - ForeachMatcher $foreachMatcher + private BreakingVariableRenameGuard $breakingVariableRenameGuard, + private ExpectedNameResolver $expectedNameResolver, + private NamingConventionAnalyzer $namingConventionAnalyzer, + private VariableRenamer $variableRenamer, + private ForeachMatcher $varValueAndCallForeachMatcher ) { - $this->expectedNameResolver = $expectedNameResolver; - $this->variableRenamer = $variableRenamer; - $this->breakingVariableRenameGuard = $breakingVariableRenameGuard; - $this->namingConventionAnalyzer = $namingConventionAnalyzer; - $this->varValueAndCallForeachMatcher = $foreachMatcher; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/Rector/Property/MakeBoolPropertyRespectIsHasWasMethodNamingRector.php b/rules/Naming/Rector/Property/MakeBoolPropertyRespectIsHasWasMethodNamingRector.php index 9da54594b3d..c0e7b19048f 100644 --- a/rules/Naming/Rector/Property/MakeBoolPropertyRespectIsHasWasMethodNamingRector.php +++ b/rules/Naming/Rector/Property/MakeBoolPropertyRespectIsHasWasMethodNamingRector.php @@ -20,29 +20,11 @@ */ final class MakeBoolPropertyRespectIsHasWasMethodNamingRector extends AbstractRector { - /** - * @var PropertyRenameFactory - */ - private $propertyRenameFactory; - - /** - * @var BoolPropertyRenamer - */ - private $boolPropertyRenamer; - - /** - * @var BoolPropertyExpectedNameResolver - */ - private $boolPropertyExpectedNameResolver; - public function __construct( - BoolPropertyRenamer $boolPropertyRenamer, - PropertyRenameFactory $propertyRenameFactory, - BoolPropertyExpectedNameResolver $boolPropertyExpectedNameResolver + private BoolPropertyRenamer $boolPropertyRenamer, + private PropertyRenameFactory $propertyRenameFactory, + private BoolPropertyExpectedNameResolver $boolPropertyExpectedNameResolver ) { - $this->propertyRenameFactory = $propertyRenameFactory; - $this->boolPropertyRenamer = $boolPropertyRenamer; - $this->boolPropertyExpectedNameResolver = $boolPropertyExpectedNameResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Naming/RectorNamingInflector.php b/rules/Naming/RectorNamingInflector.php index 8be27ca38d2..d29dc7b6c5c 100644 --- a/rules/Naming/RectorNamingInflector.php +++ b/rules/Naming/RectorNamingInflector.php @@ -15,14 +15,9 @@ final class RectorNamingInflector */ private const DATA_INFO_SUFFIX_REGEX = '#^(?.+)(?Data|Info)$#'; - /** - * @var Inflector - */ - private $inflector; - - public function __construct(Inflector $inflector) - { - $this->inflector = $inflector; + public function __construct( + private Inflector $inflector + ) { } public function singularize(string $name): string diff --git a/rules/Naming/RenameGuard/PropertyRenameGuard.php b/rules/Naming/RenameGuard/PropertyRenameGuard.php index 6b534780667..574280e20d0 100644 --- a/rules/Naming/RenameGuard/PropertyRenameGuard.php +++ b/rules/Naming/RenameGuard/PropertyRenameGuard.php @@ -9,17 +9,12 @@ final class PropertyRenameGuard { - /** - * @var ConflictingNameGuardInterface[] - */ - private $conflictingNameGuards = []; - /** * @param ConflictingNameGuardInterface[] $conflictingNameGuards */ - public function __construct(array $conflictingNameGuards) - { - $this->conflictingNameGuards = $conflictingNameGuards; + public function __construct( + private array $conflictingNameGuards + ) { } public function shouldSkip(RenameValueObjectInterface $renameValueObject): bool diff --git a/rules/Naming/ValueObject/ExpectedName.php b/rules/Naming/ValueObject/ExpectedName.php index 911326629a4..e041d2414ce 100644 --- a/rules/Naming/ValueObject/ExpectedName.php +++ b/rules/Naming/ValueObject/ExpectedName.php @@ -6,20 +6,10 @@ final class ExpectedName { - /** - * @var string - */ - private $name; - - /** - * @var string - */ - private $singularized; - - public function __construct(string $name, string $singularized) - { - $this->name = $name; - $this->singularized = $singularized; + public function __construct( + private string $name, + private string $singularized + ) { } public function getName(): string diff --git a/rules/Naming/ValueObject/ParamRename.php b/rules/Naming/ValueObject/ParamRename.php index 400c18799d5..66c870e25a8 100644 --- a/rules/Naming/ValueObject/ParamRename.php +++ b/rules/Naming/ValueObject/ParamRename.php @@ -14,46 +14,16 @@ final class ParamRename implements RenameParamValueObjectInterface { - /** - * @var string - */ - private $expectedName; - - /** - * @var string - */ - private $currentName; - - /** - * @var Param - */ - private $param; - - /** - * @var Variable - */ - private $variable; - - /** - * @var ClassMethod|Function_|Closure - */ - private $functionLike; - /** * @param ClassMethod|Function_|Closure $functionLike */ public function __construct( - string $currentName, - string $expectedName, - Param $param, - Variable $variable, - FunctionLike $functionLike + private string $currentName, + private string $expectedName, + private Param $param, + private Variable $variable, + private FunctionLike $functionLike ) { - $this->param = $param; - $this->variable = $variable; - $this->expectedName = $expectedName; - $this->currentName = $currentName; - $this->functionLike = $functionLike; } public function getCurrentName(): string diff --git a/rules/Naming/ValueObject/PropertyRename.php b/rules/Naming/ValueObject/PropertyRename.php index 393cf11aa0e..caff1bf3131 100644 --- a/rules/Naming/ValueObject/PropertyRename.php +++ b/rules/Naming/ValueObject/PropertyRename.php @@ -11,50 +11,14 @@ final class PropertyRename implements RenamePropertyValueObjectInterface { - /** - * @var string - */ - private $expectedName; - - /** - * @var string - */ - private $currentName; - - /** - * @var string - */ - private $classLikeName; - - /** - * @var Property - */ - private $property; - - /** - * @var ClassLike - */ - private $classLike; - - /** - * @var PropertyProperty - */ - private $propertyProperty; - public function __construct( - Property $property, - string $expectedName, - string $currentName, - ClassLike $classLike, - string $classLikeName, - PropertyProperty $propertyProperty + private Property $property, + private string $expectedName, + private string $currentName, + private ClassLike $classLike, + private string $classLikeName, + private PropertyProperty $propertyProperty ) { - $this->property = $property; - $this->expectedName = $expectedName; - $this->currentName = $currentName; - $this->classLike = $classLike; - $this->classLikeName = $classLikeName; - $this->propertyProperty = $propertyProperty; } public function getProperty(): Property diff --git a/rules/Naming/ValueObject/VariableAndCallAssign.php b/rules/Naming/ValueObject/VariableAndCallAssign.php index 73e2f9ef194..3a402b292df 100644 --- a/rules/Naming/ValueObject/VariableAndCallAssign.php +++ b/rules/Naming/ValueObject/VariableAndCallAssign.php @@ -18,46 +18,16 @@ final class VariableAndCallAssign { /** - * @var string - */ - private $variableName; - - /** - * @var Variable - */ - private $variable; - - /** - * @var Assign - */ - private $assign; - - /** - * @var FuncCall|MethodCall|StaticCall - */ - private $call; - - /** - * @var ClassMethod|Function_|Closure - */ - private $functionLike; - - /** - * @param FuncCall|StaticCall|MethodCall $expr + * @param FuncCall|StaticCall|MethodCall $call * @param ClassMethod|Function_|Closure $functionLike */ public function __construct( - Variable $variable, - Expr $expr, - Assign $assign, - string $variableName, - FunctionLike $functionLike + private Variable $variable, + private Expr $call, + private Assign $assign, + private string $variableName, + private FunctionLike $functionLike ) { - $this->variable = $variable; - $this->call = $expr; - $this->variableName = $variableName; - $this->functionLike = $functionLike; - $this->assign = $assign; } public function getVariable(): Variable diff --git a/rules/Naming/ValueObject/VariableAndCallForeach.php b/rules/Naming/ValueObject/VariableAndCallForeach.php index cd87cd8758b..169fbafb317 100644 --- a/rules/Naming/ValueObject/VariableAndCallForeach.php +++ b/rules/Naming/ValueObject/VariableAndCallForeach.php @@ -17,35 +17,15 @@ final class VariableAndCallForeach { /** - * @var string - */ - private $variableName; - - /** - * @var Variable - */ - private $variable; - - /** - * @var FuncCall|MethodCall|StaticCall - */ - private $call; - - /** - * @var ClassMethod|Function_|Closure - */ - private $functionLike; - - /** - * @param FuncCall|StaticCall|MethodCall $expr + * @param FuncCall|StaticCall|MethodCall $call * @param ClassMethod|Function_|Closure $functionLike */ - public function __construct(Variable $variable, Expr $expr, string $variableName, FunctionLike $functionLike) - { - $this->variable = $variable; - $this->call = $expr; - $this->variableName = $variableName; - $this->functionLike = $functionLike; + public function __construct( + private Variable $variable, + private Expr $call, + private string $variableName, + private FunctionLike $functionLike + ) { } public function getVariable(): Variable diff --git a/rules/Naming/ValueObjectFactory/ParamRenameFactory.php b/rules/Naming/ValueObjectFactory/ParamRenameFactory.php index ff4fe77ee4e..81beb827db3 100644 --- a/rules/Naming/ValueObjectFactory/ParamRenameFactory.php +++ b/rules/Naming/ValueObjectFactory/ParamRenameFactory.php @@ -17,20 +17,10 @@ final class ParamRenameFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder + ) { } public function createFromResolvedExpectedName(Param $param, string $expectedName): ?ParamRename diff --git a/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php b/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php index 1bbb935365c..277311c1769 100644 --- a/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php +++ b/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php @@ -15,14 +15,9 @@ */ final class PropertyRenameFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function createFromExpectedName(Property $property, string $expectedName): ?PropertyRename diff --git a/rules/Naming/VariableRenamer.php b/rules/Naming/VariableRenamer.php index ab48beb050a..df82dee40f5 100644 --- a/rules/Naming/VariableRenamer.php +++ b/rules/Naming/VariableRenamer.php @@ -22,43 +22,13 @@ final class VariableRenamer { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var VarTagValueNodeRenamer - */ - private $varTagValueNodeRenamer; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - VarTagValueNodeRenamer $varTagValueNodeRenamer, - PhpDocInfoFactory $phpDocInfoFactory, - BetterNodeFinder $betterNodeFinder + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private VarTagValueNodeRenamer $varTagValueNodeRenamer, + private PhpDocInfoFactory $phpDocInfoFactory, + private BetterNodeFinder $betterNodeFinder ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; - $this->varTagValueNodeRenamer = $varTagValueNodeRenamer; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->betterNodeFinder = $betterNodeFinder; } /** diff --git a/rules/Order/Rector/Class_/OrderClassConstantsByIntegerValueRector.php b/rules/Order/Rector/Class_/OrderClassConstantsByIntegerValueRector.php index 56ede2ea49e..c7a2ac932e7 100644 --- a/rules/Order/Rector/Class_/OrderClassConstantsByIntegerValueRector.php +++ b/rules/Order/Rector/Class_/OrderClassConstantsByIntegerValueRector.php @@ -19,20 +19,10 @@ */ final class OrderClassConstantsByIntegerValueRector extends AbstractRector { - /** - * @var OrderChangeAnalyzer - */ - private $orderChangeAnalyzer; - - /** - * @var StmtOrder - */ - private $stmtOrder; - - public function __construct(OrderChangeAnalyzer $orderChangeAnalyzer, StmtOrder $stmtOrder) - { - $this->orderChangeAnalyzer = $orderChangeAnalyzer; - $this->stmtOrder = $stmtOrder; + public function __construct( + private OrderChangeAnalyzer $orderChangeAnalyzer, + private StmtOrder $stmtOrder + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Order/Rector/Class_/OrderConstantsByVisibilityRector.php b/rules/Order/Rector/Class_/OrderConstantsByVisibilityRector.php index 9df29d0b675..6e7c7d83bef 100644 --- a/rules/Order/Rector/Class_/OrderConstantsByVisibilityRector.php +++ b/rules/Order/Rector/Class_/OrderConstantsByVisibilityRector.php @@ -19,29 +19,11 @@ */ final class OrderConstantsByVisibilityRector extends AbstractRector { - /** - * @var OrderChangeAnalyzer - */ - private $orderChangeAnalyzer; - - /** - * @var StmtOrder - */ - private $stmtOrder; - - /** - * @var StmtVisibilitySorter - */ - private $stmtVisibilitySorter; - public function __construct( - OrderChangeAnalyzer $orderChangeAnalyzer, - StmtOrder $stmtOrder, - StmtVisibilitySorter $stmtVisibilitySorter + private OrderChangeAnalyzer $orderChangeAnalyzer, + private StmtOrder $stmtOrder, + private StmtVisibilitySorter $stmtVisibilitySorter ) { - $this->orderChangeAnalyzer = $orderChangeAnalyzer; - $this->stmtOrder = $stmtOrder; - $this->stmtVisibilitySorter = $stmtVisibilitySorter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Order/Rector/Class_/OrderMethodsByVisibilityRector.php b/rules/Order/Rector/Class_/OrderMethodsByVisibilityRector.php index 80fecce7dc5..587263e42da 100644 --- a/rules/Order/Rector/Class_/OrderMethodsByVisibilityRector.php +++ b/rules/Order/Rector/Class_/OrderMethodsByVisibilityRector.php @@ -48,29 +48,11 @@ final class OrderMethodsByVisibilityRector extends AbstractRector MethodName::TEAR_DOWN, ]; - /** - * @var OrderChangeAnalyzer - */ - private $orderChangeAnalyzer; - - /** - * @var StmtOrder - */ - private $stmtOrder; - - /** - * @var StmtVisibilitySorter - */ - private $stmtVisibilitySorter; - public function __construct( - OrderChangeAnalyzer $orderChangeAnalyzer, - StmtOrder $stmtOrder, - StmtVisibilitySorter $stmtVisibilitySorter + private OrderChangeAnalyzer $orderChangeAnalyzer, + private StmtOrder $stmtOrder, + private StmtVisibilitySorter $stmtVisibilitySorter ) { - $this->orderChangeAnalyzer = $orderChangeAnalyzer; - $this->stmtOrder = $stmtOrder; - $this->stmtVisibilitySorter = $stmtVisibilitySorter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php b/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php index c5442ab7955..9c6a8c657ea 100644 --- a/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php +++ b/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php @@ -27,14 +27,9 @@ final class OrderPrivateMethodsByUseRector extends AbstractRector */ private const MAX_ATTEMPTS = 5; - /** - * @var StmtOrder - */ - private $stmtOrder; - - public function __construct(StmtOrder $stmtOrder) - { - $this->stmtOrder = $stmtOrder; + public function __construct( + private StmtOrder $stmtOrder + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Order/Rector/Class_/OrderPropertiesByVisibilityRector.php b/rules/Order/Rector/Class_/OrderPropertiesByVisibilityRector.php index 5ac7c66b261..10ce9873966 100644 --- a/rules/Order/Rector/Class_/OrderPropertiesByVisibilityRector.php +++ b/rules/Order/Rector/Class_/OrderPropertiesByVisibilityRector.php @@ -20,29 +20,11 @@ */ final class OrderPropertiesByVisibilityRector extends AbstractRector { - /** - * @var OrderChangeAnalyzer - */ - private $orderChangeAnalyzer; - - /** - * @var StmtOrder - */ - private $stmtOrder; - - /** - * @var StmtVisibilitySorter - */ - private $stmtVisibilitySorter; - public function __construct( - OrderChangeAnalyzer $orderChangeAnalyzer, - StmtOrder $stmtOrder, - StmtVisibilitySorter $stmtVisibilitySorter + private OrderChangeAnalyzer $orderChangeAnalyzer, + private StmtOrder $stmtOrder, + private StmtVisibilitySorter $stmtVisibilitySorter ) { - $this->orderChangeAnalyzer = $orderChangeAnalyzer; - $this->stmtOrder = $stmtOrder; - $this->stmtVisibilitySorter = $stmtVisibilitySorter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Order/StmtOrder.php b/rules/Order/StmtOrder.php index 4c63aa6032f..284bc11c00f 100644 --- a/rules/Order/StmtOrder.php +++ b/rules/Order/StmtOrder.php @@ -13,14 +13,9 @@ */ final class StmtOrder { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Order/StmtVisibilitySorter.php b/rules/Order/StmtVisibilitySorter.php index a59cdeac5da..f0b3032878f 100644 --- a/rules/Order/StmtVisibilitySorter.php +++ b/rules/Order/StmtVisibilitySorter.php @@ -20,14 +20,9 @@ final class StmtVisibilitySorter { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Order/ValueObject/ClassConstRankeable.php b/rules/Order/ValueObject/ClassConstRankeable.php index 5892e381333..c994c69f0c1 100644 --- a/rules/Order/ValueObject/ClassConstRankeable.php +++ b/rules/Order/ValueObject/ClassConstRankeable.php @@ -8,26 +8,11 @@ final class ClassConstRankeable implements RankeableInterface { - /** - * @var string - */ - private $name; - - /** - * @var int - */ - private $visibility; - - /** - * @var int - */ - private $position; - - public function __construct(string $name, int $visibility, int $position) - { - $this->name = $name; - $this->visibility = $visibility; - $this->position = $position; + public function __construct( + private string $name, + private int $visibility, + private int $position + ) { } public function getName(): string diff --git a/rules/Order/ValueObject/ClassMethodRankeable.php b/rules/Order/ValueObject/ClassMethodRankeable.php index b184e6c232f..52859e5c54d 100644 --- a/rules/Order/ValueObject/ClassMethodRankeable.php +++ b/rules/Order/ValueObject/ClassMethodRankeable.php @@ -9,32 +9,12 @@ final class ClassMethodRankeable implements RankeableInterface { - /** - * @var string - */ - private $name; - - /** - * @var int - */ - private $visibility; - - /** - * @var int - */ - private $position; - - /** - * @var ClassMethod - */ - private $classMethod; - - public function __construct(string $name, int $visibility, int $position, ClassMethod $classMethod) - { - $this->name = $name; - $this->visibility = $visibility; - $this->position = $position; - $this->classMethod = $classMethod; + public function __construct( + private string $name, + private int $visibility, + private int $position, + private ClassMethod $classMethod + ) { } public function getName(): string diff --git a/rules/Order/ValueObject/PropertyRankeable.php b/rules/Order/ValueObject/PropertyRankeable.php index b572d27dcff..8d07e469091 100644 --- a/rules/Order/ValueObject/PropertyRankeable.php +++ b/rules/Order/ValueObject/PropertyRankeable.php @@ -9,32 +9,12 @@ final class PropertyRankeable implements RankeableInterface { - /** - * @var string - */ - private $name; - - /** - * @var int - */ - private $visibility; - - /** - * @var int - */ - private $position; - - /** - * @var Property - */ - private $property; - - public function __construct(string $name, int $visibility, Property $property, int $position) - { - $this->name = $name; - $this->visibility = $visibility; - $this->property = $property; - $this->position = $position; + public function __construct( + private string $name, + private int $visibility, + private Property $property, + private int $position + ) { } public function getName(): string diff --git a/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php b/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php index 14014eb6dcd..e078dc01d9b 100644 --- a/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php +++ b/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php @@ -6,24 +6,14 @@ final class SortedClassMethodsAndOriginalClassMethods { - /** - * @var array - */ - private $sortedClassMethods = []; - - /** - * @var array - */ - private $originalClassMethods = []; - /** * @param array $sortedClassMethods * @param array $originalClassMethods */ - public function __construct(array $sortedClassMethods, array $originalClassMethods) - { - $this->sortedClassMethods = $sortedClassMethods; - $this->originalClassMethods = $originalClassMethods; + public function __construct( + private array $sortedClassMethods, + private array $originalClassMethods + ) { } /** diff --git a/rules/PHPOffice/ValueObject/ConditionalSetValue.php b/rules/PHPOffice/ValueObject/ConditionalSetValue.php index 511f826c1f8..52fa248fe02 100644 --- a/rules/PHPOffice/ValueObject/ConditionalSetValue.php +++ b/rules/PHPOffice/ValueObject/ConditionalSetValue.php @@ -6,43 +6,13 @@ final class ConditionalSetValue { - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newGetMethod; - - /** - * @var int - */ - private $argPosition; - - /** - * @var string - */ - private $newSetMethod; - - /** - * @var bool - */ - private $hasRow = false; - public function __construct( - string $oldMethod, - string $newGetMethod, - string $newSetMethod, - int $argPosition, - bool $hasRow + private string $oldMethod, + private string $newGetMethod, + private string $newSetMethod, + private int $argPosition, + private bool $hasRow ) { - $this->oldMethod = $oldMethod; - $this->newGetMethod = $newGetMethod; - $this->argPosition = $argPosition; - $this->newSetMethod = $newSetMethod; - $this->hasRow = $hasRow; } public function getOldMethod(): string diff --git a/rules/PSR4/Collector/RenamedClassesCollector.php b/rules/PSR4/Collector/RenamedClassesCollector.php index c114db3750b..025440a3733 100644 --- a/rules/PSR4/Collector/RenamedClassesCollector.php +++ b/rules/PSR4/Collector/RenamedClassesCollector.php @@ -16,14 +16,9 @@ final class RenamedClassesCollector */ private $oldToNewClass = []; - /** - * @var RenamedClassesDataCollector - */ - private $renamedClassesDataCollector; - - public function __construct(RenamedClassesDataCollector $renamedClassesDataCollector) - { - $this->renamedClassesDataCollector = $renamedClassesDataCollector; + public function __construct( + private RenamedClassesDataCollector $renamedClassesDataCollector + ) { } public function addClassRename(string $oldClass, string $newClass): void diff --git a/rules/PSR4/Composer/PSR4AutoloadPathsProvider.php b/rules/PSR4/Composer/PSR4AutoloadPathsProvider.php index c97043bca1b..f5b04832b4d 100644 --- a/rules/PSR4/Composer/PSR4AutoloadPathsProvider.php +++ b/rules/PSR4/Composer/PSR4AutoloadPathsProvider.php @@ -14,14 +14,9 @@ final class PSR4AutoloadPathsProvider */ private $cachedComposerJsonPSR4AutoloadPaths = []; - /** - * @var JsonFileSystem - */ - private $jsonFileSystem; - - public function __construct(JsonFileSystem $jsonFileSystem) - { - $this->jsonFileSystem = $jsonFileSystem; + public function __construct( + private JsonFileSystem $jsonFileSystem + ) { } /** diff --git a/rules/PSR4/Composer/PSR4NamespaceMatcher.php b/rules/PSR4/Composer/PSR4NamespaceMatcher.php index e0ae94af191..fda2feafe78 100644 --- a/rules/PSR4/Composer/PSR4NamespaceMatcher.php +++ b/rules/PSR4/Composer/PSR4NamespaceMatcher.php @@ -12,14 +12,9 @@ final class PSR4NamespaceMatcher implements PSR4AutoloadNamespaceMatcherInterface { - /** - * @var PSR4AutoloadPathsProvider - */ - private $psr4AutoloadPathsProvider; - - public function __construct(PSR4AutoloadPathsProvider $psr4AutoloadPathsProvider) - { - $this->psr4AutoloadPathsProvider = $psr4AutoloadPathsProvider; + public function __construct( + private PSR4AutoloadPathsProvider $psr4AutoloadPathsProvider + ) { } public function getExpectedNamespace(File $file, Node $node): ?string diff --git a/rules/PSR4/FileInfoAnalyzer/FileInfoDeletionAnalyzer.php b/rules/PSR4/FileInfoAnalyzer/FileInfoDeletionAnalyzer.php index 726aa32b1bd..5fd04c13b66 100644 --- a/rules/PSR4/FileInfoAnalyzer/FileInfoDeletionAnalyzer.php +++ b/rules/PSR4/FileInfoAnalyzer/FileInfoDeletionAnalyzer.php @@ -18,20 +18,10 @@ final class FileInfoDeletionAnalyzer */ private const TESTING_PREFIX_REGEX = '#input_(.*?)_#'; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ClassNaming - */ - private $classNaming; - - public function __construct(NodeNameResolver $nodeNameResolver, ClassNaming $classNaming) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->classNaming = $classNaming; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private ClassNaming $classNaming + ) { } public function isClassLikeAndFileInfoMatch(File $file, ClassLike $classLike): bool diff --git a/rules/PSR4/FileRelocationResolver.php b/rules/PSR4/FileRelocationResolver.php index 7491aa73932..0326dcf1c6b 100644 --- a/rules/PSR4/FileRelocationResolver.php +++ b/rules/PSR4/FileRelocationResolver.php @@ -20,14 +20,9 @@ final class FileRelocationResolver */ private const NAMESPACE_SEPARATOR = '\\'; - /** - * @var FileInfoDeletionAnalyzer - */ - private $fileInfoDeletionAnalyzer; - - public function __construct(FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer) - { - $this->fileInfoDeletionAnalyzer = $fileInfoDeletionAnalyzer; + public function __construct( + private FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer + ) { } /** diff --git a/rules/PSR4/NodeManipulator/FullyQualifyStmtsAnalyzer.php b/rules/PSR4/NodeManipulator/FullyQualifyStmtsAnalyzer.php index 86a17b6c269..50568080346 100644 --- a/rules/PSR4/NodeManipulator/FullyQualifyStmtsAnalyzer.php +++ b/rules/PSR4/NodeManipulator/FullyQualifyStmtsAnalyzer.php @@ -19,36 +19,12 @@ final class FullyQualifyStmtsAnalyzer { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - ParameterProvider $parameterProvider, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private ParameterProvider $parameterProvider, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->parameterProvider = $parameterProvider; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/rules/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector.php b/rules/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector.php index 7e19f98cb06..100f497b3cc 100644 --- a/rules/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector.php +++ b/rules/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector.php @@ -21,22 +21,10 @@ */ final class NormalizeNamespaceByPSR4ComposerAutoloadRector extends AbstractRector { - /** - * @var PSR4AutoloadNamespaceMatcherInterface - */ - private $psr4AutoloadNamespaceMatcher; - - /** - * @var FullyQualifyStmtsAnalyzer - */ - private $fullyQualifyStmtsAnalyzer; - public function __construct( - PSR4AutoloadNamespaceMatcherInterface $psr4AutoloadNamespaceMatcher, - FullyQualifyStmtsAnalyzer $fullyQualifyStmtsAnalyzer + private PSR4AutoloadNamespaceMatcherInterface $psr4AutoloadNamespaceMatcher, + private FullyQualifyStmtsAnalyzer $fullyQualifyStmtsAnalyzer ) { - $this->psr4AutoloadNamespaceMatcher = $psr4AutoloadNamespaceMatcher; - $this->fullyQualifyStmtsAnalyzer = $fullyQualifyStmtsAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php b/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php index 9adefd08fa3..4c3db7988f0 100644 --- a/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php +++ b/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php @@ -22,22 +22,10 @@ */ final class MultipleClassFileToPsr4ClassesRector extends AbstractRector { - /** - * @var NamespaceManipulator - */ - private $namespaceManipulator; - - /** - * @var FileInfoDeletionAnalyzer - */ - private $fileInfoDeletionAnalyzer; - public function __construct( - NamespaceManipulator $namespaceManipulator, - FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer + private NamespaceManipulator $namespaceManipulator, + private FileInfoDeletionAnalyzer $fileInfoDeletionAnalyzer ) { - $this->namespaceManipulator = $namespaceManipulator; - $this->fileInfoDeletionAnalyzer = $fileInfoDeletionAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php55/NodeFactory/AnonymousFunctionNodeFactory.php b/rules/Php55/NodeFactory/AnonymousFunctionNodeFactory.php index 368facbae15..615b9da8954 100644 --- a/rules/Php55/NodeFactory/AnonymousFunctionNodeFactory.php +++ b/rules/Php55/NodeFactory/AnonymousFunctionNodeFactory.php @@ -27,20 +27,10 @@ final class AnonymousFunctionNodeFactory */ private const DIM_FETCH_REGEX = '#(\\$|\\\\|\\x0)(?\d+)#'; - /** - * @var Parser - */ - private $parser; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, Parser $parser) - { - $this->parser = $parser; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; + public function __construct( + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private Parser $parser + ) { } public function createAnonymousFunctionFromString(Expr $expr): ?Closure diff --git a/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php b/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php index 32ab890913d..8a6875f3ad0 100644 --- a/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php +++ b/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php @@ -22,20 +22,10 @@ */ final class PregReplaceEModifierRector extends AbstractRector { - /** - * @var RegexMatcher - */ - private $regexMatcher; - - /** - * @var AnonymousFunctionNodeFactory - */ - private $anonymousFunctionNodeFactory; - - public function __construct(AnonymousFunctionNodeFactory $anonymousFunctionNodeFactory, RegexMatcher $regexMatcher) - { - $this->regexMatcher = $regexMatcher; - $this->anonymousFunctionNodeFactory = $anonymousFunctionNodeFactory; + public function __construct( + private AnonymousFunctionNodeFactory $anonymousFunctionNodeFactory, + private RegexMatcher $regexMatcher + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php index 6f05936a3ba..f428ff587e3 100644 --- a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php +++ b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php @@ -42,14 +42,9 @@ final class StringClassNameToClassConstantRector extends AbstractRector implemen 'Exception', ]; - /** - * @var ClassLikeExistenceChecker - */ - private $classLikeExistenceChecker; - - public function __construct(ClassLikeExistenceChecker $classLikeExistenceChecker) - { - $this->classLikeExistenceChecker = $classLikeExistenceChecker; + public function __construct( + private ClassLikeExistenceChecker $classLikeExistenceChecker + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php55/RegexMatcher.php b/rules/Php55/RegexMatcher.php index 4984dc01292..8aaa5db3f9e 100644 --- a/rules/Php55/RegexMatcher.php +++ b/rules/Php55/RegexMatcher.php @@ -25,14 +25,9 @@ final class RegexMatcher */ private const LETTER_SUFFIX_REGEX = '#(?\w+)$#'; - /** - * @var ValueResolver - */ - private $valueResolver; - - public function __construct(ValueResolver $valueResolver) - { - $this->valueResolver = $valueResolver; + public function __construct( + private ValueResolver $valueResolver + ) { } public function resolvePatternExpressionWithoutEIfFound(Expr $expr): ?Expr diff --git a/rules/Php70/EregToPcreTransformer.php b/rules/Php70/EregToPcreTransformer.php index ba11bf2ef60..0b4fe1d098e 100644 --- a/rules/Php70/EregToPcreTransformer.php +++ b/rules/Php70/EregToPcreTransformer.php @@ -52,11 +52,6 @@ final class EregToPcreTransformer */ private const MAXIMAL_NUMBER_PART = 'maximal_number'; - /** - * @var string - */ - private $pcreDelimiter; - /** * @var string[] */ @@ -71,9 +66,9 @@ final class EregToPcreTransformer * Change this via services configuratoin in rector.php if you need it * Single type is chosen to prevent every regular with different delimiter. */ - public function __construct(string $pcreDelimiter = '#') - { - $this->pcreDelimiter = $pcreDelimiter; + public function __construct( + private string $pcreDelimiter = '#' + ) { } public function transform(string $ereg, bool $isCaseInsensitive): string diff --git a/rules/Php70/NodeAnalyzer/VariableNaming.php b/rules/Php70/NodeAnalyzer/VariableNaming.php index 72f7d036aa6..3b4d0632792 100644 --- a/rules/Php70/NodeAnalyzer/VariableNaming.php +++ b/rules/Php70/NodeAnalyzer/VariableNaming.php @@ -34,29 +34,11 @@ */ final class VariableNaming { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; } public function resolveFromNodeWithScopeCountAndFallbackName( diff --git a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php index 7d09b264d47..65bcb2f4e7a 100644 --- a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php +++ b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php @@ -20,14 +20,9 @@ */ final class BreakNotInLoopOrSwitchToReturnRector extends AbstractRector { - /** - * @var ContextAnalyzer - */ - private $contextAnalyzer; - - public function __construct(ContextAnalyzer $contextAnalyzer) - { - $this->contextAnalyzer = $contextAnalyzer; + public function __construct( + private ContextAnalyzer $contextAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php index 9fb322951d5..938b2cb0496 100644 --- a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php +++ b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php @@ -28,14 +28,9 @@ */ final class Php4ConstructorRector extends AbstractRector { - /** - * @var Php4ConstructorClassMethodAnalyzer - */ - private $php4ConstructorClassMethodAnalyzer; - - public function __construct(Php4ConstructorClassMethodAnalyzer $php4ConstructorClassMethodAnalyzer) - { - $this->php4ConstructorClassMethodAnalyzer = $php4ConstructorClassMethodAnalyzer; + public function __construct( + private Php4ConstructorClassMethodAnalyzer $php4ConstructorClassMethodAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php index a9d198b300a..89e6eef3eca 100644 --- a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php +++ b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php @@ -41,14 +41,9 @@ final class EregToPregMatchRector extends AbstractRector 'spliti' => 'preg_split', ]; - /** - * @var EregToPcreTransformer - */ - private $eregToPcreTransformer; - - public function __construct(EregToPcreTransformer $eregToPcreTransformer) - { - $this->eregToPcreTransformer = $eregToPcreTransformer; + public function __construct( + private EregToPcreTransformer $eregToPcreTransformer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php b/rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php index 63e0de38efd..73c148bbd7a 100644 --- a/rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php +++ b/rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php @@ -38,29 +38,11 @@ */ final class NonVariableToVariableOnFunctionCallRector extends AbstractRector { - /** - * @var CallReflectionResolver - */ - private $callReflectionResolver; - - /** - * @var VariableNaming - */ - private $variableNaming; - - /** - * @var ParentScopeFinder - */ - private $parentScopeFinder; - public function __construct( - CallReflectionResolver $callReflectionResolver, - VariableNaming $variableNaming, - ParentScopeFinder $parentScopeFinder + private CallReflectionResolver $callReflectionResolver, + private VariableNaming $variableNaming, + private ParentScopeFinder $parentScopeFinder ) { - $this->callReflectionResolver = $callReflectionResolver; - $this->variableNaming = $variableNaming; - $this->parentScopeFinder = $parentScopeFinder; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php index 2e7f01c85aa..5c72b853b4d 100644 --- a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php +++ b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php @@ -23,20 +23,10 @@ */ final class ThisCallOnStaticMethodToStaticCallRector extends AbstractRector { - /** - * @var StaticAnalyzer - */ - private $staticAnalyzer; - - /** - * @var MethodReflectionProvider - */ - private $methodReflectionProvider; - - public function __construct(StaticAnalyzer $staticAnalyzer, MethodReflectionProvider $methodReflectionProvider) - { - $this->staticAnalyzer = $staticAnalyzer; - $this->methodReflectionProvider = $methodReflectionProvider; + public function __construct( + private StaticAnalyzer $staticAnalyzer, + private MethodReflectionProvider $methodReflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php index 60fd5279db6..710c82bdae1 100644 --- a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php +++ b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php @@ -28,36 +28,12 @@ */ final class StaticCallOnNonStaticToInstanceCallRector extends AbstractRector { - /** - * @var ClassMethodManipulator - */ - private $classMethodManipulator; - - /** - * @var StaticAnalyzer - */ - private $staticAnalyzer; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - public function __construct( - ClassMethodManipulator $classMethodManipulator, - StaticAnalyzer $staticAnalyzer, - ReflectionProvider $reflectionProvider, - ParentClassScopeResolver $parentClassScopeResolver + private ClassMethodManipulator $classMethodManipulator, + private StaticAnalyzer $staticAnalyzer, + private ReflectionProvider $reflectionProvider, + private ParentClassScopeResolver $parentClassScopeResolver ) { - $this->classMethodManipulator = $classMethodManipulator; - $this->staticAnalyzer = $staticAnalyzer; - $this->reflectionProvider = $reflectionProvider; - $this->parentClassScopeResolver = $parentClassScopeResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/ValueObject/VariableAssignPair.php b/rules/Php70/ValueObject/VariableAssignPair.php index 7cb868ed058..6a688dafbfc 100644 --- a/rules/Php70/ValueObject/VariableAssignPair.php +++ b/rules/Php70/ValueObject/VariableAssignPair.php @@ -16,24 +16,14 @@ final class VariableAssignPair { - /** - * @var Variable|ArrayDimFetch|PropertyFetch|StaticPropertyFetch - */ - private $variable; - - /** - * @var Assign|AssignOp|AssignRef - */ - private $assign; - /** * @param Variable|ArrayDimFetch|PropertyFetch|StaticPropertyFetch $variable - * @param Assign|AssignOp|AssignRef $node + * @param Assign|AssignOp|AssignRef $assign */ - public function __construct(Node $variable, Node $node) - { - $this->variable = $variable; - $this->assign = $node; + public function __construct( + private Node $variable, + private Node $assign + ) { } /** diff --git a/rules/Php71/IsArrayAndDualCheckToAble.php b/rules/Php71/IsArrayAndDualCheckToAble.php index 1ad4431477e..93b97a59dd0 100644 --- a/rules/Php71/IsArrayAndDualCheckToAble.php +++ b/rules/Php71/IsArrayAndDualCheckToAble.php @@ -17,20 +17,10 @@ final class IsArrayAndDualCheckToAble { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BinaryOpManipulator - */ - private $binaryOpManipulator; - - public function __construct(BinaryOpManipulator $binaryOpManipulator, NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->binaryOpManipulator = $binaryOpManipulator; + public function __construct( + private BinaryOpManipulator $binaryOpManipulator, + private NodeNameResolver $nodeNameResolver + ) { } public function processBooleanOr(BooleanOr $booleanOr, string $type, string $newMethodName): ?FuncCall diff --git a/rules/Php71/NodeAnalyzer/CountableAnalyzer.php b/rules/Php71/NodeAnalyzer/CountableAnalyzer.php index 094401587fd..adba77dbd86 100644 --- a/rules/Php71/NodeAnalyzer/CountableAnalyzer.php +++ b/rules/Php71/NodeAnalyzer/CountableAnalyzer.php @@ -16,29 +16,11 @@ final class CountableAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } public function isCastableArrayType(Expr $expr): bool diff --git a/rules/Php71/NodeFinder/EmptyStringDefaultPropertyFinder.php b/rules/Php71/NodeFinder/EmptyStringDefaultPropertyFinder.php index 0a89c760035..13249bde946 100644 --- a/rules/Php71/NodeFinder/EmptyStringDefaultPropertyFinder.php +++ b/rules/Php71/NodeFinder/EmptyStringDefaultPropertyFinder.php @@ -15,19 +15,14 @@ final class EmptyStringDefaultPropertyFinder { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - /** * @var array */ private $propertyPropertiesByClassName = []; - public function __construct(BetterNodeFinder $betterNodeFinder) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/rules/Php71/Rector/Assign/AssignArrayToStringRector.php b/rules/Php71/Rector/Assign/AssignArrayToStringRector.php index f349d565e50..660662f9c5a 100644 --- a/rules/Php71/Rector/Assign/AssignArrayToStringRector.php +++ b/rules/Php71/Rector/Assign/AssignArrayToStringRector.php @@ -38,14 +38,9 @@ final class AssignArrayToStringRector extends AbstractRector */ private $emptyStringProperties = []; - /** - * @var EmptyStringDefaultPropertyFinder - */ - private $emptyStringDefaultPropertyFinder; - - public function __construct(EmptyStringDefaultPropertyFinder $emptyStringDefaultPropertyFinder) - { - $this->emptyStringDefaultPropertyFinder = $emptyStringDefaultPropertyFinder; + public function __construct( + private EmptyStringDefaultPropertyFinder $emptyStringDefaultPropertyFinder + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/BooleanOr/IsIterableRector.php b/rules/Php71/Rector/BooleanOr/IsIterableRector.php index c648328cbfb..342a38fc88f 100644 --- a/rules/Php71/Rector/BooleanOr/IsIterableRector.php +++ b/rules/Php71/Rector/BooleanOr/IsIterableRector.php @@ -19,22 +19,10 @@ */ final class IsIterableRector extends AbstractRector { - /** - * @var IsArrayAndDualCheckToAble - */ - private $isArrayAndDualCheckToAble; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - IsArrayAndDualCheckToAble $isArrayAndDualCheckToAble, - ReflectionProvider $reflectionProvider + private IsArrayAndDualCheckToAble $isArrayAndDualCheckToAble, + private ReflectionProvider $reflectionProvider ) { - $this->isArrayAndDualCheckToAble = $isArrayAndDualCheckToAble; - $this->reflectionProvider = $reflectionProvider; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/FuncCall/CountOnNullRector.php b/rules/Php71/Rector/FuncCall/CountOnNullRector.php index 0cc799d2039..68ca8381bf4 100644 --- a/rules/Php71/Rector/FuncCall/CountOnNullRector.php +++ b/rules/Php71/Rector/FuncCall/CountOnNullRector.php @@ -39,20 +39,10 @@ final class CountOnNullRector extends AbstractRector */ private const ALREADY_CHANGED_ON_COUNT = 'already_changed_on_count'; - /** - * @var CountableTypeAnalyzer - */ - private $countableTypeAnalyzer; - - /** - * @var CountableAnalyzer - */ - private $countableAnalyzer; - - public function __construct(CountableTypeAnalyzer $countableTypeAnalyzer, CountableAnalyzer $countableAnalyzer) - { - $this->countableTypeAnalyzer = $countableTypeAnalyzer; - $this->countableAnalyzer = $countableAnalyzer; + public function __construct( + private CountableTypeAnalyzer $countableTypeAnalyzer, + private CountableAnalyzer $countableAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php index 785b1976e0c..7953b015e82 100644 --- a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php +++ b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php @@ -26,14 +26,9 @@ */ final class RemoveExtraParametersRector extends AbstractRector { - /** - * @var CallReflectionResolver - */ - private $callReflectionResolver; - - public function __construct(CallReflectionResolver $callReflectionResolver) - { - $this->callReflectionResolver = $callReflectionResolver; + public function __construct( + private CallReflectionResolver $callReflectionResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/ValueObject/TwoNodeMatch.php b/rules/Php71/ValueObject/TwoNodeMatch.php index e3e2b836217..49ac3c906ee 100644 --- a/rules/Php71/ValueObject/TwoNodeMatch.php +++ b/rules/Php71/ValueObject/TwoNodeMatch.php @@ -8,20 +8,10 @@ final class TwoNodeMatch { - /** - * @var Expr - */ - private $firstExpr; - - /** - * @var Expr - */ - private $secondExpr; - - public function __construct(Expr $firstExpr, Expr $secondExpr) - { - $this->firstExpr = $firstExpr; - $this->secondExpr = $secondExpr; + public function __construct( + private Expr $firstExpr, + private Expr $secondExpr + ) { } public function getFirstExpr(): Expr diff --git a/rules/Php72/NodeFactory/AnonymousFunctionFactory.php b/rules/Php72/NodeFactory/AnonymousFunctionFactory.php index d98c47369d8..e97bc369c7b 100644 --- a/rules/Php72/NodeFactory/AnonymousFunctionFactory.php +++ b/rules/Php72/NodeFactory/AnonymousFunctionFactory.php @@ -21,20 +21,10 @@ final class AnonymousFunctionFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/rules/Php72/Rector/Assign/ListEachRector.php b/rules/Php72/Rector/Assign/ListEachRector.php index 955465f226c..78815c6d9d0 100644 --- a/rules/Php72/Rector/Assign/ListEachRector.php +++ b/rules/Php72/Rector/Assign/ListEachRector.php @@ -24,14 +24,9 @@ */ final class ListEachRector extends AbstractRector { - /** - * @var AssignManipulator - */ - private $assignManipulator; - - public function __construct(AssignManipulator $assignManipulator) - { - $this->assignManipulator = $assignManipulator; + public function __construct( + private AssignManipulator $assignManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php b/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php index af51bbee1e4..83edf84e3e2 100644 --- a/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php +++ b/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php @@ -32,29 +32,11 @@ */ final class CreateFunctionToAnonymousFunctionRector extends AbstractRector { - /** - * @var InlineCodeParser - */ - private $inlineCodeParser; - - /** - * @var AnonymousFunctionFactory - */ - private $anonymousFunctionFactory; - - /** - * @var ReservedKeywordAnalyzer - */ - private $reservedKeywordAnalyzer; - public function __construct( - InlineCodeParser $inlineCodeParser, - AnonymousFunctionFactory $anonymousFunctionFactory, - ReservedKeywordAnalyzer $reservedKeywordAnalyzer + private InlineCodeParser $inlineCodeParser, + private AnonymousFunctionFactory $anonymousFunctionFactory, + private ReservedKeywordAnalyzer $reservedKeywordAnalyzer ) { - $this->inlineCodeParser = $inlineCodeParser; - $this->anonymousFunctionFactory = $anonymousFunctionFactory; - $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/StringifyDefineRector.php b/rules/Php72/Rector/FuncCall/StringifyDefineRector.php index e91696ed8c2..6e02c1477e8 100644 --- a/rules/Php72/Rector/FuncCall/StringifyDefineRector.php +++ b/rules/Php72/Rector/FuncCall/StringifyDefineRector.php @@ -19,14 +19,9 @@ */ final class StringifyDefineRector extends AbstractRector { - /** - * @var StringTypeAnalyzer - */ - private $stringTypeAnalyzer; - - public function __construct(StringTypeAnalyzer $stringTypeAnalyzer) - { - $this->stringTypeAnalyzer = $stringTypeAnalyzer; + public function __construct( + private StringTypeAnalyzer $stringTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php b/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php index b7bc46ebdd9..e2d8e13c930 100644 --- a/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php +++ b/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php @@ -21,14 +21,9 @@ */ final class StringsAssertNakedRector extends AbstractRector { - /** - * @var Parser - */ - private $parser; - - public function __construct(Parser $parser) - { - $this->parser = $parser; + public function __construct( + private Parser $parser + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/While_/WhileEachToForeachRector.php b/rules/Php72/Rector/While_/WhileEachToForeachRector.php index 7be337e117a..3c4efbd98c0 100644 --- a/rules/Php72/Rector/While_/WhileEachToForeachRector.php +++ b/rules/Php72/Rector/While_/WhileEachToForeachRector.php @@ -23,14 +23,9 @@ */ final class WhileEachToForeachRector extends AbstractRector { - /** - * @var AssignManipulator - */ - private $assignManipulator; - - public function __construct(AssignManipulator $assignManipulator) - { - $this->assignManipulator = $assignManipulator; + public function __construct( + private AssignManipulator $assignManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php b/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php index b26ffb537dd..4f2881ed67b 100644 --- a/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php +++ b/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php @@ -14,14 +14,9 @@ final class NodeTypeAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function isStringTypeExpr(Expr $expr): bool diff --git a/rules/Php73/Rector/BooleanOr/IsCountableRector.php b/rules/Php73/Rector/BooleanOr/IsCountableRector.php index 45d06c429c0..730eab3da24 100644 --- a/rules/Php73/Rector/BooleanOr/IsCountableRector.php +++ b/rules/Php73/Rector/BooleanOr/IsCountableRector.php @@ -19,22 +19,10 @@ */ final class IsCountableRector extends AbstractRector { - /** - * @var IsArrayAndDualCheckToAble - */ - private $isArrayAndDualCheckToAble; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - IsArrayAndDualCheckToAble $isArrayAndDualCheckToAble, - ReflectionProvider $reflectionProvider + private IsArrayAndDualCheckToAble $isArrayAndDualCheckToAble, + private ReflectionProvider $reflectionProvider ) { - $this->isArrayAndDualCheckToAble = $isArrayAndDualCheckToAble; - $this->reflectionProvider = $reflectionProvider; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php b/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php index e0889534b00..3f1da60b7ab 100644 --- a/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php +++ b/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php @@ -84,14 +84,9 @@ final class SensitiveConstantNameRector extends AbstractRector 'NULL', ]; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php b/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php index e1b8d8459db..b5130a95d6c 100644 --- a/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php +++ b/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php @@ -43,14 +43,9 @@ final class ArrayKeyFirstLastRector extends AbstractRector 'end' => self::ARRAY_KEY_LAST, ]; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php b/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php index 7958845cf5d..50b1ed7a1fd 100644 --- a/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php +++ b/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php @@ -41,14 +41,9 @@ final class RegexDashEscapeRector extends AbstractRector */ private const RIGHT_HAND_UNESCAPED_DASH_REGEX = '#(?regexPatternArgumentManipulator = $regexPatternArgumentManipulator; + public function __construct( + private RegexPatternArgumentManipulator $regexPatternArgumentManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php index 36f27359cbe..14d48107057 100644 --- a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php +++ b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php @@ -34,14 +34,9 @@ final class StringifyStrNeedlesRector extends AbstractRector 'stristr', ]; - /** - * @var NodeTypeAnalyzer - */ - private $nodeTypeAnalyzer; - - public function __construct(NodeTypeAnalyzer $nodeTypeAnalyzer) - { - $this->nodeTypeAnalyzer = $nodeTypeAnalyzer; + public function __construct( + private NodeTypeAnalyzer $nodeTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php b/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php index 1b05dba1dca..6974ee8c19c 100644 --- a/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php +++ b/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php @@ -15,20 +15,10 @@ final class ClosureArrowFunctionAnalyzer { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeComparator = $nodeComparator; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeComparator $nodeComparator + ) { } public function matchArrowFunctionExpr(Closure $closure): ?Expr diff --git a/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php b/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php index e6d69ef73ee..3e71d644215 100644 --- a/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php +++ b/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php @@ -21,14 +21,9 @@ */ final class ClosureToArrowFunctionRector extends AbstractRector { - /** - * @var ClosureArrowFunctionAnalyzer - */ - private $closureArrowFunctionAnalyzer; - - public function __construct(ClosureArrowFunctionAnalyzer $closureArrowFunctionAnalyzer) - { - $this->closureArrowFunctionAnalyzer = $closureArrowFunctionAnalyzer; + public function __construct( + private ClosureArrowFunctionAnalyzer $closureArrowFunctionAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php b/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php index 62ffe4ebe67..ad8c31b3438 100644 --- a/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php +++ b/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php @@ -29,14 +29,9 @@ */ final class ArraySpreadInsteadOfArrayMergeRector extends AbstractRector { - /** - * @var ArrayTypeAnalyzer - */ - private $arrayTypeAnalyzer; - - public function __construct(ArrayTypeAnalyzer $arrayTypeAnalyzer) - { - $this->arrayTypeAnalyzer = $arrayTypeAnalyzer; + public function __construct( + private ArrayTypeAnalyzer $arrayTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/Property/TypedPropertyRector.php b/rules/Php74/Rector/Property/TypedPropertyRector.php index 6de558a58d2..6ecbf0cd7dd 100644 --- a/rules/Php74/Rector/Property/TypedPropertyRector.php +++ b/rules/Php74/Rector/Property/TypedPropertyRector.php @@ -48,43 +48,13 @@ final class TypedPropertyRector extends AbstractRector implements ConfigurableRe */ private $classLikeTypeOnly = false; - /** - * @var PropertyTypeInferer - */ - private $propertyTypeInferer; - - /** - * @var VendorLockResolver - */ - private $vendorLockResolver; - - /** - * @var DoctrineTypeAnalyzer - */ - private $doctrineTypeAnalyzer; - - /** - * @var VarTagRemover - */ - private $varTagRemover; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - PropertyTypeInferer $propertyTypeInferer, - VendorLockResolver $vendorLockResolver, - DoctrineTypeAnalyzer $doctrineTypeAnalyzer, - VarTagRemover $varTagRemover, - ReflectionProvider $reflectionProvider + private PropertyTypeInferer $propertyTypeInferer, + private VendorLockResolver $vendorLockResolver, + private DoctrineTypeAnalyzer $doctrineTypeAnalyzer, + private VarTagRemover $varTagRemover, + private ReflectionProvider $reflectionProvider ) { - $this->propertyTypeInferer = $propertyTypeInferer; - $this->vendorLockResolver = $vendorLockResolver; - $this->doctrineTypeAnalyzer = $doctrineTypeAnalyzer; - $this->varTagRemover = $varTagRemover; - $this->reflectionProvider = $reflectionProvider; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrncmpMatchAndRefactor.php b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrncmpMatchAndRefactor.php index 7e2a753eabd..6dd7164203b 100644 --- a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrncmpMatchAndRefactor.php +++ b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrncmpMatchAndRefactor.php @@ -23,36 +23,12 @@ final class StrncmpMatchAndRefactor implements StrStartWithMatchAndRefactorInter */ private const FUNCTION_NAME = 'strncmp'; - /** - * @var StrStartsWithFactory - */ - private $strStartsWithFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var StrStartsWithFuncCallFactory - */ - private $strStartsWithFuncCallFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - StrStartsWithFactory $strStartsWithFactory, - NodeComparator $nodeComparator, - StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory + private NodeNameResolver $nodeNameResolver, + private StrStartsWithFactory $strStartsWithFactory, + private NodeComparator $nodeComparator, + private StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory ) { - $this->strStartsWithFactory = $strStartsWithFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; - $this->strStartsWithFuncCallFactory = $strStartsWithFuncCallFactory; } /** diff --git a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrposMatchAndRefactor.php b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrposMatchAndRefactor.php index 849df11c736..0ab8edf4831 100644 --- a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrposMatchAndRefactor.php +++ b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/StrposMatchAndRefactor.php @@ -19,29 +19,11 @@ final class StrposMatchAndRefactor implements StrStartWithMatchAndRefactorInterface { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var StrStartsWithFuncCallFactory - */ - private $strStartsWithFuncCallFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver, - StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver, + private StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; - $this->strStartsWithFuncCallFactory = $strStartsWithFuncCallFactory; } /** diff --git a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/SubstrMatchAndRefactor.php b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/SubstrMatchAndRefactor.php index 670e2024397..af4b65537b6 100644 --- a/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/SubstrMatchAndRefactor.php +++ b/rules/Php80/MatchAndRefactor/StrStartsWithMatchAndRefactor/SubstrMatchAndRefactor.php @@ -18,36 +18,12 @@ final class SubstrMatchAndRefactor implements StrStartWithMatchAndRefactorInterface { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var StrStartsWithFuncCallFactory - */ - private $strStartsWithFuncCallFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver, - NodeComparator $nodeComparator, - StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver, + private NodeComparator $nodeComparator, + private StrStartsWithFuncCallFactory $strStartsWithFuncCallFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; - $this->nodeComparator = $nodeComparator; - $this->strStartsWithFuncCallFactory = $strStartsWithFuncCallFactory; } /** diff --git a/rules/Php80/NodeManipulator/TokenManipulator.php b/rules/Php80/NodeManipulator/TokenManipulator.php index 71b9ab928e9..d41268a9fb3 100644 --- a/rules/Php80/NodeManipulator/TokenManipulator.php +++ b/rules/Php80/NodeManipulator/TokenManipulator.php @@ -30,55 +30,19 @@ final class TokenManipulator { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - /** * @var Expr|null */ private $assignedNameExpr; public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - NodesToRemoveCollector $nodesToRemoveCollector, - ValueResolver $valueResolver, - NodeComparator $nodeComparator + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private NodesToRemoveCollector $nodesToRemoveCollector, + private ValueResolver $valueResolver, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->valueResolver = $valueResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/Php80/NodeResolver/PromotedPropertyResolver.php b/rules/Php80/NodeResolver/PromotedPropertyResolver.php index 7124971b759..375fb1ef4a7 100644 --- a/rules/Php80/NodeResolver/PromotedPropertyResolver.php +++ b/rules/Php80/NodeResolver/PromotedPropertyResolver.php @@ -20,29 +20,11 @@ final class PromotedPropertyResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder, - NodeComparator $nodeComparator + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder, + private NodeComparator $nodeComparator ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php b/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php index 9abdce1986d..8ea474d279d 100644 --- a/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php +++ b/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php @@ -25,29 +25,11 @@ */ final class OptionalParametersAfterRequiredRector extends AbstractRector { - /** - * @var RequireOptionalParamResolver - */ - private $requireOptionalParamResolver; - - /** - * @var ArgumentSorter - */ - private $argumentSorter; - - /** - * @var MethodReflectionClassMethodResolver - */ - private $methodReflectionClassMethodResolver; - public function __construct( - RequireOptionalParamResolver $requireOptionalParamResolver, - ArgumentSorter $argumentSorter, - MethodReflectionClassMethodResolver $methodReflectionClassMethodResolver + private RequireOptionalParamResolver $requireOptionalParamResolver, + private ArgumentSorter $argumentSorter, + private MethodReflectionClassMethodResolver $methodReflectionClassMethodResolver ) { - $this->requireOptionalParamResolver = $requireOptionalParamResolver; - $this->argumentSorter = $argumentSorter; - $this->methodReflectionClassMethodResolver = $methodReflectionClassMethodResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php b/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php index 7e3329eb38c..44e14e04f56 100644 --- a/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php +++ b/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php @@ -40,22 +40,10 @@ final class AnnotationToAttributeRector extends AbstractRector implements Config */ private $annotationsToAttributes = []; - /** - * @var PhpAttributeGroupFactory - */ - private $phpAttributeGroupFactory; - - /** - * @var PhpDocTagRemover - */ - private $phpDocTagRemover; - public function __construct( - PhpAttributeGroupFactory $phpAttributeGroupFactory, - PhpDocTagRemover $phpDocTagRemover + private PhpAttributeGroupFactory $phpAttributeGroupFactory, + private PhpDocTagRemover $phpDocTagRemover ) { - $this->phpAttributeGroupFactory = $phpAttributeGroupFactory; - $this->phpDocTagRemover = $phpDocTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php index 17a1ee3249d..f9575f2c160 100644 --- a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php +++ b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php @@ -27,29 +27,11 @@ */ final class ClassPropertyAssignToConstructorPromotionRector extends AbstractRector { - /** - * @var PromotedPropertyResolver - */ - private $promotedPropertyResolver; - - /** - * @var VariableRenamer - */ - private $variableRenamer; - - /** - * @var VarTagRemover - */ - private $varTagRemover; - public function __construct( - PromotedPropertyResolver $promotedPropertyResolver, - VariableRenamer $variableRenamer, - VarTagRemover $varTagRemover + private PromotedPropertyResolver $promotedPropertyResolver, + private VariableRenamer $variableRenamer, + private VarTagRemover $varTagRemover ) { - $this->promotedPropertyResolver = $promotedPropertyResolver; - $this->variableRenamer = $variableRenamer; - $this->varTagRemover = $varTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Class_/StringableForToStringRector.php b/rules/Php80/Rector/Class_/StringableForToStringRector.php index d3206ef3bc8..0d314cd4141 100644 --- a/rules/Php80/Rector/Class_/StringableForToStringRector.php +++ b/rules/Php80/Rector/Class_/StringableForToStringRector.php @@ -27,14 +27,9 @@ final class StringableForToStringRector extends AbstractRector */ private const STRINGABLE = 'Stringable'; - /** - * @var ClassManipulator - */ - private $classManipulator; - - public function __construct(ClassManipulator $classManipulator) - { - $this->classManipulator = $classManipulator; + public function __construct( + private ClassManipulator $classManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/FuncCall/TokenGetAllToObjectRector.php b/rules/Php80/Rector/FuncCall/TokenGetAllToObjectRector.php index e3a90f33767..e3aeb58252d 100644 --- a/rules/Php80/Rector/FuncCall/TokenGetAllToObjectRector.php +++ b/rules/Php80/Rector/FuncCall/TokenGetAllToObjectRector.php @@ -27,14 +27,9 @@ */ final class TokenGetAllToObjectRector extends AbstractRector { - /** - * @var TokenManipulator - */ - private $tokenManipulator; - - public function __construct(TokenManipulator $ifArrayTokenManipulator) - { - $this->tokenManipulator = $ifArrayTokenManipulator; + public function __construct( + private TokenManipulator $tokenManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/FunctionLike/UnionTypesRector.php b/rules/Php80/Rector/FunctionLike/UnionTypesRector.php index fd1d38630f9..bf59cd2e788 100644 --- a/rules/Php80/Rector/FunctionLike/UnionTypesRector.php +++ b/rules/Php80/Rector/FunctionLike/UnionTypesRector.php @@ -28,36 +28,12 @@ */ final class UnionTypesRector extends AbstractRector { - /** - * @var ClassMethodParamVendorLockResolver - */ - private $classMethodParamVendorLockResolver; - - /** - * @var ReturnTagRemover - */ - private $returnTagRemover; - - /** - * @var ParamTagRemover - */ - private $paramTagRemover; - - /** - * @var UnionTypeAnalyzer - */ - private $unionTypeAnalyzer; - public function __construct( - ReturnTagRemover $returnTagRemover, - ParamTagRemover $paramTagRemover, - ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver, - UnionTypeAnalyzer $unionTypeAnalyzer + private ReturnTagRemover $returnTagRemover, + private ParamTagRemover $paramTagRemover, + private ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver, + private UnionTypeAnalyzer $unionTypeAnalyzer ) { - $this->returnTagRemover = $returnTagRemover; - $this->paramTagRemover = $paramTagRemover; - $this->classMethodParamVendorLockResolver = $classMethodParamVendorLockResolver; - $this->unionTypeAnalyzer = $unionTypeAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Identical/StrEndsWithRector.php b/rules/Php80/Rector/Identical/StrEndsWithRector.php index 931ccedffa3..ae2baa9c069 100644 --- a/rules/Php80/Rector/Identical/StrEndsWithRector.php +++ b/rules/Php80/Rector/Identical/StrEndsWithRector.php @@ -24,14 +24,9 @@ */ final class StrEndsWithRector extends AbstractRector { - /** - * @var BinaryOpAnalyzer - */ - private $binaryOpAnalyzer; - - public function __construct(BinaryOpAnalyzer $binaryOpAnalyzer) - { - $this->binaryOpAnalyzer = $binaryOpAnalyzer; + public function __construct( + private BinaryOpAnalyzer $binaryOpAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Identical/StrStartsWithRector.php b/rules/Php80/Rector/Identical/StrStartsWithRector.php index a59e9ff78f1..27b8bce1959 100644 --- a/rules/Php80/Rector/Identical/StrStartsWithRector.php +++ b/rules/Php80/Rector/Identical/StrStartsWithRector.php @@ -23,17 +23,12 @@ */ final class StrStartsWithRector extends AbstractRector { - /** - * @var StrStartWithMatchAndRefactorInterface[] - */ - private $strStartWithMatchAndRefactors = []; - /** * @param StrStartWithMatchAndRefactorInterface[] $strStartWithMatchAndRefactors */ - public function __construct(array $strStartWithMatchAndRefactors) - { - $this->strStartWithMatchAndRefactors = $strStartWithMatchAndRefactors; + public function __construct( + private array $strStartWithMatchAndRefactors + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/If_/NullsafeOperatorRector.php b/rules/Php80/Rector/If_/NullsafeOperatorRector.php index 863526d3d16..9b09f71dbe5 100644 --- a/rules/Php80/Rector/If_/NullsafeOperatorRector.php +++ b/rules/Php80/Rector/If_/NullsafeOperatorRector.php @@ -32,20 +32,10 @@ final class NullsafeOperatorRector extends AbstractRector */ private const NAME = 'name'; - /** - * @var IfManipulator - */ - private $ifManipulator; - - /** - * @var NullsafeManipulator - */ - private $nullsafeManipulator; - - public function __construct(IfManipulator $ifManipulator, NullsafeManipulator $nullsafeManipulator) - { - $this->ifManipulator = $ifManipulator; - $this->nullsafeManipulator = $nullsafeManipulator; + public function __construct( + private IfManipulator $ifManipulator, + private NullsafeManipulator $nullsafeManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php index cc68726e677..a5df245015f 100644 --- a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php +++ b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php @@ -28,25 +28,15 @@ */ final class ChangeSwitchToMatchRector extends AbstractRector { - /** - * @var SwitchExprsResolver - */ - private $switchExprsResolver; - - /** - * @var SwitchAnalyzer - */ - private $switchAnalyzer; - /** * @var Expr|null */ private $assignExpr; - public function __construct(SwitchExprsResolver $switchExprsResolver, SwitchAnalyzer $switchAnalyzer) - { - $this->switchExprsResolver = $switchExprsResolver; - $this->switchAnalyzer = $switchAnalyzer; + public function __construct( + private SwitchExprsResolver $switchExprsResolver, + private SwitchAnalyzer $switchAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Reflection/MethodReflectionClassMethodResolver.php b/rules/Php80/Reflection/MethodReflectionClassMethodResolver.php index f1945fff973..1e86d7c0910 100644 --- a/rules/Php80/Reflection/MethodReflectionClassMethodResolver.php +++ b/rules/Php80/Reflection/MethodReflectionClassMethodResolver.php @@ -11,22 +11,10 @@ final class MethodReflectionClassMethodResolver { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var MethodReflectionToAstResolver - */ - private $methodReflectionToAstResolver; - public function __construct( - ReflectionProvider $reflectionProvider, - MethodReflectionToAstResolver $methodReflectionToAstResolver + private ReflectionProvider $reflectionProvider, + private MethodReflectionToAstResolver $methodReflectionToAstResolver ) { - $this->reflectionProvider = $reflectionProvider; - $this->methodReflectionToAstResolver = $methodReflectionToAstResolver; } public function resolve(string $className, string $methodName): ?ClassMethod diff --git a/rules/Php80/ValueObject/AnnotationToAttribute.php b/rules/Php80/ValueObject/AnnotationToAttribute.php index 6b829712e35..c6cd317b3d9 100644 --- a/rules/Php80/ValueObject/AnnotationToAttribute.php +++ b/rules/Php80/ValueObject/AnnotationToAttribute.php @@ -6,24 +6,14 @@ final class AnnotationToAttribute { - /** - * @var class-string|string - */ - private $tag; - - /** - * @var class-string - */ - private $attributeClass; - /** * @param class-string|string $tag * @param class-string $attributeClass */ - public function __construct(string $tag, string $attributeClass) - { - $this->tag = $tag; - $this->attributeClass = $attributeClass; + public function __construct( + private string $tag, + private string $attributeClass + ) { } /** diff --git a/rules/Php80/ValueObject/ArrayDimFetchAndConstFetch.php b/rules/Php80/ValueObject/ArrayDimFetchAndConstFetch.php index 524692bdc8a..a2f4769b76c 100644 --- a/rules/Php80/ValueObject/ArrayDimFetchAndConstFetch.php +++ b/rules/Php80/ValueObject/ArrayDimFetchAndConstFetch.php @@ -9,20 +9,10 @@ final class ArrayDimFetchAndConstFetch { - /** - * @var ArrayDimFetch - */ - private $arrayDimFetch; - - /** - * @var ConstFetch - */ - private $constFetch; - - public function __construct(ArrayDimFetch $arrayDimFetch, ConstFetch $constFetch) - { - $this->arrayDimFetch = $arrayDimFetch; - $this->constFetch = $constFetch; + public function __construct( + private ArrayDimFetch $arrayDimFetch, + private ConstFetch $constFetch + ) { } public function getArrayDimFetch(): ArrayDimFetch diff --git a/rules/Php80/ValueObject/CondAndExpr.php b/rules/Php80/ValueObject/CondAndExpr.php index f0b737ec8ca..7072ae4f432 100644 --- a/rules/Php80/ValueObject/CondAndExpr.php +++ b/rules/Php80/ValueObject/CondAndExpr.php @@ -23,26 +23,11 @@ final class CondAndExpr */ public const TYPE_RETURN = 'return'; - /** - * @var string - */ - private $kind; - - /** - * @var Expr - */ - private $expr; - - /** - * @var Expr|null - */ - private $condExpr; - - public function __construct(?Expr $condExpr, Expr $expr, string $kind) - { - $this->condExpr = $condExpr; - $this->expr = $expr; - $this->kind = $kind; + public function __construct( + private ?Expr $condExpr, + private Expr $expr, + private string $kind + ) { } public function getExpr(): Expr diff --git a/rules/Php80/ValueObject/PropertyPromotionCandidate.php b/rules/Php80/ValueObject/PropertyPromotionCandidate.php index b21330d6c3f..e7f6b2889fb 100644 --- a/rules/Php80/ValueObject/PropertyPromotionCandidate.php +++ b/rules/Php80/ValueObject/PropertyPromotionCandidate.php @@ -10,26 +10,11 @@ final class PropertyPromotionCandidate { - /** - * @var Property - */ - private $property; - - /** - * @var Assign - */ - private $assign; - - /** - * @var Param - */ - private $param; - - public function __construct(Property $property, Assign $assign, Param $param) - { - $this->property = $property; - $this->assign = $assign; - $this->param = $param; + public function __construct( + private Property $property, + private Assign $assign, + private Param $param + ) { } public function getProperty(): Property diff --git a/rules/Php80/ValueObject/StrStartsWith.php b/rules/Php80/ValueObject/StrStartsWith.php index 19f729d7de9..2d190a1764a 100644 --- a/rules/Php80/ValueObject/StrStartsWith.php +++ b/rules/Php80/ValueObject/StrStartsWith.php @@ -9,32 +9,12 @@ final class StrStartsWith { - /** - * @var bool - */ - private $isPositive = false; - - /** - * @var FuncCall - */ - private $funcCall; - - /** - * @var Expr - */ - private $haystackExpr; - - /** - * @var Expr - */ - private $needleExpr; - - public function __construct(FuncCall $funcCall, Expr $haystackExpr, Expr $needleExpr, bool $isPositive) - { - $this->funcCall = $funcCall; - $this->haystackExpr = $haystackExpr; - $this->isPositive = $isPositive; - $this->needleExpr = $needleExpr; + public function __construct( + private FuncCall $funcCall, + private Expr $haystackExpr, + private Expr $needleExpr, + private bool $isPositive + ) { } public function getFuncCall(): FuncCall diff --git a/rules/PhpSpecToPHPUnit/LetManipulator.php b/rules/PhpSpecToPHPUnit/LetManipulator.php index b42bfac57eb..b2b38470fb1 100644 --- a/rules/PhpSpecToPHPUnit/LetManipulator.php +++ b/rules/PhpSpecToPHPUnit/LetManipulator.php @@ -12,20 +12,10 @@ final class LetManipulator { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver + ) { } public function isLetNeededInClass(Class_ $class): bool diff --git a/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php b/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php index d078dfa00b0..3a1b2b5835e 100644 --- a/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php +++ b/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php @@ -26,29 +26,11 @@ final class PhpSpecRenaming */ private const SPEC = 'Spec'; - /** - * @var StringFormatConverter - */ - private $stringFormatConverter; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeNameResolver $nodeNameResolver, - StringFormatConverter $stringFormatConverter, - BetterNodeFinder $betterNodeFinder + private NodeNameResolver $nodeNameResolver, + private StringFormatConverter $stringFormatConverter, + private BetterNodeFinder $betterNodeFinder ) { - $this->stringFormatConverter = $stringFormatConverter; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; } public function renameMethod(ClassMethod $classMethod): void diff --git a/rules/PhpSpecToPHPUnit/NodeFactory/AssertMethodCallFactory.php b/rules/PhpSpecToPHPUnit/NodeFactory/AssertMethodCallFactory.php index 149bc2a89f8..c3812fe0d5b 100644 --- a/rules/PhpSpecToPHPUnit/NodeFactory/AssertMethodCallFactory.php +++ b/rules/PhpSpecToPHPUnit/NodeFactory/AssertMethodCallFactory.php @@ -15,34 +15,16 @@ final class AssertMethodCallFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - /** * @var bool */ private $isBoolAssert = false; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - public function __construct( - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver ) { - $this->nodeFactory = $nodeFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; } public function createAssertMethod( diff --git a/rules/PhpSpecToPHPUnit/NodeFactory/BeConstructedWithAssignFactory.php b/rules/PhpSpecToPHPUnit/NodeFactory/BeConstructedWithAssignFactory.php index bdfaec90aae..4b46ac9454d 100644 --- a/rules/PhpSpecToPHPUnit/NodeFactory/BeConstructedWithAssignFactory.php +++ b/rules/PhpSpecToPHPUnit/NodeFactory/BeConstructedWithAssignFactory.php @@ -19,29 +19,11 @@ final class BeConstructedWithAssignFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeFactory - */ - private $nodeFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - ValueResolver $valueResolver, - NodeFactory $nodeFactory + private NodeNameResolver $nodeNameResolver, + private ValueResolver $valueResolver, + private NodeFactory $nodeFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->valueResolver = $valueResolver; - $this->nodeFactory = $nodeFactory; } public function create(MethodCall $methodCall, string $testedClass, PropertyFetch $propertyFetch): ?Assign diff --git a/rules/PhpSpecToPHPUnit/NodeFactory/DuringMethodCallFactory.php b/rules/PhpSpecToPHPUnit/NodeFactory/DuringMethodCallFactory.php index 4006c88b926..e3320739ab2 100644 --- a/rules/PhpSpecToPHPUnit/NodeFactory/DuringMethodCallFactory.php +++ b/rules/PhpSpecToPHPUnit/NodeFactory/DuringMethodCallFactory.php @@ -15,20 +15,10 @@ final class DuringMethodCallFactory { - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodesToAddCollector - */ - private $nodesToAddCollector; - - public function __construct(ValueResolver $valueResolver, NodesToAddCollector $nodesToAddCollector) - { - $this->valueResolver = $valueResolver; - $this->nodesToAddCollector = $nodesToAddCollector; + public function __construct( + private ValueResolver $valueResolver, + private NodesToAddCollector $nodesToAddCollector + ) { } public function create(MethodCall $methodCall, PropertyFetch $propertyFetch): MethodCall diff --git a/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php b/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php index 22cb2ee8069..4f34617f7e6 100644 --- a/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php +++ b/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php @@ -15,14 +15,9 @@ */ final class PHPUnitTypeDeclarationDecorator { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function decorate(ClassMethod $classMethod): void diff --git a/rules/PhpSpecToPHPUnit/PhpSpecMockCollector.php b/rules/PhpSpecToPHPUnit/PhpSpecMockCollector.php index 9d28d8a9727..37576f6fb94 100644 --- a/rules/PhpSpecToPHPUnit/PhpSpecMockCollector.php +++ b/rules/PhpSpecToPHPUnit/PhpSpecMockCollector.php @@ -31,22 +31,10 @@ final class PhpSpecMockCollector */ private $propertyMocksByClass = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php b/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php index c5473ff1890..bf9285b9e2f 100644 --- a/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/ClassMethod/PhpSpecMethodToPHPUnitMethodRector.php @@ -18,22 +18,10 @@ */ final class PhpSpecMethodToPHPUnitMethodRector extends AbstractPhpSpecToPHPUnitRector { - /** - * @var PhpSpecRenaming - */ - private $phpSpecRenaming; - - /** - * @var PHPUnitTypeDeclarationDecorator - */ - private $phpUnitTypeDeclarationDecorator; - public function __construct( - PHPUnitTypeDeclarationDecorator $phpUnitTypeDeclarationDecorator, - PhpSpecRenaming $phpSpecRenaming + private PHPUnitTypeDeclarationDecorator $phpUnitTypeDeclarationDecorator, + private PhpSpecRenaming $phpSpecRenaming ) { - $this->phpSpecRenaming = $phpSpecRenaming; - $this->phpUnitTypeDeclarationDecorator = $phpUnitTypeDeclarationDecorator; } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/Class_/AddMockPropertiesRector.php b/rules/PhpSpecToPHPUnit/Rector/Class_/AddMockPropertiesRector.php index 3485504df74..44e801126d2 100644 --- a/rules/PhpSpecToPHPUnit/Rector/Class_/AddMockPropertiesRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/Class_/AddMockPropertiesRector.php @@ -18,22 +18,10 @@ */ final class AddMockPropertiesRector extends AbstractPhpSpecToPHPUnitRector { - /** - * @var PhpSpecMockCollector - */ - private $phpSpecMockCollector; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - public function __construct( - ClassInsertManipulator $classInsertManipulator, - PhpSpecMockCollector $phpSpecMockCollector + private ClassInsertManipulator $classInsertManipulator, + private PhpSpecMockCollector $phpSpecMockCollector ) { - $this->phpSpecMockCollector = $phpSpecMockCollector; - $this->classInsertManipulator = $classInsertManipulator; } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/Class_/PhpSpecClassToPHPUnitClassRector.php b/rules/PhpSpecToPHPUnit/Rector/Class_/PhpSpecClassToPHPUnitClassRector.php index 0fe07a7b721..384ad2e68d2 100644 --- a/rules/PhpSpecToPHPUnit/Rector/Class_/PhpSpecClassToPHPUnitClassRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/Class_/PhpSpecClassToPHPUnitClassRector.php @@ -33,36 +33,12 @@ final class PhpSpecClassToPHPUnitClassRector extends AbstractPhpSpecToPHPUnitRec */ private $testedObjectType; - /** - * @var PhpSpecRenaming - */ - private $phpSpecRenaming; - - /** - * @var LetManipulator - */ - private $letManipulator; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var SetUpClassMethodFactory - */ - private $setUpClassMethodFactory; - public function __construct( - ClassInsertManipulator $classInsertManipulator, - LetManipulator $letManipulator, - PhpSpecRenaming $phpSpecRenaming, - SetUpClassMethodFactory $setUpClassMethodFactory + private ClassInsertManipulator $classInsertManipulator, + private LetManipulator $letManipulator, + private PhpSpecRenaming $phpSpecRenaming, + private SetUpClassMethodFactory $setUpClassMethodFactory ) { - $this->phpSpecRenaming = $phpSpecRenaming; - $this->letManipulator = $letManipulator; - $this->classInsertManipulator = $classInsertManipulator; - $this->setUpClassMethodFactory = $setUpClassMethodFactory; } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php index 79142766f64..53324cefd3e 100644 --- a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php @@ -33,20 +33,10 @@ */ final class PhpSpecMocksToPHPUnitMocksRector extends AbstractPhpSpecToPHPUnitRector { - /** - * @var PhpSpecMockCollector - */ - private $phpSpecMockCollector; - - /** - * @var TypeAnalyzer - */ - private $typeAnalyzer; - - public function __construct(PhpSpecMockCollector $phpSpecMockCollector, TypeAnalyzer $typeAnalyzer) - { - $this->phpSpecMockCollector = $phpSpecMockCollector; - $this->typeAnalyzer = $typeAnalyzer; + public function __construct( + private PhpSpecMockCollector $phpSpecMockCollector, + private TypeAnalyzer $typeAnalyzer + ) { } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php index 508363eabf0..99768a46103 100644 --- a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php @@ -97,43 +97,13 @@ final class PhpSpecPromisesToPHPUnitAssertRector extends AbstractPhpSpecToPHPUni */ private $testedObjectPropertyFetch; - /** - * @var PhpSpecRenaming - */ - private $phpSpecRenaming; - - /** - * @var MatchersManipulator - */ - private $matchersManipulator; - - /** - * @var AssertMethodCallFactory - */ - private $assertMethodCallFactory; - - /** - * @var BeConstructedWithAssignFactory - */ - private $beConstructedWithAssignFactory; - - /** - * @var DuringMethodCallFactory - */ - private $duringMethodCallFactory; - public function __construct( - MatchersManipulator $matchersManipulator, - PhpSpecRenaming $phpSpecRenaming, - AssertMethodCallFactory $assertMethodCallFactory, - BeConstructedWithAssignFactory $beConstructedWithAssignFactory, - DuringMethodCallFactory $duringMethodCallFactory + private MatchersManipulator $matchersManipulator, + private PhpSpecRenaming $phpSpecRenaming, + private AssertMethodCallFactory $assertMethodCallFactory, + private BeConstructedWithAssignFactory $beConstructedWithAssignFactory, + private DuringMethodCallFactory $duringMethodCallFactory ) { - $this->phpSpecRenaming = $phpSpecRenaming; - $this->matchersManipulator = $matchersManipulator; - $this->assertMethodCallFactory = $assertMethodCallFactory; - $this->beConstructedWithAssignFactory = $beConstructedWithAssignFactory; - $this->duringMethodCallFactory = $duringMethodCallFactory; } /** diff --git a/rules/PhpSpecToPHPUnit/Rector/Variable/MockVariableToPropertyFetchRector.php b/rules/PhpSpecToPHPUnit/Rector/Variable/MockVariableToPropertyFetchRector.php index 6b50ec4da46..2445d4ec59a 100644 --- a/rules/PhpSpecToPHPUnit/Rector/Variable/MockVariableToPropertyFetchRector.php +++ b/rules/PhpSpecToPHPUnit/Rector/Variable/MockVariableToPropertyFetchRector.php @@ -19,14 +19,9 @@ */ final class MockVariableToPropertyFetchRector extends AbstractPhpSpecToPHPUnitRector { - /** - * @var PhpSpecMockCollector - */ - private $phpSpecMockCollector; - - public function __construct(PhpSpecMockCollector $phpSpecMockCollector) - { - $this->phpSpecMockCollector = $phpSpecMockCollector; + public function __construct( + private PhpSpecMockCollector $phpSpecMockCollector + ) { } /** diff --git a/rules/Privatization/Naming/ConstantNaming.php b/rules/Privatization/Naming/ConstantNaming.php index 2aba3d5a2bd..bafc5889a8b 100644 --- a/rules/Privatization/Naming/ConstantNaming.php +++ b/rules/Privatization/Naming/ConstantNaming.php @@ -10,14 +10,9 @@ final class ConstantNaming { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function createFromProperty(PropertyProperty $propertyProperty): string diff --git a/rules/Privatization/NodeAnalyzer/EventSubscriberMethodNamesResolver.php b/rules/Privatization/NodeAnalyzer/EventSubscriberMethodNamesResolver.php index ba4b5e0f5ce..eaa56c4cec6 100644 --- a/rules/Privatization/NodeAnalyzer/EventSubscriberMethodNamesResolver.php +++ b/rules/Privatization/NodeAnalyzer/EventSubscriberMethodNamesResolver.php @@ -12,14 +12,9 @@ final class EventSubscriberMethodNamesResolver { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser) - { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; + public function __construct( + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser + ) { } /** diff --git a/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php b/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php index 62d066491a9..4f1938c5019 100644 --- a/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php +++ b/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php @@ -28,29 +28,11 @@ final class PropertyFetchByMethodAnalyzer */ private const SCOPE_CHANGING_NODE_TYPES = [Do_::class, While_::class, If_::class, Else_::class]; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - NodeNameResolver $nodeNameResolver, - PropertyFetchAnalyzer $propertyFetchAnalyzer, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private NodeNameResolver $nodeNameResolver, + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } /** diff --git a/rules/Privatization/NodeFactory/ClassConstantFactory.php b/rules/Privatization/NodeFactory/ClassConstantFactory.php index f98fea079d2..39127d3ec4a 100644 --- a/rules/Privatization/NodeFactory/ClassConstantFactory.php +++ b/rules/Privatization/NodeFactory/ClassConstantFactory.php @@ -15,20 +15,10 @@ final class ClassConstantFactory { - /** - * @var ConstantNaming - */ - private $constantNaming; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(ConstantNaming $constantNaming, PhpDocInfoFactory $phpDocInfoFactory) - { - $this->constantNaming = $constantNaming; - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private ConstantNaming $constantNaming, + private PhpDocInfoFactory $phpDocInfoFactory + ) { } public function createFromProperty(Property $property): ClassConst diff --git a/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php b/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php index f8022f4cfad..4bd8e480371 100644 --- a/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php +++ b/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php @@ -12,29 +12,11 @@ final class ClassConstantFetchValueFactory { - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var ClassConstantsResolver - */ - private $classConstantsResolver; - public function __construct( - ValueResolver $valueResolver, - NodeFactory $nodeFactory, - ClassConstantsResolver $classConstantsResolver + private ValueResolver $valueResolver, + private NodeFactory $nodeFactory, + private ClassConstantsResolver $classConstantsResolver ) { - $this->valueResolver = $valueResolver; - $this->nodeFactory = $nodeFactory; - $this->classConstantsResolver = $classConstantsResolver; } /** diff --git a/rules/Privatization/NodeReplacer/PropertyFetchWithConstFetchReplacer.php b/rules/Privatization/NodeReplacer/PropertyFetchWithConstFetchReplacer.php index 97c719f5dd4..4a426ce07fa 100644 --- a/rules/Privatization/NodeReplacer/PropertyFetchWithConstFetchReplacer.php +++ b/rules/Privatization/NodeReplacer/PropertyFetchWithConstFetchReplacer.php @@ -18,43 +18,13 @@ final class PropertyFetchWithConstFetchReplacer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var ConstantNaming - */ - private $constantNaming; - - /** - * @var NodeFactory - */ - private $nodeFactory; - public function __construct( - NodeNameResolver $nodeNameResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - PropertyFetchAnalyzer $propertyFetchAnalyzer, - ConstantNaming $constantNaming, - NodeFactory $nodeFactory + private NodeNameResolver $nodeNameResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private ConstantNaming $constantNaming, + private NodeFactory $nodeFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->constantNaming = $constantNaming; - $this->nodeFactory = $nodeFactory; } public function replace(Class_ $class, Property $property): void diff --git a/rules/Privatization/NodeReplacer/PropertyFetchWithVariableReplacer.php b/rules/Privatization/NodeReplacer/PropertyFetchWithVariableReplacer.php index dd46023aab6..08eb3e8b54c 100644 --- a/rules/Privatization/NodeReplacer/PropertyFetchWithVariableReplacer.php +++ b/rules/Privatization/NodeReplacer/PropertyFetchWithVariableReplacer.php @@ -14,22 +14,10 @@ final class PropertyFetchWithVariableReplacer { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/rules/Privatization/Rector/ClassMethod/ChangeGlobalVariablesToPropertiesRector.php b/rules/Privatization/Rector/ClassMethod/ChangeGlobalVariablesToPropertiesRector.php index 0f734926133..28aab8173ee 100644 --- a/rules/Privatization/Rector/ClassMethod/ChangeGlobalVariablesToPropertiesRector.php +++ b/rules/Privatization/Rector/ClassMethod/ChangeGlobalVariablesToPropertiesRector.php @@ -29,14 +29,9 @@ final class ChangeGlobalVariablesToPropertiesRector extends AbstractRector */ private $globalVariableNames = []; - /** - * @var PropertyToAddCollector - */ - private $propertyToAddCollector; - - public function __construct(PropertyToAddCollector $propertyToAddCollector) - { - $this->propertyToAddCollector = $propertyToAddCollector; + public function __construct( + private PropertyToAddCollector $propertyToAddCollector + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php index bffd6b2ab5b..f6a532383c9 100644 --- a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php +++ b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php @@ -19,14 +19,9 @@ */ final class PrivatizeFinalClassMethodRector extends AbstractRector { - /** - * @var ClassMethodVisibilityGuard - */ - private $classMethodVisibilityGuard; - - public function __construct(ClassMethodVisibilityGuard $classMethodVisibilityGuard) - { - $this->classMethodVisibilityGuard = $classMethodVisibilityGuard; + public function __construct( + private ClassMethodVisibilityGuard $classMethodVisibilityGuard + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php b/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php index 05334126657..43edf17b199 100644 --- a/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php +++ b/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php @@ -19,36 +19,12 @@ */ final class ChangeLocalPropertyToVariableRector extends AbstractRector { - /** - * @var ClassManipulator - */ - private $classManipulator; - - /** - * @var PropertyFetchWithVariableReplacer - */ - private $propertyFetchWithVariableReplacer; - - /** - * @var PropertyFetchByMethodAnalyzer - */ - private $propertyFetchByMethodAnalyzer; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - ClassManipulator $classManipulator, - PropertyFetchWithVariableReplacer $propertyFetchWithVariableReplacer, - PropertyFetchByMethodAnalyzer $propertyFetchByMethodAnalyzer, - ClassAnalyzer $classAnalyzer + private ClassManipulator $classManipulator, + private PropertyFetchWithVariableReplacer $propertyFetchWithVariableReplacer, + private PropertyFetchByMethodAnalyzer $propertyFetchByMethodAnalyzer, + private ClassAnalyzer $classAnalyzer ) { - $this->classManipulator = $classManipulator; - $this->propertyFetchWithVariableReplacer = $propertyFetchWithVariableReplacer; - $this->propertyFetchByMethodAnalyzer = $propertyFetchByMethodAnalyzer; - $this->classAnalyzer = $classAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php b/rules/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php index eea37ebf30f..160c16519ad 100644 --- a/rules/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php +++ b/rules/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php @@ -30,29 +30,11 @@ */ final class ChangeReadOnlyVariableWithDefaultValueToConstantRector extends AbstractRector { - /** - * @var ClassMethodAssignManipulator - */ - private $classMethodAssignManipulator; - - /** - * @var VarAnnotationManipulator - */ - private $varAnnotationManipulator; - - /** - * @var PropertyToAddCollector - */ - private $propertyToAddCollector; - public function __construct( - ClassMethodAssignManipulator $classMethodAssignManipulator, - VarAnnotationManipulator $varAnnotationManipulator, - PropertyToAddCollector $propertyToAddCollector + private ClassMethodAssignManipulator $classMethodAssignManipulator, + private VarAnnotationManipulator $varAnnotationManipulator, + private PropertyToAddCollector $propertyToAddCollector ) { - $this->classMethodAssignManipulator = $classMethodAssignManipulator; - $this->varAnnotationManipulator = $varAnnotationManipulator; - $this->propertyToAddCollector = $propertyToAddCollector; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php b/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php index 9e81926edf5..1181c2cf9b9 100644 --- a/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php +++ b/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php @@ -16,14 +16,9 @@ */ final class FinalizeClassesWithoutChildrenRector extends AbstractRector { - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - public function __construct(ClassAnalyzer $classAnalyzer) - { - $this->classAnalyzer = $classAnalyzer; + public function __construct( + private ClassAnalyzer $classAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector.php b/rules/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector.php index f33b64abf3a..888b70f0bb0 100644 --- a/rules/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector.php +++ b/rules/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector.php @@ -49,29 +49,11 @@ final class RepeatedLiteralToClassConstantRector extends AbstractRector */ private const SLASH_AND_DASH_REGEX = '#[-\\\/]#'; - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var ScopeAwareNodeFinder - */ - private $scopeAwareNodeFinder; - - /** - * @var ReservedKeywordAnalyzer - */ - private $reservedKeywordAnalyzer; - public function __construct( - ClassInsertManipulator $classInsertManipulator, - ReservedKeywordAnalyzer $reservedKeywordAnalyzer, - ScopeAwareNodeFinder $scopeAwareNodeFinder + private ClassInsertManipulator $classInsertManipulator, + private ReservedKeywordAnalyzer $reservedKeywordAnalyzer, + private ScopeAwareNodeFinder $scopeAwareNodeFinder ) { - $this->classInsertManipulator = $classInsertManipulator; - $this->scopeAwareNodeFinder = $scopeAwareNodeFinder; - $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php b/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php index a4aec9c93c3..c755db920b2 100644 --- a/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php +++ b/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php @@ -30,14 +30,9 @@ final class ReplaceStringWithClassConstantRector extends AbstractRector implemen */ private $replaceStringWithClassConstants = []; - /** - * @var ClassConstantFetchValueFactory - */ - private $classConstantFetchValueFactory; - - public function __construct(ClassConstantFetchValueFactory $classConstantFetchValueFactory) - { - $this->classConstantFetchValueFactory = $classConstantFetchValueFactory; + public function __construct( + private ClassConstantFetchValueFactory $classConstantFetchValueFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php b/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php index fab23b5e01c..6e565535ae6 100644 --- a/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php +++ b/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php @@ -22,29 +22,11 @@ */ final class ChangeReadOnlyPropertyWithDefaultValueToConstantRector extends AbstractRector { - /** - * @var PropertyManipulator - */ - private $propertyManipulator; - - /** - * @var ClassConstantFactory - */ - private $classConstantFactory; - - /** - * @var PropertyFetchWithConstFetchReplacer - */ - private $propertyFetchWithConstFetchReplacer; - public function __construct( - PropertyManipulator $propertyManipulator, - ClassConstantFactory $classConstantFactory, - PropertyFetchWithConstFetchReplacer $propertyFetchWithConstFetchReplacer + private PropertyManipulator $propertyManipulator, + private ClassConstantFactory $classConstantFactory, + private PropertyFetchWithConstFetchReplacer $propertyFetchWithConstFetchReplacer ) { - $this->propertyManipulator = $propertyManipulator; - $this->classConstantFactory = $classConstantFactory; - $this->propertyFetchWithConstFetchReplacer = $propertyFetchWithConstFetchReplacer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php b/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php index c4aa8847dd7..4f45a991ec2 100644 --- a/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php +++ b/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php @@ -32,32 +32,19 @@ final class PrivatizeLocalPropertyToPrivatePropertyRector extends AbstractRector 'inject', ]; - /** - * @var PropertyVisibilityVendorLockResolver - */ - private $propertyVisibilityVendorLockResolver; - /** * @var ObjectType[] */ private $excludedObjectTypes = []; - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - PropertyVisibilityVendorLockResolver $propertyVisibilityVendorLockResolver, - ClassAnalyzer $classAnalyzer + private PropertyVisibilityVendorLockResolver $propertyVisibilityVendorLockResolver, + private ClassAnalyzer $classAnalyzer ) { - $this->propertyVisibilityVendorLockResolver = $propertyVisibilityVendorLockResolver; - $this->excludedObjectTypes = [ new ObjectType('PHPUnit\Framework\TestCase'), new ObjectType('PHP_CodeSniffer\Sniffs\Sniff'), ]; - $this->classAnalyzer = $classAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Privatization/Reflection/ClassConstantsResolver.php b/rules/Privatization/Reflection/ClassConstantsResolver.php index 5a1c0cb64db..c5189871c81 100644 --- a/rules/Privatization/Reflection/ClassConstantsResolver.php +++ b/rules/Privatization/Reflection/ClassConstantsResolver.php @@ -13,14 +13,9 @@ final class ClassConstantsResolver */ private $cachedConstantNamesToValues = []; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php b/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php index 606fab94efd..b14c4db8ffd 100644 --- a/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php +++ b/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php @@ -13,14 +13,9 @@ final class NormalizeTypeToRespectArrayScalarType { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function normalizeToArray(Type $type, ?Node $returnNode): Type diff --git a/rules/Privatization/ValueObject/ConstantVisibility.php b/rules/Privatization/ValueObject/ConstantVisibility.php index d7401a8d74b..8a6954c64ec 100644 --- a/rules/Privatization/ValueObject/ConstantVisibility.php +++ b/rules/Privatization/ValueObject/ConstantVisibility.php @@ -6,26 +6,11 @@ final class ConstantVisibility { - /** - * @var bool - */ - private $isPublic = false; - - /** - * @var bool - */ - private $isProtected = false; - - /** - * @var bool - */ - private $isPrivate = false; - - public function __construct(bool $isPublic, bool $isProtected, bool $isPrivate) - { - $this->isPublic = $isPublic; - $this->isProtected = $isProtected; - $this->isPrivate = $isPrivate; + public function __construct( + private bool $isPublic, + private bool $isProtected, + private bool $isPrivate + ) { } public function isPublic(): bool diff --git a/rules/Privatization/ValueObject/ReplaceStringWithClassConstant.php b/rules/Privatization/ValueObject/ReplaceStringWithClassConstant.php index 08282786f5d..1d5bd557864 100644 --- a/rules/Privatization/ValueObject/ReplaceStringWithClassConstant.php +++ b/rules/Privatization/ValueObject/ReplaceStringWithClassConstant.php @@ -8,35 +8,15 @@ final class ReplaceStringWithClassConstant { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var class-string - */ - private $classWithConstants; - - /** - * @var int - */ - private $argPosition; - /** * @param class-string $classWithConstants */ - public function __construct(string $class, string $method, int $argPosition, string $classWithConstants) - { - $this->class = $class; - $this->method = $method; - $this->classWithConstants = $classWithConstants; - $this->argPosition = $argPosition; + public function __construct( + private string $class, + private string $method, + private int $argPosition, + private string $classWithConstants + ) { } public function getObjectType(): ObjectType diff --git a/rules/Privatization/VisibilityGuard/ClassMethodVisibilityGuard.php b/rules/Privatization/VisibilityGuard/ClassMethodVisibilityGuard.php index 03f15cd5b5c..35e2de8f9f4 100644 --- a/rules/Privatization/VisibilityGuard/ClassMethodVisibilityGuard.php +++ b/rules/Privatization/VisibilityGuard/ClassMethodVisibilityGuard.php @@ -10,14 +10,9 @@ final class ClassMethodVisibilityGuard { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function isClassMethodVisibilityGuardedByParent( diff --git a/rules/Removing/NodeManipulator/ComplexNodeRemover.php b/rules/Removing/NodeManipulator/ComplexNodeRemover.php index f4708d55e2a..24ea4e13132 100644 --- a/rules/Removing/NodeManipulator/ComplexNodeRemover.php +++ b/rules/Removing/NodeManipulator/ComplexNodeRemover.php @@ -26,64 +26,16 @@ final class ComplexNodeRemover { - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ClassMethodRemover - */ - private $classMethodRemover; - - /** - * @var AssignRemover - */ - private $assignRemover; - - /** - * @var PropertyFetchFinder - */ - private $propertyFetchFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeRemover - */ - private $nodeRemover; - - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - public function __construct( - ClassMethodRemover $classMethodRemover, - AssignRemover $assignRemover, - PropertyFetchFinder $propertyFetchFinder, - NodeNameResolver $nodeNameResolver, - BetterNodeFinder $betterNodeFinder, - NodeRemover $nodeRemover, - NodesToRemoveCollector $nodesToRemoveCollector, - NodeComparator $nodeComparator + private ClassMethodRemover $classMethodRemover, + private AssignRemover $assignRemover, + private PropertyFetchFinder $propertyFetchFinder, + private NodeNameResolver $nodeNameResolver, + private BetterNodeFinder $betterNodeFinder, + private NodeRemover $nodeRemover, + private NodesToRemoveCollector $nodesToRemoveCollector, + private NodeComparator $nodeComparator ) { - $this->classMethodRemover = $classMethodRemover; - $this->assignRemover = $assignRemover; - $this->propertyFetchFinder = $propertyFetchFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeRemover = $nodeRemover; - $this->nodesToRemoveCollector = $nodesToRemoveCollector; - $this->nodeComparator = $nodeComparator; } public function removeClassMethodAndUsages(ClassMethod $classMethod): void diff --git a/rules/Removing/Rector/Class_/RemoveParentRector.php b/rules/Removing/Rector/Class_/RemoveParentRector.php index df4d381d514..e6ee5c5c90f 100644 --- a/rules/Removing/Rector/Class_/RemoveParentRector.php +++ b/rules/Removing/Rector/Class_/RemoveParentRector.php @@ -28,14 +28,9 @@ final class RemoveParentRector extends AbstractRector implements ConfigurableRec */ private $parentClassesToRemove = []; - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - - public function __construct(ParentClassScopeResolver $parentClassScopeResolver) - { - $this->parentClassScopeResolver = $parentClassScopeResolver; + public function __construct( + private ParentClassScopeResolver $parentClassScopeResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Removing/Rector/Class_/RemoveTraitRector.php b/rules/Removing/Rector/Class_/RemoveTraitRector.php index e010141591b..32632a089a7 100644 --- a/rules/Removing/Rector/Class_/RemoveTraitRector.php +++ b/rules/Removing/Rector/Class_/RemoveTraitRector.php @@ -35,14 +35,9 @@ final class RemoveTraitRector extends AbstractRector implements ConfigurableRect */ private $traitsToRemove = []; - /** - * @var ClassManipulator - */ - private $classManipulator; - - public function __construct(ClassManipulator $classManipulator) - { - $this->classManipulator = $classManipulator; + public function __construct( + private ClassManipulator $classManipulator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php b/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php index 07fbec99eb9..412cc341835 100644 --- a/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php +++ b/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php @@ -30,14 +30,9 @@ final class RemoveFuncCallRector extends AbstractRector implements ConfigurableR */ private $removeFuncCalls = []; - /** - * @var BreakingRemovalGuard - */ - private $breakingRemovalGuard; - - public function __construct(BreakingRemovalGuard $breakingRemovalGuard) - { - $this->breakingRemovalGuard = $breakingRemovalGuard; + public function __construct( + private BreakingRemovalGuard $breakingRemovalGuard + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Removing/ValueObject/ArgumentRemover.php b/rules/Removing/ValueObject/ArgumentRemover.php index 9cffc9be2d0..1dd14f67292 100644 --- a/rules/Removing/ValueObject/ArgumentRemover.php +++ b/rules/Removing/ValueObject/ArgumentRemover.php @@ -8,35 +8,15 @@ final class ArgumentRemover { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var int - */ - private $position; - - /** - * @var mixed - */ - private $value; - /** * @param mixed $value */ - public function __construct(string $class, string $method, int $position, $value) - { - $this->class = $class; - $this->method = $method; - $this->position = $position; - $this->value = $value; + public function __construct( + private string $class, + private string $method, + private int $position, + private $value + ) { } public function getObjectType(): ObjectType diff --git a/rules/Removing/ValueObject/RemoveFuncCall.php b/rules/Removing/ValueObject/RemoveFuncCall.php index 9853b46d819..42c0c136177 100644 --- a/rules/Removing/ValueObject/RemoveFuncCall.php +++ b/rules/Removing/ValueObject/RemoveFuncCall.php @@ -6,23 +6,13 @@ final class RemoveFuncCall { - /** - * @var string - */ - private $funcCall; - - /** - * @var array - */ - private $argumentPositionAndValues = []; - /** * @param array $argumentPositionAndValues */ - public function __construct(string $funcCall, array $argumentPositionAndValues = []) - { - $this->funcCall = $funcCall; - $this->argumentPositionAndValues = $argumentPositionAndValues; + public function __construct( + private string $funcCall, + private array $argumentPositionAndValues = [] + ) { } public function getFuncCall(): string diff --git a/rules/Removing/ValueObject/RemoveFuncCallArg.php b/rules/Removing/ValueObject/RemoveFuncCallArg.php index 514cb48c501..ef9123f411d 100644 --- a/rules/Removing/ValueObject/RemoveFuncCallArg.php +++ b/rules/Removing/ValueObject/RemoveFuncCallArg.php @@ -6,20 +6,10 @@ final class RemoveFuncCallArg { - /** - * @var string - */ - private $function; - - /** - * @var int - */ - private $argumentPosition; - - public function __construct(string $function, int $argumentPosition) - { - $this->function = $function; - $this->argumentPosition = $argumentPosition; + public function __construct( + private string $function, + private int $argumentPosition + ) { } public function getFunction(): string diff --git a/rules/RemovingStatic/NodeAnalyzer/SetUpClassMethodUpdater.php b/rules/RemovingStatic/NodeAnalyzer/SetUpClassMethodUpdater.php index bd962f8c830..f5274f8374f 100644 --- a/rules/RemovingStatic/NodeAnalyzer/SetUpClassMethodUpdater.php +++ b/rules/RemovingStatic/NodeAnalyzer/SetUpClassMethodUpdater.php @@ -13,14 +13,9 @@ final class SetUpClassMethodUpdater { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function updateSetUpMethod( diff --git a/rules/RemovingStatic/NodeAnalyzer/StaticCallPresenceAnalyzer.php b/rules/RemovingStatic/NodeAnalyzer/StaticCallPresenceAnalyzer.php index f997df259a1..8b225e7cedc 100644 --- a/rules/RemovingStatic/NodeAnalyzer/StaticCallPresenceAnalyzer.php +++ b/rules/RemovingStatic/NodeAnalyzer/StaticCallPresenceAnalyzer.php @@ -15,20 +15,10 @@ final class StaticCallPresenceAnalyzer { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeTypeResolver $nodeTypeResolver) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeTypeResolver $nodeTypeResolver + ) { } public function hasMethodStaticCallOnType(ClassMethod $classMethod, ObjectType $objectType): bool diff --git a/rules/RemovingStatic/NodeFactory/SelfContainerFactory.php b/rules/RemovingStatic/NodeFactory/SelfContainerFactory.php index b4e116b5c1e..88ccfd1662d 100644 --- a/rules/RemovingStatic/NodeFactory/SelfContainerFactory.php +++ b/rules/RemovingStatic/NodeFactory/SelfContainerFactory.php @@ -15,14 +15,9 @@ final class SelfContainerFactory { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } public function createGetTypeMethodCall(ObjectType $objectType): MethodCall diff --git a/rules/RemovingStatic/NodeFactory/SetUpFactory.php b/rules/RemovingStatic/NodeFactory/SetUpFactory.php index 5b7d2233d0e..35b85f4ed58 100644 --- a/rules/RemovingStatic/NodeFactory/SetUpFactory.php +++ b/rules/RemovingStatic/NodeFactory/SetUpFactory.php @@ -10,14 +10,9 @@ final class SetUpFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - public function __construct(NodeFactory $nodeFactory) - { - $this->nodeFactory = $nodeFactory; + public function __construct( + private NodeFactory $nodeFactory + ) { } public function createParentStaticCall(): Expression diff --git a/rules/RemovingStatic/Printer/FactoryClassPrinter.php b/rules/RemovingStatic/Printer/FactoryClassPrinter.php index e703f9a466b..7161859f7c9 100644 --- a/rules/RemovingStatic/Printer/FactoryClassPrinter.php +++ b/rules/RemovingStatic/Printer/FactoryClassPrinter.php @@ -16,36 +16,12 @@ final class FactoryClassPrinter { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - public function __construct( - BetterStandardPrinter $betterStandardPrinter, - SmartFileSystem $smartFileSystem, - NodeNameResolver $nodeNameResolver, - CurrentFileProvider $currentFileProvider + private BetterStandardPrinter $betterStandardPrinter, + private SmartFileSystem $smartFileSystem, + private NodeNameResolver $nodeNameResolver, + private CurrentFileProvider $currentFileProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterStandardPrinter = $betterStandardPrinter; - $this->smartFileSystem = $smartFileSystem; - $this->currentFileProvider = $currentFileProvider; } public function printFactoryForClass(Class_ $factoryClass, Class_ $oldClass): void diff --git a/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php b/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php index b5777344373..9abd5bb7216 100644 --- a/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php +++ b/rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php @@ -21,14 +21,9 @@ */ final class LocallyCalledStaticMethodToNonStaticRector extends AbstractRector { - /** - * @var ClassMethodVisibilityGuard - */ - private $classMethodVisibilityGuard; - - public function __construct(ClassMethodVisibilityGuard $classMethodVisibilityGuard) - { - $this->classMethodVisibilityGuard = $classMethodVisibilityGuard; + public function __construct( + private ClassMethodVisibilityGuard $classMethodVisibilityGuard + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/Class_/DesiredClassTypeToDynamicRector.php b/rules/RemovingStatic/Rector/Class_/DesiredClassTypeToDynamicRector.php index f69ee0a074b..62daa1aed1a 100644 --- a/rules/RemovingStatic/Rector/Class_/DesiredClassTypeToDynamicRector.php +++ b/rules/RemovingStatic/Rector/Class_/DesiredClassTypeToDynamicRector.php @@ -30,28 +30,15 @@ final class DesiredClassTypeToDynamicRector extends AbstractRector */ private $staticObjectTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var StaticCallPresenceAnalyzer - */ - private $staticCallPresenceAnalyzer; - public function __construct( - PropertyNaming $propertyNaming, - StaticCallPresenceAnalyzer $staticCallPresenceAnalyzer, + private PropertyNaming $propertyNaming, + private StaticCallPresenceAnalyzer $staticCallPresenceAnalyzer, ParameterProvider $parameterProvider ) { $typesToRemoveStaticFrom = $parameterProvider->provideArrayParameter(Option::TYPES_TO_REMOVE_STATIC_FROM); foreach ($typesToRemoveStaticFrom as $typeToRemoveStaticFrom) { $this->staticObjectTypes[] = new ObjectType($typeToRemoveStaticFrom); } - - $this->propertyNaming = $propertyNaming; - $this->staticCallPresenceAnalyzer = $staticCallPresenceAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php b/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php index 55c27c16055..088e55d469a 100644 --- a/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php +++ b/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php @@ -53,20 +53,10 @@ final class NewUniqueObjectToEntityFactoryRector extends AbstractRector implemen */ private $classesUsingTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var StaticTypesInClassResolver - */ - private $staticTypesInClassResolver; - - public function __construct(PropertyNaming $propertyNaming, StaticTypesInClassResolver $staticTypesInClassResolver) - { - $this->propertyNaming = $propertyNaming; - $this->staticTypesInClassResolver = $staticTypesInClassResolver; + public function __construct( + private PropertyNaming $propertyNaming, + private StaticTypesInClassResolver $staticTypesInClassResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector.php b/rules/RemovingStatic/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector.php index ee44c9ff4ad..8780a778fe9 100644 --- a/rules/RemovingStatic/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector.php +++ b/rules/RemovingStatic/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector.php @@ -49,50 +49,14 @@ final class PHPUnitStaticToKernelTestCaseGetRector extends AbstractRector implem */ private $newPropertyObjectTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var SetUpClassMethodFactory - */ - private $setUpClassMethodFactory; - - /** - * @var SetUpFactory - */ - private $setUpFactory; - - /** - * @var SelfContainerFactory - */ - private $selfContainerFactory; - - /** - * @var SetUpClassMethodUpdater - */ - private $setUpClassMethodUpdater; - public function __construct( - PropertyNaming $propertyNaming, - ClassInsertManipulator $classInsertManipulator, - SetUpClassMethodFactory $setUpClassMethodFactory, - SetUpFactory $setUpFactory, - SelfContainerFactory $selfContainerFactory, - SetUpClassMethodUpdater $setUpClassMethodUpdater + private PropertyNaming $propertyNaming, + private ClassInsertManipulator $classInsertManipulator, + private SetUpClassMethodFactory $setUpClassMethodFactory, + private SetUpFactory $setUpFactory, + private SelfContainerFactory $selfContainerFactory, + private SetUpClassMethodUpdater $setUpClassMethodUpdater ) { - $this->propertyNaming = $propertyNaming; - $this->classInsertManipulator = $classInsertManipulator; - $this->setUpClassMethodFactory = $setUpClassMethodFactory; - $this->setUpFactory = $setUpFactory; - $this->selfContainerFactory = $selfContainerFactory; - $this->setUpClassMethodUpdater = $setUpClassMethodUpdater; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/Class_/PassFactoryToUniqueObjectRector.php b/rules/RemovingStatic/Rector/Class_/PassFactoryToUniqueObjectRector.php index 502cc26605a..a21250cb747 100644 --- a/rules/RemovingStatic/Rector/Class_/PassFactoryToUniqueObjectRector.php +++ b/rules/RemovingStatic/Rector/Class_/PassFactoryToUniqueObjectRector.php @@ -37,43 +37,13 @@ final class PassFactoryToUniqueObjectRector extends AbstractRector implements Co */ private $serviceObjectTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var UniqueObjectOrServiceDetector - */ - private $uniqueObjectOrServiceDetector; - - /** - * @var UniqueObjectFactoryFactory - */ - private $uniqueObjectFactoryFactory; - - /** - * @var FactoryClassPrinter - */ - private $factoryClassPrinter; - - /** - * @var StaticTypesInClassResolver - */ - private $staticTypesInClassResolver; - public function __construct( - StaticTypesInClassResolver $staticTypesInClassResolver, - PropertyNaming $propertyNaming, - UniqueObjectOrServiceDetector $uniqueObjectOrServiceDetector, - UniqueObjectFactoryFactory $uniqueObjectFactoryFactory, - FactoryClassPrinter $factoryClassPrinter + private StaticTypesInClassResolver $staticTypesInClassResolver, + private PropertyNaming $propertyNaming, + private UniqueObjectOrServiceDetector $uniqueObjectOrServiceDetector, + private UniqueObjectFactoryFactory $uniqueObjectFactoryFactory, + private FactoryClassPrinter $factoryClassPrinter ) { - $this->propertyNaming = $propertyNaming; - $this->uniqueObjectOrServiceDetector = $uniqueObjectOrServiceDetector; - $this->uniqueObjectFactoryFactory = $uniqueObjectFactoryFactory; - $this->factoryClassPrinter = $factoryClassPrinter; - $this->staticTypesInClassResolver = $staticTypesInClassResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/Class_/StaticTypeToSetterInjectionRector.php b/rules/RemovingStatic/Rector/Class_/StaticTypeToSetterInjectionRector.php index 35b36f2be38..480d25b0209 100644 --- a/rules/RemovingStatic/Rector/Class_/StaticTypeToSetterInjectionRector.php +++ b/rules/RemovingStatic/Rector/Class_/StaticTypeToSetterInjectionRector.php @@ -36,20 +36,10 @@ final class StaticTypeToSetterInjectionRector extends AbstractRector implements */ private $staticTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PropertyNaming $propertyNaming, PhpDocTypeChanger $phpDocTypeChanger) - { - $this->propertyNaming = $propertyNaming; - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PropertyNaming $propertyNaming, + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php b/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php index 011e7fb93b8..62bee470747 100644 --- a/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php +++ b/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php @@ -29,19 +29,14 @@ final class DesiredStaticCallTypeToDynamicRector extends AbstractRector */ private $staticObjectTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - public function __construct(PropertyNaming $propertyNaming, ParameterProvider $parameterProvider) - { + public function __construct( + private PropertyNaming $propertyNaming, + ParameterProvider $parameterProvider + ) { $typesToRemoveStaticFrom = $parameterProvider->provideArrayParameter(Option::TYPES_TO_REMOVE_STATIC_FROM); foreach ($typesToRemoveStaticFrom as $typeToRemoveStaticFrom) { $this->staticObjectTypes[] = new ObjectType($typeToRemoveStaticFrom); } - - $this->propertyNaming = $propertyNaming; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php b/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php index 7b0e57725b4..ae4615d6743 100644 --- a/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php +++ b/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php @@ -30,19 +30,14 @@ final class DesiredStaticPropertyFetchTypeToDynamicRector extends AbstractRector */ private $staticObjectTypes = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - public function __construct(PropertyNaming $propertyNaming, ParameterProvider $parameterProvider) - { + public function __construct( + private PropertyNaming $propertyNaming, + ParameterProvider $parameterProvider + ) { $typesToRemoveStaticFrom = $parameterProvider->provideArrayParameter(Option::TYPES_TO_REMOVE_STATIC_FROM); foreach ($typesToRemoveStaticFrom as $typeToRemoveStaticFrom) { $this->staticObjectTypes[] = new ObjectType($typeToRemoveStaticFrom); } - - $this->propertyNaming = $propertyNaming; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/RemovingStatic/StaticTypesInClassResolver.php b/rules/RemovingStatic/StaticTypesInClassResolver.php index a8f42a3efb9..fb975ed56d2 100644 --- a/rules/RemovingStatic/StaticTypesInClassResolver.php +++ b/rules/RemovingStatic/StaticTypesInClassResolver.php @@ -13,22 +13,10 @@ final class StaticTypesInClassResolver { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeTypeResolver $nodeTypeResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeTypeResolver $nodeTypeResolver ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeTypeResolver = $nodeTypeResolver; } /** diff --git a/rules/RemovingStatic/UniqueObjectFactoryFactory.php b/rules/RemovingStatic/UniqueObjectFactoryFactory.php index c5a1c631bf9..442be1ca193 100644 --- a/rules/RemovingStatic/UniqueObjectFactoryFactory.php +++ b/rules/RemovingStatic/UniqueObjectFactoryFactory.php @@ -31,50 +31,14 @@ final class UniqueObjectFactoryFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - PropertyNaming $propertyNaming, - StaticTypeMapper $staticTypeMapper, - PhpDocTypeChanger $phpDocTypeChanger, - PhpDocInfoFactory $phpDocInfoFactory + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private PropertyNaming $propertyNaming, + private StaticTypeMapper $staticTypeMapper, + private PhpDocTypeChanger $phpDocTypeChanger, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->propertyNaming = $propertyNaming; - $this->staticTypeMapper = $staticTypeMapper; - $this->nodeFactory = $nodeFactory; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->phpDocInfoFactory = $phpDocInfoFactory; } public function createFactoryClass(Class_ $class, ObjectType $objectType): Class_ diff --git a/rules/Renaming/NodeManipulator/ClassRenamer.php b/rules/Renaming/NodeManipulator/ClassRenamer.php index 9458135d11f..a4f556edc10 100644 --- a/rules/Renaming/NodeManipulator/ClassRenamer.php +++ b/rules/Renaming/NodeManipulator/ClassRenamer.php @@ -40,78 +40,18 @@ final class ClassRenamer */ private $alreadyProcessedClasses = []; - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var PhpDocClassRenamer - */ - private $phpDocClassRenamer; - - /** - * @var ClassNaming - */ - private $classNaming; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var DocBlockClassRenamer - */ - private $docBlockClassRenamer; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeRemover - */ - private $nodeRemover; - - /** - * @var ParameterProvider - */ - private $parameterProvider; - public function __construct( - BetterNodeFinder $betterNodeFinder, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - ClassNaming $classNaming, - NodeNameResolver $nodeNameResolver, - PhpDocClassRenamer $phpDocClassRenamer, - PhpDocInfoFactory $phpDocInfoFactory, - DocBlockClassRenamer $docBlockClassRenamer, - ReflectionProvider $reflectionProvider, - NodeRemover $nodeRemover, - ParameterProvider $parameterProvider + private BetterNodeFinder $betterNodeFinder, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private ClassNaming $classNaming, + private NodeNameResolver $nodeNameResolver, + private PhpDocClassRenamer $phpDocClassRenamer, + private PhpDocInfoFactory $phpDocInfoFactory, + private DocBlockClassRenamer $docBlockClassRenamer, + private ReflectionProvider $reflectionProvider, + private NodeRemover $nodeRemover, + private ParameterProvider $parameterProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->phpDocClassRenamer = $phpDocClassRenamer; - $this->classNaming = $classNaming; - $this->betterNodeFinder = $betterNodeFinder; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->docBlockClassRenamer = $docBlockClassRenamer; - $this->reflectionProvider = $reflectionProvider; - $this->nodeRemover = $nodeRemover; - $this->parameterProvider = $parameterProvider; } /** diff --git a/rules/Renaming/NodeManipulator/IdentifierManipulator.php b/rules/Renaming/NodeManipulator/IdentifierManipulator.php index 24758b4358c..00086a0e63a 100644 --- a/rules/Renaming/NodeManipulator/IdentifierManipulator.php +++ b/rules/Renaming/NodeManipulator/IdentifierManipulator.php @@ -23,14 +23,9 @@ */ final class IdentifierManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php b/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php index 93ecd1b6070..8df46ae2476 100644 --- a/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php +++ b/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php @@ -32,14 +32,9 @@ final class RenameAnnotationRector extends AbstractRector implements Configurabl */ private $renamedAnnotations = []; - /** - * @var DocBlockTagReplacer - */ - private $docBlockTagReplacer; - - public function __construct(DocBlockTagReplacer $docBlockTagReplacer) - { - $this->docBlockTagReplacer = $docBlockTagReplacer; + public function __construct( + private DocBlockTagReplacer $docBlockTagReplacer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php b/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php index cccaa1d56b4..4e75a410441 100644 --- a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php +++ b/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php @@ -45,19 +45,14 @@ final class PseudoNamespaceToNamespaceRector extends AbstractRector implements C */ private $pseudoNamespacesToNamespaces = []; - /** - * @var PhpDocTypeRenamer - */ - private $phpDocTypeRenamer; - /** * @var string|null */ private $newNamespace; - public function __construct(PhpDocTypeRenamer $phpDocTypeRenamer) - { - $this->phpDocTypeRenamer = $phpDocTypeRenamer; + public function __construct( + private PhpDocTypeRenamer $phpDocTypeRenamer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Renaming/Rector/MethodCall/RenameMethodRector.php b/rules/Renaming/Rector/MethodCall/RenameMethodRector.php index f28b12637d9..9e2d6c4f4cb 100644 --- a/rules/Renaming/Rector/MethodCall/RenameMethodRector.php +++ b/rules/Renaming/Rector/MethodCall/RenameMethodRector.php @@ -40,22 +40,10 @@ final class RenameMethodRector extends AbstractRector implements ConfigurableRec */ private $methodCallRenames = []; - /** - * @var ClassManipulator - */ - private $classManipulator; - - /** - * @var MethodCallRenameCollector - */ - private $methodCallRenameCollector; - public function __construct( - ClassManipulator $classManipulator, - MethodCallRenameCollector $methodCallRenameCollector + private ClassManipulator $classManipulator, + private MethodCallRenameCollector $methodCallRenameCollector ) { - $this->classManipulator = $classManipulator; - $this->methodCallRenameCollector = $methodCallRenameCollector; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Renaming/Rector/Name/RenameClassRector.php b/rules/Renaming/Rector/Name/RenameClassRector.php index 1772d06d4c7..a6137c9ef96 100644 --- a/rules/Renaming/Rector/Name/RenameClassRector.php +++ b/rules/Renaming/Rector/Name/RenameClassRector.php @@ -34,20 +34,10 @@ final class RenameClassRector extends AbstractRector implements ConfigurableRect */ private $oldToNewClasses = []; - /** - * @var ClassRenamer - */ - private $classRenamer; - - /** - * @var RenamedClassesDataCollector - */ - private $renamedClassesDataCollector; - - public function __construct(RenamedClassesDataCollector $renamedClassesDataCollector, ClassRenamer $classRenamer) - { - $this->classRenamer = $classRenamer; - $this->renamedClassesDataCollector = $renamedClassesDataCollector; + public function __construct( + private RenamedClassesDataCollector $renamedClassesDataCollector, + private ClassRenamer $classRenamer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Renaming/Rector/Namespace_/RenameNamespaceRector.php b/rules/Renaming/Rector/Namespace_/RenameNamespaceRector.php index 7fd4f47907b..f224caf42eb 100644 --- a/rules/Renaming/Rector/Namespace_/RenameNamespaceRector.php +++ b/rules/Renaming/Rector/Namespace_/RenameNamespaceRector.php @@ -35,14 +35,9 @@ final class RenameNamespaceRector extends AbstractRector implements Configurable */ private $oldToNewNamespaces = []; - /** - * @var NamespaceMatcher - */ - private $namespaceMatcher; - - public function __construct(NamespaceMatcher $namespaceMatcher) - { - $this->namespaceMatcher = $namespaceMatcher; + public function __construct( + private NamespaceMatcher $namespaceMatcher + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Renaming/ValueObject/MethodCallRename.php b/rules/Renaming/ValueObject/MethodCallRename.php index 6dff7da0157..85782f59f53 100644 --- a/rules/Renaming/ValueObject/MethodCallRename.php +++ b/rules/Renaming/ValueObject/MethodCallRename.php @@ -9,26 +9,11 @@ final class MethodCallRename implements MethodCallRenameInterface { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newMethod; - - public function __construct(string $oldClass, string $oldMethod, string $newMethod) - { - $this->oldClass = $oldClass; - $this->oldMethod = $oldMethod; - $this->newMethod = $newMethod; + public function __construct( + private string $oldClass, + private string $oldMethod, + private string $newMethod + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php b/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php index c6862efeab9..75110e03994 100644 --- a/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php +++ b/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php @@ -9,35 +9,15 @@ final class MethodCallRenameWithArrayKey implements MethodCallRenameInterface { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newMethod; - - /** - * @var mixed - */ - private $arrayKey; - /** * @param mixed $arrayKey */ - public function __construct(string $oldClass, string $oldMethod, string $newMethod, $arrayKey) - { - $this->oldClass = $oldClass; - $this->oldMethod = $oldMethod; - $this->newMethod = $newMethod; - $this->arrayKey = $arrayKey; + public function __construct( + private string $oldClass, + private string $oldMethod, + private string $newMethod, + private $arrayKey + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php b/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php index a01f8275c28..b6308b37370 100644 --- a/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php +++ b/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php @@ -6,23 +6,13 @@ final class PseudoNamespaceToNamespace { - /** - * @var string - */ - private $namespacePrefix; - - /** - * @var string[] - */ - private $excludedClasses = []; - /** * @param string[] $excludedClasses */ - public function __construct(string $namespacePrefix, array $excludedClasses = []) - { - $this->namespacePrefix = $namespacePrefix; - $this->excludedClasses = $excludedClasses; + public function __construct( + private string $namespacePrefix, + private array $excludedClasses = [] + ) { } public function getNamespacePrefix(): string diff --git a/rules/Renaming/ValueObject/RenameAnnotation.php b/rules/Renaming/ValueObject/RenameAnnotation.php index 7ec0c47d647..ced35d18001 100644 --- a/rules/Renaming/ValueObject/RenameAnnotation.php +++ b/rules/Renaming/ValueObject/RenameAnnotation.php @@ -8,26 +8,11 @@ final class RenameAnnotation { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $oldAnnotation; - - /** - * @var string - */ - private $newAnnotation; - - public function __construct(string $type, string $oldAnnotation, string $newAnnotation) - { - $this->type = $type; - $this->oldAnnotation = $oldAnnotation; - $this->newAnnotation = $newAnnotation; + public function __construct( + private string $type, + private string $oldAnnotation, + private string $newAnnotation + ) { } public function getObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/RenameClassAndConstFetch.php b/rules/Renaming/ValueObject/RenameClassAndConstFetch.php index 1f9bc30b00d..f2f181a0497 100644 --- a/rules/Renaming/ValueObject/RenameClassAndConstFetch.php +++ b/rules/Renaming/ValueObject/RenameClassAndConstFetch.php @@ -9,32 +9,12 @@ final class RenameClassAndConstFetch implements RenameClassConstFetchInterface { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldConstant; - - /** - * @var string - */ - private $newConstant; - - /** - * @var string - */ - private $newClass; - - public function __construct(string $oldClass, string $oldConstant, string $newClass, string $newConstant) - { - $this->oldClass = $oldClass; - $this->oldConstant = $oldConstant; - $this->newConstant = $newConstant; - $this->newClass = $newClass; + public function __construct( + private string $oldClass, + private string $oldConstant, + private string $newClass, + private string $newConstant + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/RenameClassConstFetch.php b/rules/Renaming/ValueObject/RenameClassConstFetch.php index 8e3235bbb83..3fb3f074d0c 100644 --- a/rules/Renaming/ValueObject/RenameClassConstFetch.php +++ b/rules/Renaming/ValueObject/RenameClassConstFetch.php @@ -9,26 +9,11 @@ final class RenameClassConstFetch implements RenameClassConstFetchInterface { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldConstant; - - /** - * @var string - */ - private $newConstant; - - public function __construct(string $oldClass, string $oldConstant, string $newConstant) - { - $this->oldClass = $oldClass; - $this->oldConstant = $oldConstant; - $this->newConstant = $newConstant; + public function __construct( + private string $oldClass, + private string $oldConstant, + private string $newConstant + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/RenameProperty.php b/rules/Renaming/ValueObject/RenameProperty.php index 676299b77da..1deb7751aee 100644 --- a/rules/Renaming/ValueObject/RenameProperty.php +++ b/rules/Renaming/ValueObject/RenameProperty.php @@ -8,26 +8,11 @@ final class RenameProperty { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $oldProperty; - - /** - * @var string - */ - private $newProperty; - - public function __construct(string $type, string $oldProperty, string $newProperty) - { - $this->type = $type; - $this->oldProperty = $oldProperty; - $this->newProperty = $newProperty; + public function __construct( + private string $type, + private string $oldProperty, + private string $newProperty + ) { } public function getObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/RenameStaticMethod.php b/rules/Renaming/ValueObject/RenameStaticMethod.php index 8b30f406dce..2c3aba82ab1 100644 --- a/rules/Renaming/ValueObject/RenameStaticMethod.php +++ b/rules/Renaming/ValueObject/RenameStaticMethod.php @@ -8,32 +8,12 @@ final class RenameStaticMethod { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newClass; - - /** - * @var string - */ - private $newMethod; - - public function __construct(string $oldClass, string $oldMethod, string $newClass, string $newMethod) - { - $this->oldClass = $oldClass; - $this->oldMethod = $oldMethod; - $this->newClass = $newClass; - $this->newMethod = $newMethod; + public function __construct( + private string $oldClass, + private string $oldMethod, + private string $newClass, + private string $newMethod + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Renaming/ValueObject/RenamedNamespace.php b/rules/Renaming/ValueObject/RenamedNamespace.php index c4416e6df60..05d26a8c11b 100644 --- a/rules/Renaming/ValueObject/RenamedNamespace.php +++ b/rules/Renaming/ValueObject/RenamedNamespace.php @@ -6,26 +6,11 @@ final class RenamedNamespace { - /** - * @var string - */ - private $oldNamespace; - - /** - * @var string - */ - private $newNamespace; - - /** - * @var string - */ - private $currentName; - - public function __construct(string $currentNamespaceName, string $oldNamespace, string $newNamespace) - { - $this->currentName = $currentNamespaceName; - $this->oldNamespace = $oldNamespace; - $this->newNamespace = $newNamespace; + public function __construct( + private string $currentName, + private string $oldNamespace, + private string $newNamespace + ) { } public function getNameInNewNamespace(): string diff --git a/rules/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector.php b/rules/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector.php index d29ce7a4613..9df0ec5bf3e 100644 --- a/rules/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector.php +++ b/rules/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector.php @@ -17,14 +17,9 @@ */ final class MissingClassConstantReferenceToStringRector extends AbstractRector { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Restoration/Rector/ClassMethod/InferParamFromClassMethodReturnRector.php b/rules/Restoration/Rector/ClassMethod/InferParamFromClassMethodReturnRector.php index 66a6431e5c5..6ec6aad687a 100644 --- a/rules/Restoration/Rector/ClassMethod/InferParamFromClassMethodReturnRector.php +++ b/rules/Restoration/Rector/ClassMethod/InferParamFromClassMethodReturnRector.php @@ -39,29 +39,11 @@ final class InferParamFromClassMethodReturnRector extends AbstractRector impleme */ private $inferParamFromClassMethodReturn = []; - /** - * @var ReturnTypeInferer - */ - private $returnTypeInferer; - - /** - * @var ConstantReturnToParamTypeConverter - */ - private $constantReturnToParamTypeConverter; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - public function __construct( - ReturnTypeInferer $returnTypeInferer, - ConstantReturnToParamTypeConverter $constantReturnToParamTypeConverter, - PhpDocTypeChanger $phpDocTypeChanger + private ReturnTypeInferer $returnTypeInferer, + private ConstantReturnToParamTypeConverter $constantReturnToParamTypeConverter, + private PhpDocTypeChanger $phpDocTypeChanger ) { - $this->returnTypeInferer = $returnTypeInferer; - $this->constantReturnToParamTypeConverter = $constantReturnToParamTypeConverter; - $this->phpDocTypeChanger = $phpDocTypeChanger; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Restoration/Rector/New_/CompleteMissingDependencyInNewRector.php b/rules/Restoration/Rector/New_/CompleteMissingDependencyInNewRector.php index 5b0addd3095..e713171042a 100644 --- a/rules/Restoration/Rector/New_/CompleteMissingDependencyInNewRector.php +++ b/rules/Restoration/Rector/New_/CompleteMissingDependencyInNewRector.php @@ -33,14 +33,9 @@ final class CompleteMissingDependencyInNewRector extends AbstractRector implemen */ private $classToInstantiateByType = []; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Restoration/Type/ConstantReturnToParamTypeConverter.php b/rules/Restoration/Type/ConstantReturnToParamTypeConverter.php index 8a5abc45c80..c36f136aa95 100644 --- a/rules/Restoration/Type/ConstantReturnToParamTypeConverter.php +++ b/rules/Restoration/Type/ConstantReturnToParamTypeConverter.php @@ -16,14 +16,9 @@ final class ConstantReturnToParamTypeConverter { - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } public function convert(Type $type): Type diff --git a/rules/Restoration/ValueObject/CompleteImportForPartialAnnotation.php b/rules/Restoration/ValueObject/CompleteImportForPartialAnnotation.php index 0b92576ad5c..bb962f8e9e5 100644 --- a/rules/Restoration/ValueObject/CompleteImportForPartialAnnotation.php +++ b/rules/Restoration/ValueObject/CompleteImportForPartialAnnotation.php @@ -6,20 +6,10 @@ final class CompleteImportForPartialAnnotation { - /** - * @var string - */ - private $use; - - /** - * @var string - */ - private $alias; - - public function __construct(string $use, string $alias) - { - $this->use = $use; - $this->alias = $alias; + public function __construct( + private string $use, + private string $alias + ) { } public function getUse(): string diff --git a/rules/Restoration/ValueObject/InferParamFromClassMethodReturn.php b/rules/Restoration/ValueObject/InferParamFromClassMethodReturn.php index 04f457bd2da..e29b38ba98e 100644 --- a/rules/Restoration/ValueObject/InferParamFromClassMethodReturn.php +++ b/rules/Restoration/ValueObject/InferParamFromClassMethodReturn.php @@ -6,26 +6,11 @@ final class InferParamFromClassMethodReturn { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $paramMethod; - - /** - * @var string - */ - private $returnMethod; - - public function __construct(string $class, string $paramMethod, string $returnMethod) - { - $this->class = $class; - $this->paramMethod = $paramMethod; - $this->returnMethod = $returnMethod; + public function __construct( + private string $class, + private string $paramMethod, + private string $returnMethod + ) { } public function getClass(): string diff --git a/rules/Transform/Naming/FullyQualifiedNameResolver.php b/rules/Transform/Naming/FullyQualifiedNameResolver.php index 241541659ac..1eb7b88fe3a 100644 --- a/rules/Transform/Naming/FullyQualifiedNameResolver.php +++ b/rules/Transform/Naming/FullyQualifiedNameResolver.php @@ -11,20 +11,10 @@ final class FullyQualifiedNameResolver { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver) - { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php b/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php index 8c60fab7bec..d36580707bd 100644 --- a/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php +++ b/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php @@ -22,50 +22,14 @@ final class FuncCallStaticCallToMethodCallAnalyzer { - /** - * @var TypeProvidingExprFromClassResolver - */ - private $typeProvidingExprFromClassResolver; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var PropertyFetchFactory - */ - private $propertyFetchFactory; - - /** - * @var PropertyAdder - */ - private $propertyAdder; - public function __construct( - TypeProvidingExprFromClassResolver $typeProvidingExprFromClassResolver, - PropertyNaming $propertyNaming, - NodeNameResolver $nodeNameResolver, - NodeFactory $nodeFactory, - PropertyFetchFactory $propertyFetchFactory, - PropertyAdder $propertyAdder + private TypeProvidingExprFromClassResolver $typeProvidingExprFromClassResolver, + private PropertyNaming $propertyNaming, + private NodeNameResolver $nodeNameResolver, + private NodeFactory $nodeFactory, + private PropertyFetchFactory $propertyFetchFactory, + private PropertyAdder $propertyAdder ) { - $this->typeProvidingExprFromClassResolver = $typeProvidingExprFromClassResolver; - $this->propertyNaming = $propertyNaming; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeFactory = $nodeFactory; - $this->propertyFetchFactory = $propertyFetchFactory; - $this->propertyAdder = $propertyAdder; } /** diff --git a/rules/Transform/NodeAnalyzer/SingletonClassMethodAnalyzer.php b/rules/Transform/NodeAnalyzer/SingletonClassMethodAnalyzer.php index 4ffcb43a9da..488961b7742 100644 --- a/rules/Transform/NodeAnalyzer/SingletonClassMethodAnalyzer.php +++ b/rules/Transform/NodeAnalyzer/SingletonClassMethodAnalyzer.php @@ -21,29 +21,11 @@ final class SingletonClassMethodAnalyzer { - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ValueResolver - */ - private $valueResolver; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - ValueResolver $valueResolver, - NodeComparator $nodeComparator + private NodeTypeResolver $nodeTypeResolver, + private ValueResolver $valueResolver, + private NodeComparator $nodeComparator ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->valueResolver = $valueResolver; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/Transform/NodeFactory/PropertyFetchFactory.php b/rules/Transform/NodeFactory/PropertyFetchFactory.php index e084ce9d8f0..3f8a7aa1de2 100644 --- a/rules/Transform/NodeFactory/PropertyFetchFactory.php +++ b/rules/Transform/NodeFactory/PropertyFetchFactory.php @@ -11,14 +11,9 @@ final class PropertyFetchFactory { - /** - * @var PropertyNaming - */ - private $propertyNaming; - - public function __construct(PropertyNaming $propertyNaming) - { - $this->propertyNaming = $propertyNaming; + public function __construct( + private PropertyNaming $propertyNaming + ) { } public function createFromType(ObjectType $objectType): PropertyFetch diff --git a/rules/Transform/NodeFactory/ProvideConfigFilePathClassMethodFactory.php b/rules/Transform/NodeFactory/ProvideConfigFilePathClassMethodFactory.php index 54ed2060f41..1ebb70f0446 100644 --- a/rules/Transform/NodeFactory/ProvideConfigFilePathClassMethodFactory.php +++ b/rules/Transform/NodeFactory/ProvideConfigFilePathClassMethodFactory.php @@ -14,14 +14,9 @@ final class ProvideConfigFilePathClassMethodFactory { - /** - * @var NodeFactory - */ - private $nodeFactory; - - public function __construct(NodeFactory $nodeFactory) - { - $this->nodeFactory = $nodeFactory; + public function __construct( + private NodeFactory $nodeFactory + ) { } public function create(): ClassMethod diff --git a/rules/Transform/NodeFactory/StaticMethodClassFactory.php b/rules/Transform/NodeFactory/StaticMethodClassFactory.php index d2a1fccee16..09abf29365b 100644 --- a/rules/Transform/NodeFactory/StaticMethodClassFactory.php +++ b/rules/Transform/NodeFactory/StaticMethodClassFactory.php @@ -12,20 +12,10 @@ final class StaticMethodClassFactory { - /** - * @var ClassMethodFactory - */ - private $classMethodFactory; - - /** - * @var ClassNaming - */ - private $classNaming; - - public function __construct(ClassMethodFactory $classMethodFactory, ClassNaming $classNaming) - { - $this->classMethodFactory = $classMethodFactory; - $this->classNaming = $classNaming; + public function __construct( + private ClassMethodFactory $classMethodFactory, + private ClassNaming $classNaming + ) { } /** diff --git a/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php b/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php index a85d9fde64c..7eafc5d2e23 100644 --- a/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php +++ b/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php @@ -29,36 +29,12 @@ final class TypeProvidingExprFromClassResolver { - /** - * @var TypeUnwrapper - */ - private $typeUnwrapper; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - public function __construct( - TypeUnwrapper $typeUnwrapper, - ReflectionProvider $reflectionProvider, - NodeNameResolver $nodeNameResolver, - PropertyNaming $propertyNaming + private TypeUnwrapper $typeUnwrapper, + private ReflectionProvider $reflectionProvider, + private NodeNameResolver $nodeNameResolver, + private PropertyNaming $propertyNaming ) { - $this->typeUnwrapper = $typeUnwrapper; - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; - $this->propertyNaming = $propertyNaming; } /** diff --git a/rules/Transform/Rector/Assign/GetAndSetToMethodCallRector.php b/rules/Transform/Rector/Assign/GetAndSetToMethodCallRector.php index cda0def6b3c..11dc5c30e8c 100644 --- a/rules/Transform/Rector/Assign/GetAndSetToMethodCallRector.php +++ b/rules/Transform/Rector/Assign/GetAndSetToMethodCallRector.php @@ -36,22 +36,10 @@ final class GetAndSetToMethodCallRector extends AbstractRector implements Config */ private $getAndSetToMethodCalls = []; - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var MagicPropertyFetchAnalyzer - */ - private $magicPropertyFetchAnalyzer; - public function __construct( - PropertyFetchAnalyzer $propertyFetchAnalyzer, - MagicPropertyFetchAnalyzer $magicPropertyFetchAnalyzer + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private MagicPropertyFetchAnalyzer $magicPropertyFetchAnalyzer ) { - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->magicPropertyFetchAnalyzer = $magicPropertyFetchAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php b/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php index 1c3285837ef..c5d24f8eae0 100644 --- a/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php +++ b/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php @@ -36,14 +36,9 @@ final class SingleToManyMethodRector extends AbstractRector implements Configura */ private $singleToManyMethods = []; - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PhpDocTypeChanger $phpDocTypeChanger) - { - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php b/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php index 1fdb48f339a..eecfab3beed 100644 --- a/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php +++ b/rules/Transform/Rector/Class_/ChangeSingletonToServiceRector.php @@ -23,22 +23,10 @@ */ final class ChangeSingletonToServiceRector extends AbstractRector { - /** - * @var SingletonClassMethodAnalyzer - */ - private $singletonClassMethodAnalyzer; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - SingletonClassMethodAnalyzer $singletonClassMethodAnalyzer, - ClassAnalyzer $classAnalyzer + private SingletonClassMethodAnalyzer $singletonClassMethodAnalyzer, + private ClassAnalyzer $classAnalyzer ) { - $this->singletonClassMethodAnalyzer = $singletonClassMethodAnalyzer; - $this->classAnalyzer = $classAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php b/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php index 9a1198f6ee7..62b42e77084 100644 --- a/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php +++ b/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php @@ -34,20 +34,10 @@ final class ParentClassToTraitsRector extends AbstractRector implements Configur */ private $parentClassToTraits = []; - /** - * @var ClassInsertManipulator - */ - private $classInsertManipulator; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - public function __construct(ClassInsertManipulator $classInsertManipulator, ClassAnalyzer $classAnalyzer) - { - $this->classInsertManipulator = $classInsertManipulator; - $this->classAnalyzer = $classAnalyzer; + public function __construct( + private ClassInsertManipulator $classInsertManipulator, + private ClassAnalyzer $classAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/FileWithoutNamespace/FunctionToStaticMethodRector.php b/rules/Transform/Rector/FileWithoutNamespace/FunctionToStaticMethodRector.php index 10cb1d43a29..f36f82ed281 100644 --- a/rules/Transform/Rector/FileWithoutNamespace/FunctionToStaticMethodRector.php +++ b/rules/Transform/Rector/FileWithoutNamespace/FunctionToStaticMethodRector.php @@ -27,29 +27,11 @@ */ final class FunctionToStaticMethodRector extends AbstractRector { - /** - * @var ClassNaming - */ - private $classNaming; - - /** - * @var StaticMethodClassFactory - */ - private $staticMethodClassFactory; - - /** - * @var FullyQualifiedNameResolver - */ - private $fullyQualifiedNameResolver; - public function __construct( - ClassNaming $classNaming, - StaticMethodClassFactory $staticMethodClassFactory, - FullyQualifiedNameResolver $fullyQualifiedNameResolver + private ClassNaming $classNaming, + private StaticMethodClassFactory $staticMethodClassFactory, + private FullyQualifiedNameResolver $fullyQualifiedNameResolver ) { - $this->classNaming = $classNaming; - $this->staticMethodClassFactory = $staticMethodClassFactory; - $this->fullyQualifiedNameResolver = $fullyQualifiedNameResolver; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php b/rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php index 958024540a7..5e605ada048 100644 --- a/rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php +++ b/rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php @@ -50,20 +50,10 @@ final class ArgumentFuncCallToMethodCallRector extends AbstractRector implements */ private $arrayFunctionsToMethodCalls = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var ArrayTypeAnalyzer - */ - private $arrayTypeAnalyzer; - - public function __construct(ArrayTypeAnalyzer $arrayTypeAnalyzer, PropertyNaming $propertyNaming) - { - $this->propertyNaming = $propertyNaming; - $this->arrayTypeAnalyzer = $arrayTypeAnalyzer; + public function __construct( + private ArrayTypeAnalyzer $arrayTypeAnalyzer, + private PropertyNaming $propertyNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php b/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php index ed5950b92ac..5c81d268d36 100644 --- a/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php +++ b/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php @@ -32,14 +32,9 @@ final class FuncCallToMethodCallRector extends AbstractRector implements Configu */ private $funcNameToMethodCallNames = []; - /** - * @var FuncCallStaticCallToMethodCallAnalyzer - */ - private $funcCallStaticCallToMethodCallAnalyzer; - - public function __construct(FuncCallStaticCallToMethodCallAnalyzer $funcCallStaticCallToMethodCallAnalyzer) - { - $this->funcCallStaticCallToMethodCallAnalyzer = $funcCallStaticCallToMethodCallAnalyzer; + public function __construct( + private FuncCallStaticCallToMethodCallAnalyzer $funcCallStaticCallToMethodCallAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php b/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php index f5fccab3ef4..85a1779237f 100644 --- a/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php +++ b/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php @@ -33,14 +33,9 @@ final class CallableInMethodCallToVariableRector extends AbstractRector implemen */ private $callableInMethodCallToVariable = []; - /** - * @var UnwrapClosureFactory - */ - private $unwrapClosureFactory; - - public function __construct(UnwrapClosureFactory $unwrapClosureFactory) - { - $this->unwrapClosureFactory = $unwrapClosureFactory; + public function __construct( + private UnwrapClosureFactory $unwrapClosureFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector.php b/rules/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector.php index bee88d8e111..d0af639e016 100644 --- a/rules/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector.php +++ b/rules/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector.php @@ -37,20 +37,10 @@ final class ServiceGetterToConstructorInjectionRector extends AbstractRector imp */ private $methodCallToServices = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - - public function __construct(PropertyNaming $propertyNaming, ClassAnalyzer $classAnalyzer) - { - $this->propertyNaming = $propertyNaming; - $this->classAnalyzer = $classAnalyzer; + public function __construct( + private PropertyNaming $propertyNaming, + private ClassAnalyzer $classAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/MethodCall/VariableMethodCallToServiceCallRector.php b/rules/Transform/Rector/MethodCall/VariableMethodCallToServiceCallRector.php index 801558a178e..aeef3f345e2 100644 --- a/rules/Transform/Rector/MethodCall/VariableMethodCallToServiceCallRector.php +++ b/rules/Transform/Rector/MethodCall/VariableMethodCallToServiceCallRector.php @@ -34,14 +34,9 @@ final class VariableMethodCallToServiceCallRector extends AbstractRector impleme */ private $variableMethodCallsToServiceCalls = []; - /** - * @var PropertyNaming - */ - private $propertyNaming; - - public function __construct(PropertyNaming $propertyNaming) - { - $this->propertyNaming = $propertyNaming; + public function __construct( + private PropertyNaming $propertyNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/New_/NewToConstructorInjectionRector.php b/rules/Transform/Rector/New_/NewToConstructorInjectionRector.php index d12560bc356..38b5e08cbee 100644 --- a/rules/Transform/Rector/New_/NewToConstructorInjectionRector.php +++ b/rules/Transform/Rector/New_/NewToConstructorInjectionRector.php @@ -35,20 +35,10 @@ final class NewToConstructorInjectionRector extends AbstractRector implements Co */ private $constructorInjectionObjectTypes = []; - /** - * @var PropertyFetchFactory - */ - private $propertyFetchFactory; - - /** - * @var PropertyNaming - */ - private $propertyNaming; - - public function __construct(PropertyFetchFactory $propertyFetchFactory, PropertyNaming $propertyNaming) - { - $this->propertyFetchFactory = $propertyFetchFactory; - $this->propertyNaming = $propertyNaming; + public function __construct( + private PropertyFetchFactory $propertyFetchFactory, + private PropertyNaming $propertyNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/New_/NewToMethodCallRector.php b/rules/Transform/Rector/New_/NewToMethodCallRector.php index 72f90a4c834..6ce2f1db14e 100644 --- a/rules/Transform/Rector/New_/NewToMethodCallRector.php +++ b/rules/Transform/Rector/New_/NewToMethodCallRector.php @@ -35,14 +35,9 @@ final class NewToMethodCallRector extends AbstractRector implements Configurable */ private $newsToMethodCalls = []; - /** - * @var ClassNaming - */ - private $classNaming; - - public function __construct(ClassNaming $classNaming) - { - $this->classNaming = $classNaming; + public function __construct( + private ClassNaming $classNaming + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/StaticCall/StaticCallToFuncCallRector.php b/rules/Transform/Rector/StaticCall/StaticCallToFuncCallRector.php index 55d36a5b09e..56918d72b54 100644 --- a/rules/Transform/Rector/StaticCall/StaticCallToFuncCallRector.php +++ b/rules/Transform/Rector/StaticCall/StaticCallToFuncCallRector.php @@ -26,16 +26,11 @@ final class StaticCallToFuncCallRector extends AbstractRector implements Configu public const STATIC_CALLS_TO_FUNCTIONS = 'static_calls_to_functions'; /** - * @var StaticCallToFuncCall[] + * @param StaticCallToFuncCall[] $staticCallsToFunctions */ - private $staticCallsToFunctions = []; - - /** - * @param StaticCallToFuncCall[] $staticCallToFunctions - */ - public function __construct(array $staticCallToFunctions = []) - { - $this->staticCallsToFunctions = $staticCallToFunctions; + public function __construct( + private array $staticCallsToFunctions = [] + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php b/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php index 5f8419d3012..99c8fa80e17 100644 --- a/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php +++ b/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php @@ -37,14 +37,9 @@ final class StaticCallToMethodCallRector extends AbstractRector implements Confi */ private $staticCallsToMethodCalls = []; - /** - * @var FuncCallStaticCallToMethodCallAnalyzer - */ - private $funcCallStaticCallToMethodCallAnalyzer; - - public function __construct(FuncCallStaticCallToMethodCallAnalyzer $funcCallStaticCallToMethodCallAnalyzer) - { - $this->funcCallStaticCallToMethodCallAnalyzer = $funcCallStaticCallToMethodCallAnalyzer; + public function __construct( + private FuncCallStaticCallToMethodCallAnalyzer $funcCallStaticCallToMethodCallAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Transform/ValueObject/ArgumentFuncCallToMethodCall.php b/rules/Transform/ValueObject/ArgumentFuncCallToMethodCall.php index 64479a53432..0ba6315f8e1 100644 --- a/rules/Transform/ValueObject/ArgumentFuncCallToMethodCall.php +++ b/rules/Transform/ValueObject/ArgumentFuncCallToMethodCall.php @@ -6,36 +6,12 @@ final class ArgumentFuncCallToMethodCall { - /** - * @var string - */ - private $function; - - /** - * @var string - */ - private $class; - - /** - * @var string|null - */ - private $methodIfNoArgs; - - /** - * @var string|null - */ - private $methodIfArgs; - public function __construct( - string $function, - string $class, - ?string $methodIfArgs = null, - ?string $methodIfNoArgs = null + private string $function, + private string $class, + private ?string $methodIfArgs = null, + private ?string $methodIfNoArgs = null ) { - $this->function = $function; - $this->class = $class; - $this->methodIfArgs = $methodIfArgs; - $this->methodIfNoArgs = $methodIfNoArgs; } public function getFunction(): string diff --git a/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php b/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php index dbcd60ce9aa..332931f1740 100644 --- a/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php +++ b/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php @@ -6,32 +6,12 @@ final class ArrayFuncCallToMethodCall { - /** - * @var string - */ - private $function; - - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $arrayMethod; - - /** - * @var string - */ - private $nonArrayMethod; - - public function __construct(string $function, string $class, string $arrayMethod, string $nonArrayMethod) - { - $this->function = $function; - $this->class = $class; - $this->arrayMethod = $arrayMethod; - $this->nonArrayMethod = $nonArrayMethod; + public function __construct( + private string $function, + private string $class, + private string $arrayMethod, + private string $nonArrayMethod + ) { } public function getFunction(): string diff --git a/rules/Transform/ValueObject/CallableInMethodCallToVariable.php b/rules/Transform/ValueObject/CallableInMethodCallToVariable.php index 7f3eed1189d..80cc463ac4f 100644 --- a/rules/Transform/ValueObject/CallableInMethodCallToVariable.php +++ b/rules/Transform/ValueObject/CallableInMethodCallToVariable.php @@ -8,26 +8,11 @@ final class CallableInMethodCallToVariable { - /** - * @var string - */ - private $classType; - - /** - * @var string - */ - private $methodName; - - /** - * @var int - */ - private $argumentPosition; - - public function __construct(string $classType, string $methodName, int $argumentPosition) - { - $this->classType = $classType; - $this->methodName = $methodName; - $this->argumentPosition = $argumentPosition; + public function __construct( + private string $classType, + private string $methodName, + private int $argumentPosition + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/ClassConstFetchToValue.php b/rules/Transform/ValueObject/ClassConstFetchToValue.php index 4cdde7db8c3..02ae5be16d4 100644 --- a/rules/Transform/ValueObject/ClassConstFetchToValue.php +++ b/rules/Transform/ValueObject/ClassConstFetchToValue.php @@ -8,29 +8,14 @@ final class ClassConstFetchToValue { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $constant; - - /** - * @var mixed - */ - private $value; - /** * @param mixed $value */ - public function __construct(string $class, string $constant, $value) - { - $this->class = $class; - $this->constant = $constant; - $this->value = $value; + public function __construct( + private string $class, + private string $constant, + private $value + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php b/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php index 52668427eef..7501bc30258 100644 --- a/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php +++ b/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php @@ -8,26 +8,11 @@ final class DimFetchAssignToMethodCall { - /** - * @var string - */ - private $listClass; - - /** - * @var string - */ - private $itemClass; - - /** - * @var string - */ - private $addMethod; - - public function __construct(string $listClass, string $itemClass, string $addMethod) - { - $this->listClass = $listClass; - $this->itemClass = $itemClass; - $this->addMethod = $addMethod; + public function __construct( + private string $listClass, + private string $itemClass, + private string $addMethod + ) { } public function getListObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/FuncCallToMethodCall.php b/rules/Transform/ValueObject/FuncCallToMethodCall.php index 2378cc13c09..e0ff0ecb54d 100644 --- a/rules/Transform/ValueObject/FuncCallToMethodCall.php +++ b/rules/Transform/ValueObject/FuncCallToMethodCall.php @@ -8,26 +8,11 @@ final class FuncCallToMethodCall { - /** - * @var string - */ - private $oldFuncName; - - /** - * @var string - */ - private $newClassName; - - /** - * @var string - */ - private $newMethodName; - - public function __construct(string $oldFuncName, string $newClassName, string $newMethodName) - { - $this->oldFuncName = $oldFuncName; - $this->newClassName = $newClassName; - $this->newMethodName = $newMethodName; + public function __construct( + private string $oldFuncName, + private string $newClassName, + private string $newMethodName + ) { } public function getOldFuncName(): string diff --git a/rules/Transform/ValueObject/FuncCallToStaticCall.php b/rules/Transform/ValueObject/FuncCallToStaticCall.php index 10add504273..e5bb6989a02 100644 --- a/rules/Transform/ValueObject/FuncCallToStaticCall.php +++ b/rules/Transform/ValueObject/FuncCallToStaticCall.php @@ -6,26 +6,11 @@ final class FuncCallToStaticCall { - /** - * @var string - */ - private $oldFuncName; - - /** - * @var string - */ - private $newClassName; - - /** - * @var string - */ - private $newMethodName; - - public function __construct(string $oldFuncName, string $newClassName, string $newMethodName) - { - $this->oldFuncName = $oldFuncName; - $this->newClassName = $newClassName; - $this->newMethodName = $newMethodName; + public function __construct( + private string $oldFuncName, + private string $newClassName, + private string $newMethodName + ) { } public function getOldFuncName(): string diff --git a/rules/Transform/ValueObject/FunctionToStaticCall.php b/rules/Transform/ValueObject/FunctionToStaticCall.php index aa07ce06d8a..2867592b6f4 100644 --- a/rules/Transform/ValueObject/FunctionToStaticCall.php +++ b/rules/Transform/ValueObject/FunctionToStaticCall.php @@ -6,26 +6,11 @@ final class FunctionToStaticCall { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var string - */ - private $function; - - public function __construct(string $function, string $class, string $method) - { - $this->class = $class; - $this->method = $method; - $this->function = $function; + public function __construct( + private string $function, + private string $class, + private string $method + ) { } public function getClass(): string diff --git a/rules/Transform/ValueObject/GetAndSetToMethodCall.php b/rules/Transform/ValueObject/GetAndSetToMethodCall.php index 575c6090637..ee98e003d20 100644 --- a/rules/Transform/ValueObject/GetAndSetToMethodCall.php +++ b/rules/Transform/ValueObject/GetAndSetToMethodCall.php @@ -8,29 +8,14 @@ final class GetAndSetToMethodCall { - /** - * @var class-string - */ - private $classType; - - /** - * @var string - */ - private $getMethod; - - /** - * @var string - */ - private $setMethod; - /** * @param class-string $classType */ - public function __construct(string $classType, string $getMethod, string $setMethod) - { - $this->classType = $classType; - $this->getMethod = $getMethod; - $this->setMethod = $setMethod; + public function __construct( + private string $classType, + private string $getMethod, + private string $setMethod + ) { } public function getGetMethod(): string diff --git a/rules/Transform/ValueObject/MethodCallToAnotherMethodCallWithArguments.php b/rules/Transform/ValueObject/MethodCallToAnotherMethodCallWithArguments.php index 5f02d4d3f00..0d414792555 100644 --- a/rules/Transform/ValueObject/MethodCallToAnotherMethodCallWithArguments.php +++ b/rules/Transform/ValueObject/MethodCallToAnotherMethodCallWithArguments.php @@ -8,35 +8,15 @@ final class MethodCallToAnotherMethodCallWithArguments { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newMethod; - - /** - * @var mixed[] - */ - private $newArguments = []; - /** * @param mixed[] $newArguments */ - public function __construct(string $type, string $oldMethod, string $newMethod, array $newArguments) - { - $this->type = $type; - $this->oldMethod = $oldMethod; - $this->newMethod = $newMethod; - $this->newArguments = $newArguments; + public function __construct( + private string $type, + private string $oldMethod, + private string $newMethod, + private array $newArguments + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/MethodCallToReturn.php b/rules/Transform/ValueObject/MethodCallToReturn.php index 0808de78cd9..422d29b228e 100644 --- a/rules/Transform/ValueObject/MethodCallToReturn.php +++ b/rules/Transform/ValueObject/MethodCallToReturn.php @@ -8,20 +8,10 @@ final class MethodCallToReturn { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - public function __construct(string $class, string $method) - { - $this->class = $class; - $this->method = $method; + public function __construct( + private string $class, + private string $method + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/MethodCallToStaticCall.php b/rules/Transform/ValueObject/MethodCallToStaticCall.php index fe8f869e414..6784af02ccd 100644 --- a/rules/Transform/ValueObject/MethodCallToStaticCall.php +++ b/rules/Transform/ValueObject/MethodCallToStaticCall.php @@ -8,32 +8,12 @@ final class MethodCallToStaticCall { - /** - * @var string - */ - private $oldClass; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $newClass; - - /** - * @var string - */ - private $newMethod; - - public function __construct(string $oldClass, string $oldMethod, string $newClass, string $newMethod) - { - $this->oldClass = $oldClass; - $this->oldMethod = $oldMethod; - $this->newClass = $newClass; - $this->newMethod = $newMethod; + public function __construct( + private string $oldClass, + private string $oldMethod, + private string $newClass, + private string $newMethod + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/NewArgToMethodCall.php b/rules/Transform/ValueObject/NewArgToMethodCall.php index f81cdbb2115..0d215e57338 100644 --- a/rules/Transform/ValueObject/NewArgToMethodCall.php +++ b/rules/Transform/ValueObject/NewArgToMethodCall.php @@ -8,29 +8,14 @@ final class NewArgToMethodCall { - /** - * @var string - */ - private $type; - - /** - * @var mixed - */ - private $value; - - /** - * @var string - */ - private $methodCall; - /** * @param mixed $value */ - public function __construct(string $type, $value, string $methodCall) - { - $this->type = $type; - $this->value = $value; - $this->methodCall = $methodCall; + public function __construct( + private string $type, + private $value, + private string $methodCall + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/NewToMethodCall.php b/rules/Transform/ValueObject/NewToMethodCall.php index bd2ccf9243d..9b7625abc99 100644 --- a/rules/Transform/ValueObject/NewToMethodCall.php +++ b/rules/Transform/ValueObject/NewToMethodCall.php @@ -8,26 +8,11 @@ final class NewToMethodCall { - /** - * @var string - */ - private $newType; - - /** - * @var string - */ - private $serviceType; - - /** - * @var string - */ - private $serviceMethod; - - public function __construct(string $newType, string $serviceType, string $serviceMethod) - { - $this->newType = $newType; - $this->serviceType = $serviceType; - $this->serviceMethod = $serviceMethod; + public function __construct( + private string $newType, + private string $serviceType, + private string $serviceMethod + ) { } public function getNewObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/NewToStaticCall.php b/rules/Transform/ValueObject/NewToStaticCall.php index c5e10c08145..11353af8dfe 100644 --- a/rules/Transform/ValueObject/NewToStaticCall.php +++ b/rules/Transform/ValueObject/NewToStaticCall.php @@ -8,26 +8,11 @@ final class NewToStaticCall { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $staticCallClass; - - /** - * @var string - */ - private $staticCallMethod; - - public function __construct(string $type, string $staticCallClass, string $staticCallMethod) - { - $this->type = $type; - $this->staticCallClass = $staticCallClass; - $this->staticCallMethod = $staticCallMethod; + public function __construct( + private string $type, + private string $staticCallClass, + private string $staticCallMethod + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/ParentClassToTraits.php b/rules/Transform/ValueObject/ParentClassToTraits.php index 4558871b537..21cdd0da910 100644 --- a/rules/Transform/ValueObject/ParentClassToTraits.php +++ b/rules/Transform/ValueObject/ParentClassToTraits.php @@ -8,23 +8,13 @@ final class ParentClassToTraits { - /** - * @var string - */ - private $parentType; - - /** - * @var string[] - */ - private $traitNames = []; - /** * @param string[] $traitNames */ - public function __construct(string $parentType, array $traitNames) - { - $this->parentType = $parentType; - $this->traitNames = $traitNames; + public function __construct( + private string $parentType, + private array $traitNames + ) { } public function getParentObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/PropertyAndClassMethodName.php b/rules/Transform/ValueObject/PropertyAndClassMethodName.php index 30cac474eef..5097df36a54 100644 --- a/rules/Transform/ValueObject/PropertyAndClassMethodName.php +++ b/rules/Transform/ValueObject/PropertyAndClassMethodName.php @@ -6,20 +6,10 @@ final class PropertyAndClassMethodName { - /** - * @var string - */ - private $propertyName; - - /** - * @var string - */ - private $classMethodName; - - public function __construct(string $propertyName, string $classMethodName) - { - $this->propertyName = $propertyName; - $this->classMethodName = $classMethodName; + public function __construct( + private string $propertyName, + private string $classMethodName + ) { } public function getPropertyName(): string diff --git a/rules/Transform/ValueObject/PropertyAssignToMethodCall.php b/rules/Transform/ValueObject/PropertyAssignToMethodCall.php index dafd2706a3a..d452e6e6941 100644 --- a/rules/Transform/ValueObject/PropertyAssignToMethodCall.php +++ b/rules/Transform/ValueObject/PropertyAssignToMethodCall.php @@ -8,26 +8,11 @@ final class PropertyAssignToMethodCall { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $oldPropertyName; - - /** - * @var string - */ - private $newMethodName; - - public function __construct(string $class, string $oldPropertyName, string $newMethodName) - { - $this->class = $class; - $this->oldPropertyName = $oldPropertyName; - $this->newMethodName = $newMethodName; + public function __construct( + private string $class, + private string $oldPropertyName, + private string $newMethodName + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/PropertyFetchToMethodCall.php b/rules/Transform/ValueObject/PropertyFetchToMethodCall.php index 3929ac135be..d2f2f87292f 100644 --- a/rules/Transform/ValueObject/PropertyFetchToMethodCall.php +++ b/rules/Transform/ValueObject/PropertyFetchToMethodCall.php @@ -8,46 +8,16 @@ final class PropertyFetchToMethodCall { - /** - * @var string - */ - private $oldType; - - /** - * @var string - */ - private $oldProperty; - - /** - * @var string - */ - private $newGetMethod; - - /** - * @var mixed[] - */ - private $newGetArguments = []; - - /** - * @var string|null - */ - private $newSetMethod; - /** * @param mixed[] $newGetArguments */ public function __construct( - string $oldType, - string $oldProperty, - string $newGetMethod, - ?string $newSetMethod = null, - array $newGetArguments = [] + private string $oldType, + private string $oldProperty, + private string $newGetMethod, + private ?string $newSetMethod = null, + private array $newGetArguments = [] ) { - $this->oldType = $oldType; - $this->oldProperty = $oldProperty; - $this->newGetMethod = $newGetMethod; - $this->newSetMethod = $newSetMethod; - $this->newGetArguments = $newGetArguments; } public function getOldObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/ReplaceParentCallByPropertyCall.php b/rules/Transform/ValueObject/ReplaceParentCallByPropertyCall.php index 71796f88cf0..99d07a8a37c 100644 --- a/rules/Transform/ValueObject/ReplaceParentCallByPropertyCall.php +++ b/rules/Transform/ValueObject/ReplaceParentCallByPropertyCall.php @@ -8,26 +8,11 @@ final class ReplaceParentCallByPropertyCall { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var string - */ - private $property; - - public function __construct(string $class, string $method, string $property) - { - $this->class = $class; - $this->method = $method; - $this->property = $property; + public function __construct( + private string $class, + private string $method, + private string $property + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/ServiceGetterToConstructorInjection.php b/rules/Transform/ValueObject/ServiceGetterToConstructorInjection.php index bd43aad802b..65c4f9ebc2a 100644 --- a/rules/Transform/ValueObject/ServiceGetterToConstructorInjection.php +++ b/rules/Transform/ValueObject/ServiceGetterToConstructorInjection.php @@ -8,26 +8,11 @@ final class ServiceGetterToConstructorInjection { - /** - * @var string - */ - private $oldType; - - /** - * @var string - */ - private $oldMethod; - - /** - * @var string - */ - private $serviceType; - - public function __construct(string $oldType, string $oldMethod, string $serviceType) - { - $this->oldType = $oldType; - $this->oldMethod = $oldMethod; - $this->serviceType = $serviceType; + public function __construct( + private string $oldType, + private string $oldMethod, + private string $serviceType + ) { } public function getOldObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/SingleToManyMethod.php b/rules/Transform/ValueObject/SingleToManyMethod.php index 20f97d595c7..83ed429bfd9 100644 --- a/rules/Transform/ValueObject/SingleToManyMethod.php +++ b/rules/Transform/ValueObject/SingleToManyMethod.php @@ -8,26 +8,11 @@ final class SingleToManyMethod { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $singleMethodName; - - /** - * @var string - */ - private $manyMethodName; - - public function __construct(string $class, string $singleMethodName, string $manyMethodName) - { - $this->class = $class; - $this->singleMethodName = $singleMethodName; - $this->manyMethodName = $manyMethodName; + public function __construct( + private string $class, + private string $singleMethodName, + private string $manyMethodName + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/StaticCallToFuncCall.php b/rules/Transform/ValueObject/StaticCallToFuncCall.php index 73006e0dbd0..7cc9d3e8c13 100644 --- a/rules/Transform/ValueObject/StaticCallToFuncCall.php +++ b/rules/Transform/ValueObject/StaticCallToFuncCall.php @@ -8,26 +8,11 @@ final class StaticCallToFuncCall { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var string - */ - private $function; - - public function __construct(string $class, string $method, string $function) - { - $this->class = $class; - $this->method = $method; - $this->function = $function; + public function __construct( + private string $class, + private string $method, + private string $function + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/StaticCallToMethodCall.php b/rules/Transform/ValueObject/StaticCallToMethodCall.php index 95277f67e9f..7de83d0f777 100644 --- a/rules/Transform/ValueObject/StaticCallToMethodCall.php +++ b/rules/Transform/ValueObject/StaticCallToMethodCall.php @@ -11,32 +11,12 @@ final class StaticCallToMethodCall { - /** - * @var string - */ - private $staticClass; - - /** - * @var string - */ - private $staticMethod; - - /** - * @var string - */ - private $classType; - - /** - * @var string - */ - private $methodName; - - public function __construct(string $staticClass, string $staticMethod, string $classType, string $methodName) - { - $this->staticClass = $staticClass; - $this->staticMethod = $staticMethod; - $this->classType = $classType; - $this->methodName = $methodName; + public function __construct( + private string $staticClass, + private string $staticMethod, + private string $classType, + private string $methodName + ) { } public function getClassObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/StaticCallToNew.php b/rules/Transform/ValueObject/StaticCallToNew.php index 4ca5f6906dd..7b0e0edfcbc 100644 --- a/rules/Transform/ValueObject/StaticCallToNew.php +++ b/rules/Transform/ValueObject/StaticCallToNew.php @@ -6,20 +6,10 @@ final class StaticCallToNew { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - public function __construct(string $class, string $method) - { - $this->class = $class; - $this->method = $method; + public function __construct( + private string $class, + private string $method + ) { } public function getClass(): string diff --git a/rules/Transform/ValueObject/StringToClassConstant.php b/rules/Transform/ValueObject/StringToClassConstant.php index c89001affe2..c71f9b8f9e0 100644 --- a/rules/Transform/ValueObject/StringToClassConstant.php +++ b/rules/Transform/ValueObject/StringToClassConstant.php @@ -6,26 +6,11 @@ final class StringToClassConstant { - /** - * @var string - */ - private $string; - - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $constant; - - public function __construct(string $string, string $class, string $constant) - { - $this->string = $string; - $this->class = $class; - $this->constant = $constant; + public function __construct( + private string $string, + private string $class, + private string $constant + ) { } public function getString(): string diff --git a/rules/Transform/ValueObject/UnsetAndIssetToMethodCall.php b/rules/Transform/ValueObject/UnsetAndIssetToMethodCall.php index 078747e4079..b89d0435a3e 100644 --- a/rules/Transform/ValueObject/UnsetAndIssetToMethodCall.php +++ b/rules/Transform/ValueObject/UnsetAndIssetToMethodCall.php @@ -8,26 +8,11 @@ final class UnsetAndIssetToMethodCall { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $issetMethodCall; - - /** - * @var string - */ - private $unsedMethodCall; - - public function __construct(string $type, string $issetMethodCall, string $unsedMethodCall) - { - $this->type = $type; - $this->issetMethodCall = $issetMethodCall; - $this->unsedMethodCall = $unsedMethodCall; + public function __construct( + private string $type, + private string $issetMethodCall, + private string $unsedMethodCall + ) { } public function getObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/VariableMethodCallToServiceCall.php b/rules/Transform/ValueObject/VariableMethodCallToServiceCall.php index 5ec334fbbce..0f357243eb9 100644 --- a/rules/Transform/ValueObject/VariableMethodCallToServiceCall.php +++ b/rules/Transform/ValueObject/VariableMethodCallToServiceCall.php @@ -8,46 +8,16 @@ final class VariableMethodCallToServiceCall { - /** - * @var string - */ - private $variableType; - - /** - * @var string - */ - private $methodName; - - /** - * @var mixed - */ - private $argumentValue; - - /** - * @var string - */ - private $serviceType; - - /** - * @var string - */ - private $serviceMethodName; - /** * @param mixed $argumentValue */ public function __construct( - string $variableType, - string $methodName, - $argumentValue, - string $serviceType, - string $serviceMethodName + private string $variableType, + private string $methodName, + private $argumentValue, + private string $serviceType, + private string $serviceMethodName ) { - $this->variableType = $variableType; - $this->methodName = $methodName; - $this->argumentValue = $argumentValue; - $this->serviceType = $serviceType; - $this->serviceMethodName = $serviceMethodName; } public function getVariableObjectType(): ObjectType diff --git a/rules/Transform/ValueObject/WrapReturn.php b/rules/Transform/ValueObject/WrapReturn.php index 67514412409..19ae552fd69 100644 --- a/rules/Transform/ValueObject/WrapReturn.php +++ b/rules/Transform/ValueObject/WrapReturn.php @@ -8,26 +8,11 @@ final class WrapReturn { - /** - * @var string - */ - private $type; - - /** - * @var string - */ - private $method; - - /** - * @var bool - */ - private $isArrayWrap = false; - - public function __construct(string $type, string $method, bool $isArrayWrap) - { - $this->type = $type; - $this->method = $method; - $this->isArrayWrap = $isArrayWrap; + public function __construct( + private string $type, + private string $method, + private bool $isArrayWrap + ) { } public function getObjectType(): ObjectType diff --git a/rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php b/rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php index b2b4629f7ae..eb3729c3971 100644 --- a/rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php +++ b/rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php @@ -22,22 +22,10 @@ final class ConstructorAssignDetector */ private const IS_FIRST_LEVEL_STATEMENT = 'first_level_stmt'; - /** - * @var PropertyAssignMatcher - */ - private $propertyAssignMatcher; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - PropertyAssignMatcher $propertyAssignMatcher, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private PropertyAssignMatcher $propertyAssignMatcher, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->propertyAssignMatcher = $propertyAssignMatcher; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function isPropertyAssigned(ClassLike $classLike, string $propertyName): bool diff --git a/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php b/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php index ba2815d9346..23b6b128fd0 100644 --- a/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php +++ b/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php @@ -20,43 +20,13 @@ */ final class NullTypeAssignDetector { - /** - * @var ScopeNestingComparator - */ - private $scopeNestingComparator; - - /** - * @var DoctrineTypeAnalyzer - */ - private $doctrineTypeAnalyzer; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var PropertyAssignMatcher - */ - private $propertyAssignMatcher; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - ScopeNestingComparator $scopeNestingComparator, - DoctrineTypeAnalyzer $doctrineTypeAnalyzer, - NodeTypeResolver $nodeTypeResolver, - PropertyAssignMatcher $propertyAssignMatcher, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private ScopeNestingComparator $scopeNestingComparator, + private DoctrineTypeAnalyzer $doctrineTypeAnalyzer, + private NodeTypeResolver $nodeTypeResolver, + private PropertyAssignMatcher $propertyAssignMatcher, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->scopeNestingComparator = $scopeNestingComparator; - $this->doctrineTypeAnalyzer = $doctrineTypeAnalyzer; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->propertyAssignMatcher = $propertyAssignMatcher; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function detect(ClassLike $classLike, string $propertyName): ?bool diff --git a/rules/TypeDeclaration/ChildPopulator/ChildParamPopulator.php b/rules/TypeDeclaration/ChildPopulator/ChildParamPopulator.php index 6f0fc67073c..a6bc6aff97a 100644 --- a/rules/TypeDeclaration/ChildPopulator/ChildParamPopulator.php +++ b/rules/TypeDeclaration/ChildPopulator/ChildParamPopulator.php @@ -19,36 +19,12 @@ final class ChildParamPopulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var RectorChangeCollector - */ - private $rectorChangeCollector; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ChildTypeResolver - */ - private $childTypeResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - RectorChangeCollector $rectorChangeCollector, - NodeRepository $nodeRepository, - ChildTypeResolver $childTypeResolver + private NodeNameResolver $nodeNameResolver, + private RectorChangeCollector $rectorChangeCollector, + private NodeRepository $nodeRepository, + private ChildTypeResolver $childTypeResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->rectorChangeCollector = $rectorChangeCollector; - $this->nodeRepository = $nodeRepository; - $this->childTypeResolver = $childTypeResolver; } /** diff --git a/rules/TypeDeclaration/ChildPopulator/ChildReturnPopulator.php b/rules/TypeDeclaration/ChildPopulator/ChildReturnPopulator.php index 3897efb9ea0..a4af478df89 100644 --- a/rules/TypeDeclaration/ChildPopulator/ChildReturnPopulator.php +++ b/rules/TypeDeclaration/ChildPopulator/ChildReturnPopulator.php @@ -15,29 +15,11 @@ final class ChildReturnPopulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var ChildTypeResolver - */ - private $childTypeResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeRepository $nodeRepository, - ChildTypeResolver $childTypeResolver + private NodeNameResolver $nodeNameResolver, + private NodeRepository $nodeRepository, + private ChildTypeResolver $childTypeResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeRepository = $nodeRepository; - $this->childTypeResolver = $childTypeResolver; } /** diff --git a/rules/TypeDeclaration/FunctionLikeReturnTypeResolver.php b/rules/TypeDeclaration/FunctionLikeReturnTypeResolver.php index caa01e0680d..a49f0943ea3 100644 --- a/rules/TypeDeclaration/FunctionLikeReturnTypeResolver.php +++ b/rules/TypeDeclaration/FunctionLikeReturnTypeResolver.php @@ -11,14 +11,9 @@ final class FunctionLikeReturnTypeResolver { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } public function resolveFunctionLikeReturnTypeToPHPStanType(FunctionLike $functionLike): Type diff --git a/rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php b/rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php index b563e53a80a..70b8b64c46a 100644 --- a/rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php +++ b/rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php @@ -14,14 +14,9 @@ final class PropertyAssignMatcher { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } /** diff --git a/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php b/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php index 22e18841803..35bb6458dd5 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php +++ b/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php @@ -19,20 +19,10 @@ final class CallTypesResolver { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(NodeTypeResolver $nodeTypeResolver, TypeFactory $typeFactory) - { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeFactory = $typeFactory; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private TypeFactory $typeFactory + ) { } /** diff --git a/rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php b/rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php index ed1ea96141d..1fee9804149 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php +++ b/rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php @@ -11,14 +11,9 @@ final class ClassMethodAndPropertyAnalyzer { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function hasClassMethodOnlyStatementReturnOfPropertyFetch( diff --git a/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php b/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php index 9527516e114..0ac9df2e7af 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php +++ b/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php @@ -15,22 +15,10 @@ final class ClassMethodParamTypeCompleter { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var ClassMethodParamVendorLockResolver - */ - private $classMethodParamVendorLockResolver; - public function __construct( - StaticTypeMapper $staticTypeMapper, - ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver + private StaticTypeMapper $staticTypeMapper, + private ClassMethodParamVendorLockResolver $classMethodParamVendorLockResolver ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->classMethodParamVendorLockResolver = $classMethodParamVendorLockResolver; } /** diff --git a/rules/TypeDeclaration/NodeAnalyzer/TypeNodeUnwrapper.php b/rules/TypeDeclaration/NodeAnalyzer/TypeNodeUnwrapper.php index e4e47d4320e..ccb35c69a6f 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/TypeNodeUnwrapper.php +++ b/rules/TypeDeclaration/NodeAnalyzer/TypeNodeUnwrapper.php @@ -13,14 +13,9 @@ final class TypeNodeUnwrapper { - /** - * @var NodeComparator - */ - private $nodeComparator; - - public function __construct(NodeComparator $nodeComparator) - { - $this->nodeComparator = $nodeComparator; + public function __construct( + private NodeComparator $nodeComparator + ) { } /** diff --git a/rules/TypeDeclaration/NodeTypeAnalyzer/CallTypeAnalyzer.php b/rules/TypeDeclaration/NodeTypeAnalyzer/CallTypeAnalyzer.php index bcaede0b645..8207487431c 100644 --- a/rules/TypeDeclaration/NodeTypeAnalyzer/CallTypeAnalyzer.php +++ b/rules/TypeDeclaration/NodeTypeAnalyzer/CallTypeAnalyzer.php @@ -19,29 +19,11 @@ final class CallTypeAnalyzer { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - ReflectionProvider $reflectionProvider, - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver + private ReflectionProvider $reflectionProvider, + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver ) { - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; } /** diff --git a/rules/TypeDeclaration/NodeTypeAnalyzer/ChildTypeResolver.php b/rules/TypeDeclaration/NodeTypeAnalyzer/ChildTypeResolver.php index 945edbfefbd..7dc204c0570 100644 --- a/rules/TypeDeclaration/NodeTypeAnalyzer/ChildTypeResolver.php +++ b/rules/TypeDeclaration/NodeTypeAnalyzer/ChildTypeResolver.php @@ -17,14 +17,9 @@ final class ChildTypeResolver { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } /** diff --git a/rules/TypeDeclaration/NodeTypeAnalyzer/TraitTypeAnalyzer.php b/rules/TypeDeclaration/NodeTypeAnalyzer/TraitTypeAnalyzer.php index 37435778558..209fd3059e9 100644 --- a/rules/TypeDeclaration/NodeTypeAnalyzer/TraitTypeAnalyzer.php +++ b/rules/TypeDeclaration/NodeTypeAnalyzer/TraitTypeAnalyzer.php @@ -11,20 +11,10 @@ final class TraitTypeAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(NodeTypeResolver $nodeTypeResolver, ReflectionProvider $reflectionProvider) - { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private NodeTypeResolver $nodeTypeResolver, + private ReflectionProvider $reflectionProvider + ) { } public function isTraitType(Type $type): bool diff --git a/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php b/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php index 986cdeeef7e..78ada019a73 100644 --- a/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php +++ b/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php @@ -23,14 +23,9 @@ final class ObjectTypeSpecifier { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } /** diff --git a/rules/TypeDeclaration/PhpDoc/ShortClassExpander.php b/rules/TypeDeclaration/PhpDoc/ShortClassExpander.php index 140c26053a4..688afcb8c51 100644 --- a/rules/TypeDeclaration/PhpDoc/ShortClassExpander.php +++ b/rules/TypeDeclaration/PhpDoc/ShortClassExpander.php @@ -21,20 +21,10 @@ final class ShortClassExpander */ private const CLASS_CONST_REGEX = '#::class#'; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var ObjectTypeSpecifier - */ - private $objectTypeSpecifier; - - public function __construct(ReflectionProvider $reflectionProvider, ObjectTypeSpecifier $objectTypeSpecifier) - { - $this->reflectionProvider = $reflectionProvider; - $this->objectTypeSpecifier = $objectTypeSpecifier; + public function __construct( + private ReflectionProvider $reflectionProvider, + private ObjectTypeSpecifier $objectTypeSpecifier + ) { } public function resolveFqnTargetEntity(string $targetEntity, Node $node): string diff --git a/rules/TypeDeclaration/PhpDocParser/NonInformativeReturnTagRemover.php b/rules/TypeDeclaration/PhpDocParser/NonInformativeReturnTagRemover.php index 50d674057b9..0c6bee5c6ea 100644 --- a/rules/TypeDeclaration/PhpDocParser/NonInformativeReturnTagRemover.php +++ b/rules/TypeDeclaration/PhpDocParser/NonInformativeReturnTagRemover.php @@ -48,20 +48,10 @@ final class NonInformativeReturnTagRemover ObjectWithoutClassType::class => ['object'], ]; - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var TypeChecker - */ - private $typeChecker; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory, TypeChecker $typeChecker) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->typeChecker = $typeChecker; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory, + private TypeChecker $typeChecker + ) { } /** diff --git a/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php b/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php index 4eb337dbc62..5252eddea70 100644 --- a/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php +++ b/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php @@ -11,14 +11,9 @@ final class ParamPhpDocNodeFactory { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - public function __construct(NodeNameResolver $nodeNameResolver) - { - $this->nodeNameResolver = $nodeNameResolver; + public function __construct( + private NodeNameResolver $nodeNameResolver + ) { } public function create(TypeNode $typeNode, Param $param): VariadicAwareParamTagValueNode diff --git a/rules/TypeDeclaration/PhpParserTypeAnalyzer.php b/rules/TypeDeclaration/PhpParserTypeAnalyzer.php index 17a1e9de07d..66529f077c0 100644 --- a/rules/TypeDeclaration/PhpParserTypeAnalyzer.php +++ b/rules/TypeDeclaration/PhpParserTypeAnalyzer.php @@ -13,14 +13,9 @@ final class PhpParserTypeAnalyzer { - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - public function __construct(StaticTypeMapper $staticTypeMapper) - { - $this->staticTypeMapper = $staticTypeMapper; + public function __construct( + private StaticTypeMapper $staticTypeMapper + ) { } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php index d48d3abc8a7..e883959574c 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php @@ -24,29 +24,11 @@ */ final class AddArrayParamDocTypeRector extends AbstractRector { - /** - * @var ParamTypeInferer - */ - private $paramTypeInferer; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var ParamTagRemover - */ - private $paramTagRemover; - public function __construct( - ParamTypeInferer $paramTypeInferer, - PhpDocTypeChanger $phpDocTypeChanger, - ParamTagRemover $paramTagRemover + private ParamTypeInferer $paramTypeInferer, + private PhpDocTypeChanger $phpDocTypeChanger, + private ParamTagRemover $paramTagRemover ) { - $this->paramTypeInferer = $paramTypeInferer; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->paramTagRemover = $paramTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php index 7f802c33af5..eda64b7ec3e 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php @@ -35,57 +35,15 @@ */ final class AddArrayReturnDocTypeRector extends AbstractRector { - /** - * @var ReturnTypeInferer - */ - private $returnTypeInferer; - - /** - * @var ClassMethodReturnTypeOverrideGuard - */ - private $classMethodReturnTypeOverrideGuard; - - /** - * @var AdvancedArrayAnalyzer - */ - private $advancedArrayAnalyzer; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var NormalizeTypeToRespectArrayScalarType - */ - private $normalizeTypeToRespectArrayScalarType; - - /** - * @var ReturnTagRemover - */ - private $returnTagRemover; - - /** - * @var DetailedTypeAnalyzer - */ - private $detailedTypeAnalyzer; - public function __construct( - ReturnTypeInferer $returnTypeInferer, - ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, - AdvancedArrayAnalyzer $advancedArrayAnalyzer, - PhpDocTypeChanger $phpDocTypeChanger, - NormalizeTypeToRespectArrayScalarType $normalizeTypeToRespectArrayScalarType, - ReturnTagRemover $returnTagRemover, - DetailedTypeAnalyzer $detailedTypeAnalyzer + private ReturnTypeInferer $returnTypeInferer, + private ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, + private AdvancedArrayAnalyzer $advancedArrayAnalyzer, + private PhpDocTypeChanger $phpDocTypeChanger, + private NormalizeTypeToRespectArrayScalarType $normalizeTypeToRespectArrayScalarType, + private ReturnTagRemover $returnTagRemover, + private DetailedTypeAnalyzer $detailedTypeAnalyzer ) { - $this->returnTypeInferer = $returnTypeInferer; - $this->classMethodReturnTypeOverrideGuard = $classMethodReturnTypeOverrideGuard; - $this->advancedArrayAnalyzer = $advancedArrayAnalyzer; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->normalizeTypeToRespectArrayScalarType = $normalizeTypeToRespectArrayScalarType; - $this->returnTagRemover = $returnTagRemover; - $this->detailedTypeAnalyzer = $detailedTypeAnalyzer; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php index ec5b82aeb62..be96b83a270 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php @@ -17,22 +17,10 @@ */ final class AddMethodCallBasedStrictParamTypeRector extends AbstractRector { - /** - * @var CallTypesResolver - */ - private $callTypesResolver; - - /** - * @var ClassMethodParamTypeCompleter - */ - private $classMethodParamTypeCompleter; - public function __construct( - CallTypesResolver $callTypesResolver, - ClassMethodParamTypeCompleter $classMethodParamTypeCompleter + private CallTypesResolver $callTypesResolver, + private ClassMethodParamTypeCompleter $classMethodParamTypeCompleter ) { - $this->callTypesResolver = $callTypesResolver; - $this->classMethodParamTypeCompleter = $classMethodParamTypeCompleter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php index 1d47d38296f..c4b15c07558 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php @@ -37,14 +37,9 @@ final class AddParamTypeDeclarationRector extends AbstractRector implements Conf */ private $parameterTypehints = []; - /** - * @var TypeComparator - */ - private $typeComparator; - - public function __construct(TypeComparator $typeComparator) - { - $this->typeComparator = $typeComparator; + public function __construct( + private TypeComparator $typeComparator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromCallersRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromCallersRector.php index 5fb8ab4a4f2..de72de3298c 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromCallersRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromCallersRector.php @@ -22,22 +22,10 @@ */ final class AddParamTypeFromCallersRector extends AbstractRector { - /** - * @var CallTypesResolver - */ - private $callTypesResolver; - - /** - * @var ClassMethodParamTypeCompleter - */ - private $classMethodParamTypeCompleter; - public function __construct( - CallTypesResolver $callTypesResolver, - ClassMethodParamTypeCompleter $classMethodParamTypeCompleter + private CallTypesResolver $callTypesResolver, + private ClassMethodParamTypeCompleter $classMethodParamTypeCompleter ) { - $this->callTypesResolver = $callTypesResolver; - $this->classMethodParamTypeCompleter = $classMethodParamTypeCompleter; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php index 60ff6346232..93fc0e183eb 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php @@ -32,14 +32,9 @@ final class AddReturnTypeDeclarationRector extends AbstractRector implements Con */ private $methodReturnTypes = []; - /** - * @var TypeComparator - */ - private $typeComparator; - - public function __construct(TypeComparator $typeComparator) - { - $this->typeComparator = $typeComparator; + public function __construct( + private TypeComparator $typeComparator + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php index 4aa1f11a3ec..768dd226300 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php @@ -20,14 +20,9 @@ */ final class AddVoidReturnTypeWhereNoReturnRector extends AbstractRector { - /** - * @var SilentVoidResolver - */ - private $silentVoidResolver; - - public function __construct(SilentVoidResolver $silentVoidResolver) - { - $this->silentVoidResolver = $silentVoidResolver; + public function __construct( + private SilentVoidResolver $silentVoidResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php index a94d0b633fd..df096cbb997 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php @@ -28,14 +28,9 @@ */ final class ReturnNeverTypeRector extends AbstractRector { - /** - * @var ParentClassMethodTypeOverrideGuard - */ - private $parentClassMethodTypeOverrideGuard; - - public function __construct(ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard) - { - $this->parentClassMethodTypeOverrideGuard = $parentClassMethodTypeOverrideGuard; + public function __construct( + private ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php index 188393a7e65..ef7f1389265 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php @@ -21,14 +21,9 @@ */ final class ReturnTypeFromReturnNewRector extends AbstractRector { - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php index 9251ac1c20d..1f7f41aad34 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php @@ -34,20 +34,10 @@ */ final class ReturnTypeFromStrictTypedCallRector extends AbstractRector { - /** - * @var ReflectionTypeResolver - */ - private $reflectionTypeResolver; - - /** - * @var TypeNodeUnwrapper - */ - private $typeNodeUnwrapper; - - public function __construct(ReflectionTypeResolver $reflectionTypeResolver, TypeNodeUnwrapper $typeNodeUnwrapper) - { - $this->reflectionTypeResolver = $reflectionTypeResolver; - $this->typeNodeUnwrapper = $typeNodeUnwrapper; + public function __construct( + private ReflectionTypeResolver $reflectionTypeResolver, + private TypeNodeUnwrapper $typeNodeUnwrapper + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php index 09e767eb3a2..295c88bd8d0 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php @@ -25,14 +25,9 @@ */ final class ReturnTypeFromStrictTypedPropertyRector extends AbstractRector { - /** - * @var TypeFactory - */ - private $typeFactory; - - public function __construct(TypeFactory $typeFactory) - { - $this->typeFactory = $typeFactory; + public function __construct( + private TypeFactory $typeFactory + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector.php b/rules/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector.php index 14ded7b7c8d..2387ecf5e31 100644 --- a/rules/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector.php +++ b/rules/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector.php @@ -19,14 +19,9 @@ */ final class AddClosureReturnTypeRector extends AbstractRector { - /** - * @var ReturnTypeInferer - */ - private $returnTypeInferer; - - public function __construct(ReturnTypeInferer $returnTypeInferer) - { - $this->returnTypeInferer = $returnTypeInferer; + public function __construct( + private ReturnTypeInferer $returnTypeInferer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php index 807a606aa4a..3f8ed8b85bb 100644 --- a/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php @@ -34,43 +34,13 @@ */ final class ParamTypeDeclarationRector extends AbstractRector { - /** - * @var ParamTypeInferer - */ - private $paramTypeInferer; - - /** - * @var ChildParamPopulator - */ - private $childParamPopulator; - - /** - * @var TraitTypeAnalyzer - */ - private $traitTypeAnalyzer; - - /** - * @var ParamTagRemover - */ - private $paramTagRemover; - - /** - * @var VendorLockResolver - */ - private $vendorLockResolver; - public function __construct( - VendorLockResolver $vendorLockResolver, - ChildParamPopulator $childParamPopulator, - ParamTypeInferer $paramTypeInferer, - TraitTypeAnalyzer $traitTypeAnalyzer, - ParamTagRemover $paramTagRemover + private VendorLockResolver $vendorLockResolver, + private ChildParamPopulator $childParamPopulator, + private ParamTypeInferer $paramTypeInferer, + private TraitTypeAnalyzer $traitTypeAnalyzer, + private ParamTagRemover $paramTagRemover ) { - $this->paramTypeInferer = $paramTypeInferer; - $this->childParamPopulator = $childParamPopulator; - $this->traitTypeAnalyzer = $traitTypeAnalyzer; - $this->paramTagRemover = $paramTagRemover; - $this->vendorLockResolver = $vendorLockResolver; } /** diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php index 5961ad5d79e..03f78ee8c54 100644 --- a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php @@ -38,64 +38,16 @@ */ final class ReturnTypeDeclarationRector extends AbstractRector { - /** - * @var ReturnTypeInferer - */ - private $returnTypeInferer; - - /** - * @var ReturnTypeAlreadyAddedChecker - */ - private $returnTypeAlreadyAddedChecker; - - /** - * @var NonInformativeReturnTagRemover - */ - private $nonInformativeReturnTagRemover; - - /** - * @var ChildReturnPopulator - */ - private $childReturnPopulator; - - /** - * @var ClassMethodReturnTypeOverrideGuard - */ - private $classMethodReturnTypeOverrideGuard; - - /** - * @var VendorLockResolver - */ - private $vendorLockResolver; - - /** - * @var PhpParserTypeAnalyzer - */ - private $phpParserTypeAnalyzer; - - /** - * @var ObjectTypeComparator - */ - private $objectTypeComparator; - public function __construct( - ReturnTypeInferer $returnTypeInferer, - ChildReturnPopulator $childReturnPopulator, - ReturnTypeAlreadyAddedChecker $returnTypeAlreadyAddedChecker, - NonInformativeReturnTagRemover $nonInformativeReturnTagRemover, - ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, - VendorLockResolver $vendorLockResolver, - PhpParserTypeAnalyzer $phpParserTypeAnalyzer, - ObjectTypeComparator $objectTypeComparator + private ReturnTypeInferer $returnTypeInferer, + private ChildReturnPopulator $childReturnPopulator, + private ReturnTypeAlreadyAddedChecker $returnTypeAlreadyAddedChecker, + private NonInformativeReturnTagRemover $nonInformativeReturnTagRemover, + private ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, + private VendorLockResolver $vendorLockResolver, + private PhpParserTypeAnalyzer $phpParserTypeAnalyzer, + private ObjectTypeComparator $objectTypeComparator ) { - $this->returnTypeInferer = $returnTypeInferer; - $this->returnTypeAlreadyAddedChecker = $returnTypeAlreadyAddedChecker; - $this->nonInformativeReturnTagRemover = $nonInformativeReturnTagRemover; - $this->childReturnPopulator = $childReturnPopulator; - $this->classMethodReturnTypeOverrideGuard = $classMethodReturnTypeOverrideGuard; - $this->vendorLockResolver = $vendorLockResolver; - $this->phpParserTypeAnalyzer = $phpParserTypeAnalyzer; - $this->objectTypeComparator = $objectTypeComparator; } /** diff --git a/rules/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector.php b/rules/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector.php index 13a033a04c4..95f0fb6b7ab 100644 --- a/rules/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector.php +++ b/rules/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector.php @@ -26,14 +26,9 @@ */ final class FormerNullableArgumentToScalarTypedRector extends AbstractRector { - /** - * @var CallTypeAnalyzer - */ - private $callTypeAnalyzer; - - public function __construct(CallTypeAnalyzer $callTypeAnalyzer) - { - $this->callTypeAnalyzer = $callTypeAnalyzer; + public function __construct( + private CallTypeAnalyzer $callTypeAnalyzer + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php b/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php index cecb8600401..dfdac0421d0 100644 --- a/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php +++ b/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php @@ -27,14 +27,9 @@ */ final class ParamTypeFromStrictTypedPropertyRector extends AbstractRector { - /** - * @var ReflectionTypeResolver - */ - private $reflectionTypeResolver; - - public function __construct(ReflectionTypeResolver $reflectionTypeResolver) - { - $this->reflectionTypeResolver = $reflectionTypeResolver; + public function __construct( + private ReflectionTypeResolver $reflectionTypeResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/Property/CompleteVarDocTypePropertyRector.php b/rules/TypeDeclaration/Rector/Property/CompleteVarDocTypePropertyRector.php index d1c6bae5105..c177e03b949 100644 --- a/rules/TypeDeclaration/Rector/Property/CompleteVarDocTypePropertyRector.php +++ b/rules/TypeDeclaration/Rector/Property/CompleteVarDocTypePropertyRector.php @@ -19,20 +19,10 @@ */ final class CompleteVarDocTypePropertyRector extends AbstractRector { - /** - * @var PropertyTypeInferer - */ - private $propertyTypeInferer; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PropertyTypeInferer $propertyTypeInferer, PhpDocTypeChanger $phpDocTypeChanger) - { - $this->propertyTypeInferer = $propertyTypeInferer; - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PropertyTypeInferer $propertyTypeInferer, + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php index 66c4326e139..9bfa20103c8 100644 --- a/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php @@ -19,20 +19,10 @@ */ final class PropertyTypeDeclarationRector extends AbstractRector { - /** - * @var PropertyTypeInferer - */ - private $propertyTypeInferer; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - public function __construct(PropertyTypeInferer $propertyTypeInferer, PhpDocTypeChanger $phpDocTypeChanger) - { - $this->propertyTypeInferer = $propertyTypeInferer; - $this->phpDocTypeChanger = $phpDocTypeChanger; + public function __construct( + private PropertyTypeInferer $propertyTypeInferer, + private PhpDocTypeChanger $phpDocTypeChanger + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php index f263236112c..24850c22eb0 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php @@ -20,22 +20,10 @@ */ final class TypedPropertyFromStrictConstructorRector extends AbstractRector { - /** - * @var ConstructorPropertyTypeInferer - */ - private $constructorPropertyTypeInferer; - - /** - * @var VarTagRemover - */ - private $varTagRemover; - public function __construct( - ConstructorPropertyTypeInferer $constructorPropertyTypeInferer, - VarTagRemover $varTagRemover + private ConstructorPropertyTypeInferer $constructorPropertyTypeInferer, + private VarTagRemover $varTagRemover ) { - $this->constructorPropertyTypeInferer = $constructorPropertyTypeInferer; - $this->varTagRemover = $varTagRemover; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/TypeDeclaration/Reflection/ReflectionTypeResolver.php b/rules/TypeDeclaration/Reflection/ReflectionTypeResolver.php index 601dcf126e0..b1bb81a4f8f 100644 --- a/rules/TypeDeclaration/Reflection/ReflectionTypeResolver.php +++ b/rules/TypeDeclaration/Reflection/ReflectionTypeResolver.php @@ -23,36 +23,12 @@ final class ReflectionTypeResolver { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PrivatesCaller - */ - private $privatesCaller; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - ReflectionProvider $reflectionProvider, - NodeNameResolver $nodeNameResolver, - PrivatesCaller $privatesCaller + private NodeTypeResolver $nodeTypeResolver, + private ReflectionProvider $reflectionProvider, + private NodeNameResolver $nodeNameResolver, + private PrivatesCaller $privatesCaller ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; - $this->privatesCaller = $privatesCaller; } public function resolveMethodCallReturnType(MethodCall $methodCall): ?Type diff --git a/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php b/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php index 88e1e11d740..30888f865ce 100644 --- a/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php +++ b/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php @@ -34,29 +34,11 @@ final class ReturnTypeAlreadyAddedChecker */ private const FOREACHABLE_TYPES = ['iterable', 'Iterator', 'Traversable', 'array']; - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NodeNameResolver $nodeNameResolver, - StaticTypeMapper $staticTypeMapper, - NodeComparator $nodeComparator + private NodeNameResolver $nodeNameResolver, + private StaticTypeMapper $staticTypeMapper, + private NodeComparator $nodeComparator ) { - $this->staticTypeMapper = $staticTypeMapper; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; } /** diff --git a/rules/TypeDeclaration/TypeAnalyzer/AdvancedArrayAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/AdvancedArrayAnalyzer.php index 33e7a098b0a..a97e454a081 100644 --- a/rules/TypeDeclaration/TypeAnalyzer/AdvancedArrayAnalyzer.php +++ b/rules/TypeDeclaration/TypeAnalyzer/AdvancedArrayAnalyzer.php @@ -19,20 +19,10 @@ final class AdvancedArrayAnalyzer { - /** - * @var TypeNormalizer - */ - private $typeNormalizer; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(TypeNormalizer $typeNormalizer, PhpDocInfoFactory $phpDocInfoFactory) - { - $this->typeNormalizer = $typeNormalizer; - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private TypeNormalizer $typeNormalizer, + private PhpDocInfoFactory $phpDocInfoFactory + ) { } public function isClassStringArrayByStringArrayOverride(ArrayType $arrayType, ClassMethod $classMethod): bool diff --git a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php index ba63f908701..fac6c7e293f 100644 --- a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php +++ b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php @@ -13,14 +13,9 @@ final class GenericClassStringTypeNormalizer { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function normalize(Type $type): Type diff --git a/rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php index 42085616409..212acb7324e 100644 --- a/rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php @@ -23,57 +23,15 @@ final class AssignToPropertyTypeInferer { - /** - * @var ConstructorAssignDetector - */ - private $constructorAssignDetector; - - /** - * @var PropertyAssignMatcher - */ - private $propertyAssignMatcher; - - /** - * @var PropertyDefaultAssignDetector - */ - private $propertyDefaultAssignDetector; - - /** - * @var NullTypeAssignDetector - */ - private $nullTypeAssignDetector; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - ConstructorAssignDetector $constructorAssignDetector, - PropertyAssignMatcher $propertyAssignMatcher, - PropertyDefaultAssignDetector $propertyDefaultAssignDetector, - NullTypeAssignDetector $nullTypeAssignDetector, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - TypeFactory $typeFactory, - NodeTypeResolver $nodeTypeResolver + private ConstructorAssignDetector $constructorAssignDetector, + private PropertyAssignMatcher $propertyAssignMatcher, + private PropertyDefaultAssignDetector $propertyDefaultAssignDetector, + private NullTypeAssignDetector $nullTypeAssignDetector, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private TypeFactory $typeFactory, + private NodeTypeResolver $nodeTypeResolver ) { - $this->constructorAssignDetector = $constructorAssignDetector; - $this->propertyAssignMatcher = $propertyAssignMatcher; - $this->propertyDefaultAssignDetector = $propertyDefaultAssignDetector; - $this->nullTypeAssignDetector = $nullTypeAssignDetector; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->typeFactory = $typeFactory; - $this->nodeTypeResolver = $nodeTypeResolver; } public function inferPropertyInClassLike(string $propertyName, ClassLike $classLike): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer.php index 3af907a43b8..bfaaccc3bce 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer.php @@ -12,25 +12,13 @@ final class ParamTypeInferer { - /** - * @var ParamTypeInfererInterface[] - */ - private $paramTypeInferers = []; - - /** - * @var GenericClassStringTypeNormalizer - */ - private $genericClassStringTypeNormalizer; - /** * @param ParamTypeInfererInterface[] $paramTypeInferers */ public function __construct( - GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, - array $paramTypeInferers + private GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, + private array $paramTypeInferers ) { - $this->paramTypeInferers = $paramTypeInferers; - $this->genericClassStringTypeNormalizer = $genericClassStringTypeNormalizer; } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/FunctionLikeDocParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/FunctionLikeDocParamTypeInferer.php index 7ca3fd27ecb..2e209992716 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/FunctionLikeDocParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/FunctionLikeDocParamTypeInferer.php @@ -18,29 +18,11 @@ final class FunctionLikeDocParamTypeInferer implements ParamTypeInfererInterface { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - public function __construct( - NodeNameResolver $nodeNameResolver, - PhpDocInfoFactory $phpDocInfoFactory, - BetterNodeFinder $betterNodeFinder + private NodeNameResolver $nodeNameResolver, + private PhpDocInfoFactory $phpDocInfoFactory, + private BetterNodeFinder $betterNodeFinder ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->betterNodeFinder = $betterNodeFinder; } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php index 662c3bb8ac6..4c797c6aad6 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php @@ -22,43 +22,13 @@ final class GetterNodeParamTypeInferer implements ParamTypeInfererInterface { - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var PropertyFetchAssignManipulator - */ - private $propertyFetchAssignManipulator; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - PropertyFetchAssignManipulator $propertyFetchAssignManipulator, - PropertyFetchAnalyzer $propertyFetchAnalyzer, - PhpDocInfoFactory $phpDocInfoFactory, - NodeNameResolver $nodeNameResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private PropertyFetchAssignManipulator $propertyFetchAssignManipulator, + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private PhpDocInfoFactory $phpDocInfoFactory, + private NodeNameResolver $nodeNameResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->propertyFetchAssignManipulator = $propertyFetchAssignManipulator; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/KnownArrayParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/KnownArrayParamTypeInferer.php index fe12780b249..c54d872043d 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/KnownArrayParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/KnownArrayParamTypeInferer.php @@ -17,20 +17,10 @@ final class KnownArrayParamTypeInferer implements ParamTypeInfererInterface { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider) - { - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider + ) { } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PHPUnitDataProviderParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PHPUnitDataProviderParamTypeInferer.php index bd1f028211e..ada9772016f 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PHPUnitDataProviderParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PHPUnitDataProviderParamTypeInferer.php @@ -35,34 +35,16 @@ final class PHPUnitDataProviderParamTypeInferer implements ParamTypeInfererInter */ private const METHOD_NAME_REGEX = '#^(?\w+)(\(\))?#'; - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - /** * @var NodeTypeResolver */ private $nodeTypeResolver; - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct( - BetterNodeFinder $betterNodeFinder, - TypeFactory $typeFactory, - PhpDocInfoFactory $phpDocInfoFactory + private BetterNodeFinder $betterNodeFinder, + private TypeFactory $typeFactory, + private PhpDocInfoFactory $phpDocInfoFactory ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->typeFactory = $typeFactory; - $this->phpDocInfoFactory = $phpDocInfoFactory; } /** diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PropertyNodeParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PropertyNodeParamTypeInferer.php index 0c7c5dd4da7..5b5f172b0a3 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PropertyNodeParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/PropertyNodeParamTypeInferer.php @@ -21,43 +21,13 @@ final class PropertyNodeParamTypeInferer implements ParamTypeInfererInterface { - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeFactory - */ - private $typeFactory; - public function __construct( - PropertyFetchAnalyzer $propertyFetchAnalyzer, - NodeNameResolver $nodeNameResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeTypeResolver $nodeTypeResolver, - TypeFactory $typeFactory + private PropertyFetchAnalyzer $propertyFetchAnalyzer, + private NodeNameResolver $nodeNameResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeTypeResolver $nodeTypeResolver, + private TypeFactory $typeFactory ) { - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeFactory = $typeFactory; } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/SplFixedArrayParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/SplFixedArrayParamTypeInferer.php index ab12ebb750d..6d705c2e724 100644 --- a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/SplFixedArrayParamTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/SplFixedArrayParamTypeInferer.php @@ -13,22 +13,10 @@ final class SplFixedArrayParamTypeInferer implements ParamTypeInfererInterface { - /** - * @var SplArrayFixedTypeNarrower - */ - private $splArrayFixedTypeNarrower; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - SplArrayFixedTypeNarrower $splArrayFixedTypeNarrower, - NodeTypeResolver $nodeTypeResolver + private SplArrayFixedTypeNarrower $splArrayFixedTypeNarrower, + private NodeTypeResolver $nodeTypeResolver ) { - $this->splArrayFixedTypeNarrower = $splArrayFixedTypeNarrower; - $this->nodeTypeResolver = $nodeTypeResolver; } public function inferParam(Param $param): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer.php index a423b0ff8da..df78dc2a66a 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer.php @@ -25,49 +25,19 @@ final class PropertyTypeInferer */ private $propertyTypeInferers = []; - /** - * @var DefaultValuePropertyTypeInferer - */ - private $defaultValuePropertyTypeInferer; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var DoctrineTypeAnalyzer - */ - private $doctrineTypeAnalyzer; - - /** - * @var VarDocPropertyTypeInferer - */ - private $varDocPropertyTypeInferer; - - /** - * @var GenericClassStringTypeNormalizer - */ - private $genericClassStringTypeNormalizer; - /** * @param PropertyTypeInfererInterface[] $propertyTypeInferers */ public function __construct( TypeInfererSorter $typeInfererSorter, - GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, - DefaultValuePropertyTypeInferer $defaultValuePropertyTypeInferer, - VarDocPropertyTypeInferer $varDocPropertyTypeInferer, - TypeFactory $typeFactory, - DoctrineTypeAnalyzer $doctrineTypeAnalyzer, + private GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, + private DefaultValuePropertyTypeInferer $defaultValuePropertyTypeInferer, + private VarDocPropertyTypeInferer $varDocPropertyTypeInferer, + private TypeFactory $typeFactory, + private DoctrineTypeAnalyzer $doctrineTypeAnalyzer, array $propertyTypeInferers ) { $this->propertyTypeInferers = $typeInfererSorter->sort($propertyTypeInferers); - $this->defaultValuePropertyTypeInferer = $defaultValuePropertyTypeInferer; - $this->typeFactory = $typeFactory; - $this->doctrineTypeAnalyzer = $doctrineTypeAnalyzer; - $this->varDocPropertyTypeInferer = $varDocPropertyTypeInferer; - $this->genericClassStringTypeNormalizer = $genericClassStringTypeNormalizer; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/AllAssignNodePropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/AllAssignNodePropertyTypeInferer.php index 1a21aed55da..1bc0efdad37 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/AllAssignNodePropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/AllAssignNodePropertyTypeInferer.php @@ -15,22 +15,10 @@ final class AllAssignNodePropertyTypeInferer implements PropertyTypeInfererInterface { - /** - * @var AssignToPropertyTypeInferer - */ - private $assignToPropertyTypeInferer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - AssignToPropertyTypeInferer $assignToPropertyTypeInferer, - NodeNameResolver $nodeNameResolver + private AssignToPropertyTypeInferer $assignToPropertyTypeInferer, + private NodeNameResolver $nodeNameResolver ) { - $this->assignToPropertyTypeInferer = $assignToPropertyTypeInferer; - $this->nodeNameResolver = $nodeNameResolver; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/ConstructorPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/ConstructorPropertyTypeInferer.php index 6c426c992d4..3ff1552ea3b 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/ConstructorPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/ConstructorPropertyTypeInferer.php @@ -34,57 +34,15 @@ final class ConstructorPropertyTypeInferer implements PropertyTypeInfererInterface { - /** - * @var ClassMethodPropertyFetchManipulator - */ - private $classMethodPropertyFetchManipulator; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - public function __construct( - ClassMethodPropertyFetchManipulator $classMethodPropertyFetchManipulator, - ReflectionProvider $reflectionProvider, - NodeNameResolver $nodeNameResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - TypeFactory $typeFactory, - StaticTypeMapper $staticTypeMapper, - NodeTypeResolver $nodeTypeResolver + private ClassMethodPropertyFetchManipulator $classMethodPropertyFetchManipulator, + private ReflectionProvider $reflectionProvider, + private NodeNameResolver $nodeNameResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private TypeFactory $typeFactory, + private StaticTypeMapper $staticTypeMapper, + private NodeTypeResolver $nodeTypeResolver ) { - $this->classMethodPropertyFetchManipulator = $classMethodPropertyFetchManipulator; - $this->reflectionProvider = $reflectionProvider; - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->typeFactory = $typeFactory; - $this->staticTypeMapper = $staticTypeMapper; - $this->nodeTypeResolver = $nodeTypeResolver; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DefaultValuePropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DefaultValuePropertyTypeInferer.php index e5b74e5b78d..5bbdf1cf1f9 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DefaultValuePropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DefaultValuePropertyTypeInferer.php @@ -14,14 +14,9 @@ */ final class DefaultValuePropertyTypeInferer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - public function __construct(NodeTypeResolver $nodeTypeResolver) - { - $this->nodeTypeResolver = $nodeTypeResolver; + public function __construct( + private NodeTypeResolver $nodeTypeResolver + ) { } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineColumnPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineColumnPropertyTypeInferer.php index 503c152781c..2d0d6f5901b 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineColumnPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineColumnPropertyTypeInferer.php @@ -34,20 +34,10 @@ final class DoctrineColumnPropertyTypeInferer implements PropertyTypeInfererInte */ private $doctrineTypeToScalarType = []; - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(TypeFactory $typeFactory, PhpDocInfoFactory $phpDocInfoFactory) - { - $this->typeFactory = $typeFactory; - + public function __construct( + private TypeFactory $typeFactory, + private PhpDocInfoFactory $phpDocInfoFactory + ) { $this->doctrineTypeToScalarType = [ 'tinyint' => new BooleanType(), // integers @@ -84,8 +74,6 @@ public function __construct(TypeFactory $typeFactory, PhpDocInfoFactory $phpDocI 'time' => new ObjectType(self::DATE_TIME_INTERFACE), 'year' => new ObjectType(self::DATE_TIME_INTERFACE), ]; - - $this->phpDocInfoFactory = $phpDocInfoFactory; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineRelationPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineRelationPropertyTypeInferer.php index 3a6f248ce9b..b18818447a0 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineRelationPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/DoctrineRelationPropertyTypeInferer.php @@ -26,36 +26,12 @@ final class DoctrineRelationPropertyTypeInferer implements PropertyTypeInfererIn */ private const COLLECTION_TYPE = 'Doctrine\Common\Collections\Collection'; - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var ShortClassExpander - */ - private $shortClassExpander; - - /** - * @var ClassAnnotationMatcher - */ - private $classAnnotationMatcher; - public function __construct( - TypeFactory $typeFactory, - PhpDocInfoFactory $phpDocInfoFactory, - ShortClassExpander $shortClassExpander, - ClassAnnotationMatcher $classAnnotationMatcher + private TypeFactory $typeFactory, + private PhpDocInfoFactory $phpDocInfoFactory, + private ShortClassExpander $shortClassExpander, + private ClassAnnotationMatcher $classAnnotationMatcher ) { - $this->typeFactory = $typeFactory; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->shortClassExpander = $shortClassExpander; - $this->classAnnotationMatcher = $classAnnotationMatcher; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterPropertyTypeInferer.php index 74ca579f0eb..158383738e6 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterPropertyTypeInferer.php @@ -19,43 +19,13 @@ final class GetterPropertyTypeInferer implements PropertyTypeInfererInterface { - /** - * @var ReturnedNodesReturnTypeInferer - */ - private $returnedNodesReturnTypeInferer; - - /** - * @var ReturnTagReturnTypeInferer - */ - private $returnTagReturnTypeInferer; - - /** - * @var FunctionLikeReturnTypeResolver - */ - private $functionLikeReturnTypeResolver; - - /** - * @var ClassMethodAndPropertyAnalyzer - */ - private $classMethodAndPropertyAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - ReturnTagReturnTypeInferer $returnTagReturnTypeInferer, - ReturnedNodesReturnTypeInferer $returnedNodesReturnTypeInferer, - FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, - ClassMethodAndPropertyAnalyzer $classMethodAndPropertyAnalyzer, - NodeNameResolver $nodeNameResolver + private ReturnTagReturnTypeInferer $returnTagReturnTypeInferer, + private ReturnedNodesReturnTypeInferer $returnedNodesReturnTypeInferer, + private FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, + private ClassMethodAndPropertyAnalyzer $classMethodAndPropertyAnalyzer, + private NodeNameResolver $nodeNameResolver ) { - $this->returnedNodesReturnTypeInferer = $returnedNodesReturnTypeInferer; - $this->returnTagReturnTypeInferer = $returnTagReturnTypeInferer; - $this->functionLikeReturnTypeResolver = $functionLikeReturnTypeResolver; - $this->classMethodAndPropertyAnalyzer = $classMethodAndPropertyAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php index b6179b9bb59..61a268c47d3 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php @@ -17,29 +17,11 @@ final class GetterTypeDeclarationPropertyTypeInferer implements PropertyTypeInfererInterface { - /** - * @var FunctionLikeReturnTypeResolver - */ - private $functionLikeReturnTypeResolver; - - /** - * @var ClassMethodAndPropertyAnalyzer - */ - private $classMethodAndPropertyAnalyzer; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, - ClassMethodAndPropertyAnalyzer $classMethodAndPropertyAnalyzer, - NodeNameResolver $nodeNameResolver + private FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, + private ClassMethodAndPropertyAnalyzer $classMethodAndPropertyAnalyzer, + private NodeNameResolver $nodeNameResolver ) { - $this->functionLikeReturnTypeResolver = $functionLikeReturnTypeResolver; - $this->classMethodAndPropertyAnalyzer = $classMethodAndPropertyAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/SingleMethodAssignedNodePropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/SingleMethodAssignedNodePropertyTypeInferer.php index 2262f5b0d1a..b36d14fb725 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/SingleMethodAssignedNodePropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/SingleMethodAssignedNodePropertyTypeInferer.php @@ -22,29 +22,11 @@ final class SingleMethodAssignedNodePropertyTypeInferer implements PropertyTypeInfererInterface { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/VarDocPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/VarDocPropertyTypeInferer.php index d636a769848..acaa86214b6 100644 --- a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/VarDocPropertyTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/VarDocPropertyTypeInferer.php @@ -10,14 +10,9 @@ final class VarDocPropertyTypeInferer { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory + ) { } public function inferProperty(Property $property): Type diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php index 03cbfc29a78..bb78b4a9601 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php @@ -20,28 +20,16 @@ final class ReturnTypeInferer */ private $returnTypeInferers = []; - /** - * @var TypeNormalizer - */ - private $typeNormalizer; - - /** - * @var GenericClassStringTypeNormalizer - */ - private $genericClassStringTypeNormalizer; - /** * @param ReturnTypeInfererInterface[] $returnTypeInferers */ public function __construct( array $returnTypeInferers, - TypeNormalizer $typeNormalizer, + private TypeNormalizer $typeNormalizer, TypeInfererSorter $typeInfererSorter, - GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer + private GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer ) { $this->returnTypeInferers = $typeInfererSorter->sort($returnTypeInferers); - $this->typeNormalizer = $typeNormalizer; - $this->genericClassStringTypeNormalizer = $genericClassStringTypeNormalizer; } public function inferFunctionLike(FunctionLike $functionLike): Type diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTagReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTagReturnTypeInferer.php index db64454bb80..3253a19f4f3 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTagReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTagReturnTypeInferer.php @@ -14,14 +14,9 @@ final class ReturnTagReturnTypeInferer implements ReturnTypeInfererInterface { - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - public function __construct(PhpDocInfoFactory $phpDocInfoFactory) - { - $this->phpDocInfoFactory = $phpDocInfoFactory; + public function __construct( + private PhpDocInfoFactory $phpDocInfoFactory + ) { } /** diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTypeDeclarationReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTypeDeclarationReturnTypeInferer.php index cfcebb0f5ee..87dba2ac177 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTypeDeclarationReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnTypeDeclarationReturnTypeInferer.php @@ -13,22 +13,10 @@ final class ReturnTypeDeclarationReturnTypeInferer implements ReturnTypeInfererInterface { - /** - * @var FunctionLikeReturnTypeResolver - */ - private $functionLikeReturnTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, - NodeNameResolver $nodeNameResolver + private FunctionLikeReturnTypeResolver $functionLikeReturnTypeResolver, + private NodeNameResolver $nodeNameResolver ) { - $this->functionLikeReturnTypeResolver = $functionLikeReturnTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; } public function inferFunctionLike(FunctionLike $functionLike): Type diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php index bc8260f2532..5fbae522538 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php @@ -31,50 +31,14 @@ final class ReturnedNodesReturnTypeInferer implements ReturnTypeInfererInterface { - /** - * @var SilentVoidResolver - */ - private $silentVoidResolver; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var SplArrayFixedTypeNarrower - */ - private $splArrayFixedTypeNarrower; - - /** - * @var NodeRepository - */ - private $nodeRepository; - public function __construct( - SilentVoidResolver $silentVoidResolver, - NodeTypeResolver $nodeTypeResolver, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - TypeFactory $typeFactory, - SplArrayFixedTypeNarrower $splArrayFixedTypeNarrower, - NodeRepository $nodeRepository + private SilentVoidResolver $silentVoidResolver, + private NodeTypeResolver $nodeTypeResolver, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private TypeFactory $typeFactory, + private SplArrayFixedTypeNarrower $splArrayFixedTypeNarrower, + private NodeRepository $nodeRepository ) { - $this->silentVoidResolver = $silentVoidResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->typeFactory = $typeFactory; - $this->splArrayFixedTypeNarrower = $splArrayFixedTypeNarrower; - $this->nodeRepository = $nodeRepository; } /** diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/SetterNodeReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/SetterNodeReturnTypeInferer.php index 83f972f20e5..b94027ab402 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/SetterNodeReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/SetterNodeReturnTypeInferer.php @@ -16,29 +16,11 @@ final class SetterNodeReturnTypeInferer implements ReturnTypeInfererInterface { - /** - * @var FunctionLikeManipulator - */ - private $functionLikeManipulator; - - /** - * @var AssignToPropertyTypeInferer - */ - private $assignToPropertyTypeInferer; - - /** - * @var TypeFactory - */ - private $typeFactory; - public function __construct( - AssignToPropertyTypeInferer $assignToPropertyTypeInferer, - FunctionLikeManipulator $functionLikeManipulator, - TypeFactory $typeFactory + private AssignToPropertyTypeInferer $assignToPropertyTypeInferer, + private FunctionLikeManipulator $functionLikeManipulator, + private TypeFactory $typeFactory ) { - $this->functionLikeManipulator = $functionLikeManipulator; - $this->assignToPropertyTypeInferer = $assignToPropertyTypeInferer; - $this->typeFactory = $typeFactory; } public function inferFunctionLike(FunctionLike $functionLike): Type diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/YieldNodesReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/YieldNodesReturnTypeInferer.php index 314c4a735d8..124c3248529 100644 --- a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/YieldNodesReturnTypeInferer.php +++ b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/YieldNodesReturnTypeInferer.php @@ -24,29 +24,11 @@ final class YieldNodesReturnTypeInferer implements ReturnTypeInfererInterface { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - NodeTypeResolver $nodeTypeResolver, - TypeFactory $typeFactory, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser + private NodeTypeResolver $nodeTypeResolver, + private TypeFactory $typeFactory, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->typeFactory = $typeFactory; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } /** diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php index 0680caf5d7b..aeb9495a71f 100644 --- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php +++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php @@ -21,14 +21,9 @@ final class SilentVoidResolver { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - public function __construct(BetterNodeFinder $betterNodeFinder) - { - $this->betterNodeFinder = $betterNodeFinder; + public function __construct( + private BetterNodeFinder $betterNodeFinder + ) { } /** diff --git a/rules/TypeDeclaration/TypeNormalizer.php b/rules/TypeDeclaration/TypeNormalizer.php index 066f0f4bed6..3b6464f1b50 100644 --- a/rules/TypeDeclaration/TypeNormalizer.php +++ b/rules/TypeDeclaration/TypeNormalizer.php @@ -27,20 +27,10 @@ final class TypeNormalizer */ private $collectedNestedArrayTypes = []; - /** - * @var TypeFactory - */ - private $typeFactory; - - /** - * @var UnionTypeFactory - */ - private $unionTypeFactory; - - public function __construct(TypeFactory $typeFactory, UnionTypeFactory $unionTypeFactory) - { - $this->typeFactory = $typeFactory; - $this->unionTypeFactory = $unionTypeFactory; + public function __construct( + private TypeFactory $typeFactory, + private UnionTypeFactory $unionTypeFactory + ) { } public function convertConstantArrayTypeToArrayType(ConstantArrayType $constantArrayType): ?ArrayType diff --git a/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php b/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php index 9686782c48b..46b2eb602f8 100644 --- a/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php +++ b/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php @@ -9,32 +9,12 @@ final class AddParamTypeDeclaration { - /** - * @var string - */ - private $className; - - /** - * @var string - */ - private $methodName; - - /** - * @var int - */ - private $position; - - /** - * @var Type - */ - private $paramType; - - public function __construct(string $className, string $methodName, int $position, Type $paramType) - { - $this->className = $className; - $this->methodName = $methodName; - $this->position = $position; - $this->paramType = $paramType; + public function __construct( + private string $className, + private string $methodName, + private int $position, + private Type $paramType + ) { } public function getObjectType(): ObjectType diff --git a/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php b/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php index 24ceb542f83..6bfeeda6b1f 100644 --- a/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php +++ b/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php @@ -9,26 +9,11 @@ final class AddReturnTypeDeclaration { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var Type - */ - private $returnType; - - public function __construct(string $class, string $method, Type $returnType) - { - $this->class = $class; - $this->method = $method; - $this->returnType = $returnType; + public function __construct( + private string $class, + private string $method, + private Type $returnType + ) { } public function getClass(): string diff --git a/rules/TypeDeclaration/ValueObject/NestedArrayType.php b/rules/TypeDeclaration/ValueObject/NestedArrayType.php index d97cb694175..5ebabd06f09 100644 --- a/rules/TypeDeclaration/ValueObject/NestedArrayType.php +++ b/rules/TypeDeclaration/ValueObject/NestedArrayType.php @@ -9,26 +9,11 @@ final class NestedArrayType { - /** - * @var int - */ - private $arrayNestingLevel; - - /** - * @var Type - */ - private $type; - - /** - * @var Type|null - */ - private $keyType; - - public function __construct(Type $valueType, int $arrayNestingLevel, ?Type $keyType = null) - { - $this->type = $valueType; - $this->arrayNestingLevel = $arrayNestingLevel; - $this->keyType = $keyType; + public function __construct( + private Type $type, + private int $arrayNestingLevel, + private ?Type $keyType = null + ) { } public function getType(): Type diff --git a/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php b/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php index a516d4eeeab..e0afaf990a9 100644 --- a/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php +++ b/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php @@ -30,14 +30,9 @@ final class ChangeMethodVisibilityRector extends AbstractRector implements Confi */ private $methodVisibilities = []; - /** - * @var ParentClassScopeResolver - */ - private $parentClassScopeResolver; - - public function __construct(ParentClassScopeResolver $parentClassScopeResolver) - { - $this->parentClassScopeResolver = $parentClassScopeResolver; + public function __construct( + private ParentClassScopeResolver $parentClassScopeResolver + ) { } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Visibility/ValueObject/ChangeConstantVisibility.php b/rules/Visibility/ValueObject/ChangeConstantVisibility.php index ecc4cde28e9..1f02e49ccf7 100644 --- a/rules/Visibility/ValueObject/ChangeConstantVisibility.php +++ b/rules/Visibility/ValueObject/ChangeConstantVisibility.php @@ -8,26 +8,11 @@ final class ChangeConstantVisibility { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $constant; - - /** - * @var int - */ - private $visibility; - - public function __construct(string $class, string $constant, int $visibility) - { - $this->class = $class; - $this->constant = $constant; - $this->visibility = $visibility; + public function __construct( + private string $class, + private string $constant, + private int $visibility + ) { } public function getObjectType(): ObjectType diff --git a/rules/Visibility/ValueObject/ChangeMethodVisibility.php b/rules/Visibility/ValueObject/ChangeMethodVisibility.php index ef6a73f89aa..85f0ef17285 100644 --- a/rules/Visibility/ValueObject/ChangeMethodVisibility.php +++ b/rules/Visibility/ValueObject/ChangeMethodVisibility.php @@ -6,26 +6,11 @@ final class ChangeMethodVisibility { - /** - * @var string - */ - private $class; - - /** - * @var string - */ - private $method; - - /** - * @var int - */ - private $visibility; - - public function __construct(string $class, string $method, int $visibility) - { - $this->class = $class; - $this->method = $method; - $this->visibility = $visibility; + public function __construct( + private string $class, + private string $method, + private int $visibility + ) { } public function getClass(): string diff --git a/src/NodeManipulator/ClassMethodAssignManipulator.php b/src/NodeManipulator/ClassMethodAssignManipulator.php index ce51746e3ac..c06661bbb6d 100644 --- a/src/NodeManipulator/ClassMethodAssignManipulator.php +++ b/src/NodeManipulator/ClassMethodAssignManipulator.php @@ -33,62 +33,20 @@ final class ClassMethodAssignManipulator { - /** - * @var VariableManipulator - */ - private $variableManipulator; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeFactory - */ - private $nodeFactory; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var CallReflectionResolver - */ - private $callReflectionResolver; - /** * @var array */ private $alreadyAddedClassMethodNames = []; public function __construct( - BetterNodeFinder $betterNodeFinder, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeFactory $nodeFactory, - NodeNameResolver $nodeNameResolver, - VariableManipulator $variableManipulator, - CallReflectionResolver $callReflectionResolver, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeFactory $nodeFactory, + private NodeNameResolver $nodeNameResolver, + private VariableManipulator $variableManipulator, + private CallReflectionResolver $callReflectionResolver, + private NodeComparator $nodeComparator ) { - $this->variableManipulator = $variableManipulator; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeFactory = $nodeFactory; - $this->betterNodeFinder = $betterNodeFinder; - $this->callReflectionResolver = $callReflectionResolver; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/NodeManipulator/ClassMethodManipulator.php b/src/NodeManipulator/ClassMethodManipulator.php index 86cfac71399..cf59595612e 100644 --- a/src/NodeManipulator/ClassMethodManipulator.php +++ b/src/NodeManipulator/ClassMethodManipulator.php @@ -24,43 +24,13 @@ final class ClassMethodManipulator { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var FuncCallManipulator - */ - private $funcCallManipulator; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - NodeComparator $nodeComparator, - FuncCallManipulator $funcCallManipulator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private NodeComparator $nodeComparator, + private FuncCallManipulator $funcCallManipulator ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeComparator = $nodeComparator; - $this->funcCallManipulator = $funcCallManipulator; } public function isParameterUsedInClassMethod(Param $param, ClassMethod $classMethod): bool diff --git a/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php b/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php index ec181d3b22b..395af95f616 100644 --- a/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php +++ b/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php @@ -16,22 +16,10 @@ final class ClassMethodPropertyFetchManipulator { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/src/NodeManipulator/FuncCallManipulator.php b/src/NodeManipulator/FuncCallManipulator.php index 8733ea8927d..111f6240fb0 100644 --- a/src/NodeManipulator/FuncCallManipulator.php +++ b/src/NodeManipulator/FuncCallManipulator.php @@ -9,14 +9,9 @@ final class FuncCallManipulator { - /** - * @var ValueResolver - */ - private $valueResolver; - - public function __construct(ValueResolver $valueResolver) - { - $this->valueResolver = $valueResolver; + public function __construct( + private ValueResolver $valueResolver + ) { } /** diff --git a/src/NodeManipulator/FunctionLikeManipulator.php b/src/NodeManipulator/FunctionLikeManipulator.php index ddd20192644..440913b07d9 100644 --- a/src/NodeManipulator/FunctionLikeManipulator.php +++ b/src/NodeManipulator/FunctionLikeManipulator.php @@ -14,29 +14,11 @@ final class FunctionLikeManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var PropertyFetchAnalyzer - */ - private $propertyFetchAnalyzer; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - PropertyFetchAnalyzer $propertyFetchAnalyzer + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private PropertyFetchAnalyzer $propertyFetchAnalyzer ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->propertyFetchAnalyzer = $propertyFetchAnalyzer; } /** diff --git a/src/NodeManipulator/IfManipulator.php b/src/NodeManipulator/IfManipulator.php index aa8093279df..c860c833af4 100644 --- a/src/NodeManipulator/IfManipulator.php +++ b/src/NodeManipulator/IfManipulator.php @@ -27,50 +27,14 @@ final class IfManipulator { - /** - * @var StmtsManipulator - */ - private $stmtsManipulator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ValueResolver - */ - private $valueResolver; - - /** - * @var ConditionInverter - */ - private $conditionInverter; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - StmtsManipulator $stmtsManipulator, - ValueResolver $valueResolver, - ConditionInverter $conditionInverter, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private StmtsManipulator $stmtsManipulator, + private ValueResolver $valueResolver, + private ConditionInverter $conditionInverter, + private NodeComparator $nodeComparator ) { - $this->stmtsManipulator = $stmtsManipulator; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->valueResolver = $valueResolver; - $this->conditionInverter = $conditionInverter; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/NodeManipulator/MagicPropertyFetchAnalyzer.php b/src/NodeManipulator/MagicPropertyFetchAnalyzer.php index 48cd6a877e6..06b7822730c 100644 --- a/src/NodeManipulator/MagicPropertyFetchAnalyzer.php +++ b/src/NodeManipulator/MagicPropertyFetchAnalyzer.php @@ -25,29 +25,11 @@ */ final class MagicPropertyFetchAnalyzer { - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - ReflectionProvider $reflectionProvider + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private ReflectionProvider $reflectionProvider ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } /** diff --git a/src/NodeManipulator/MethodCallManipulator.php b/src/NodeManipulator/MethodCallManipulator.php index 8543eccdfc6..cce9aebb5a3 100644 --- a/src/NodeManipulator/MethodCallManipulator.php +++ b/src/NodeManipulator/MethodCallManipulator.php @@ -18,29 +18,11 @@ final class MethodCallManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var FluentChainMethodCallNodeAnalyzer - */ - private $fluentChainMethodCallNodeAnalyzer; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer; } /** diff --git a/src/NodeManipulator/PropertyFetchAssignManipulator.php b/src/NodeManipulator/PropertyFetchAssignManipulator.php index d615d79192d..1f61c4bc8de 100644 --- a/src/NodeManipulator/PropertyFetchAssignManipulator.php +++ b/src/NodeManipulator/PropertyFetchAssignManipulator.php @@ -13,22 +13,10 @@ final class PropertyFetchAssignManipulator { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; } /** diff --git a/src/NodeManipulator/PropertyManipulator.php b/src/NodeManipulator/PropertyManipulator.php index 67d951f0be9..5c5532ef8f7 100644 --- a/src/NodeManipulator/PropertyManipulator.php +++ b/src/NodeManipulator/PropertyManipulator.php @@ -33,71 +33,17 @@ */ final class PropertyManipulator { - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var AssignManipulator - */ - private $assignManipulator; - - /** - * @var VariableToConstantGuard - */ - private $variableToConstantGuard; - - /** - * @var ReadWritePropertyAnalyzer - */ - private $readWritePropertyAnalyzer; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var TypeChecker - */ - private $typeChecker; - - /** - * @var PropertyFetchFinder - */ - private $propertyFetchFinder; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var FunctionLikeReflectionParser - */ - private $functionLikeReflectionParser; - public function __construct( - AssignManipulator $assignManipulator, - BetterNodeFinder $betterNodeFinder, - VariableToConstantGuard $variableToConstantGuard, - ReadWritePropertyAnalyzer $readWritePropertyAnalyzer, - PhpDocInfoFactory $phpDocInfoFactory, - TypeChecker $typeChecker, - PropertyFetchFinder $propertyFetchFinder, - NodeRepository $nodeRepository, - FunctionLikeReflectionParser $functionLikeReflectionParser + private AssignManipulator $assignManipulator, + private BetterNodeFinder $betterNodeFinder, + private VariableToConstantGuard $variableToConstantGuard, + private ReadWritePropertyAnalyzer $readWritePropertyAnalyzer, + private PhpDocInfoFactory $phpDocInfoFactory, + private TypeChecker $typeChecker, + private PropertyFetchFinder $propertyFetchFinder, + private NodeRepository $nodeRepository, + private FunctionLikeReflectionParser $functionLikeReflectionParser ) { - $this->betterNodeFinder = $betterNodeFinder; - $this->assignManipulator = $assignManipulator; - $this->variableToConstantGuard = $variableToConstantGuard; - $this->readWritePropertyAnalyzer = $readWritePropertyAnalyzer; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->typeChecker = $typeChecker; - $this->propertyFetchFinder = $propertyFetchFinder; - $this->nodeRepository = $nodeRepository; - $this->functionLikeReflectionParser = $functionLikeReflectionParser; } public function isPropertyUsedInReadContext(Property $property): bool diff --git a/src/NodeManipulator/StmtsManipulator.php b/src/NodeManipulator/StmtsManipulator.php index d3469a038b1..836974e6cfa 100644 --- a/src/NodeManipulator/StmtsManipulator.php +++ b/src/NodeManipulator/StmtsManipulator.php @@ -13,22 +13,10 @@ final class StmtsManipulator { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeComparator $nodeComparator + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/NodeManipulator/VariableManipulator.php b/src/NodeManipulator/VariableManipulator.php index cc948a90370..bc6350172ab 100644 --- a/src/NodeManipulator/VariableManipulator.php +++ b/src/NodeManipulator/VariableManipulator.php @@ -22,57 +22,15 @@ final class VariableManipulator { - /** - * @var SimpleCallableNodeTraverser - */ - private $simpleCallableNodeTraverser; - - /** - * @var AssignManipulator - */ - private $assignManipulator; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ArrayManipulator - */ - private $arrayManipulator; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var VariableToConstantGuard - */ - private $variableToConstantGuard; - public function __construct( - ArrayManipulator $arrayManipulator, - AssignManipulator $assignManipulator, - BetterNodeFinder $betterNodeFinder, - SimpleCallableNodeTraverser $simpleCallableNodeTraverser, - NodeNameResolver $nodeNameResolver, - VariableToConstantGuard $variableToConstantGuard, - NodeComparator $nodeComparator + private ArrayManipulator $arrayManipulator, + private AssignManipulator $assignManipulator, + private BetterNodeFinder $betterNodeFinder, + private SimpleCallableNodeTraverser $simpleCallableNodeTraverser, + private NodeNameResolver $nodeNameResolver, + private VariableToConstantGuard $variableToConstantGuard, + private NodeComparator $nodeComparator ) { - $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; - $this->assignManipulator = $assignManipulator; - $this->betterNodeFinder = $betterNodeFinder; - $this->arrayManipulator = $arrayManipulator; - $this->nodeNameResolver = $nodeNameResolver; - $this->variableToConstantGuard = $variableToConstantGuard; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/NonPhpFile/NonPhpFileProcessor.php b/src/NonPhpFile/NonPhpFileProcessor.php index 9d7bfe92dff..dec5bf5e414 100644 --- a/src/NonPhpFile/NonPhpFileProcessor.php +++ b/src/NonPhpFile/NonPhpFileProcessor.php @@ -15,17 +15,12 @@ */ final class NonPhpFileProcessor implements FileProcessorInterface { - /** - * @var NonPhpRectorInterface[] - */ - private $nonPhpRectors = []; - /** * @param NonPhpRectorInterface[] $nonPhpRectors */ - public function __construct(array $nonPhpRectors) - { - $this->nonPhpRectors = $nonPhpRectors; + public function __construct( + private array $nonPhpRectors + ) { } /** diff --git a/src/NonPhpFile/Rector/RenameClassNonPhpRector.php b/src/NonPhpFile/Rector/RenameClassNonPhpRector.php index 4e4c7c74df4..8ea236e7e7c 100644 --- a/src/NonPhpFile/Rector/RenameClassNonPhpRector.php +++ b/src/NonPhpFile/Rector/RenameClassNonPhpRector.php @@ -34,27 +34,15 @@ final class RenameClassNonPhpRector implements NonPhpRectorInterface, Configurab */ private const STANDALONE_CLASS_SUFFIX_REGEX = '(?=::)#'; - /** - * @var RenamedClassesDataCollector - */ - private $renamedClassesDataCollector; - - /** - * @var RenamedClassesCollector - */ - private $renamedClassesCollector; - /** * @var array */ private $renameClasses = []; public function __construct( - RenamedClassesDataCollector $renamedClassesDataCollector, - RenamedClassesCollector $renamedClassesCollector + private RenamedClassesDataCollector $renamedClassesDataCollector, + private RenamedClassesCollector $renamedClassesCollector ) { - $this->renamedClassesDataCollector = $renamedClassesDataCollector; - $this->renamedClassesCollector = $renamedClassesCollector; } public function getRuleDefinition(): RuleDefinition diff --git a/src/PHPStan/Reflection/CallReflectionResolver.php b/src/PHPStan/Reflection/CallReflectionResolver.php index f9a58c88a3f..4950dea1562 100644 --- a/src/PHPStan/Reflection/CallReflectionResolver.php +++ b/src/PHPStan/Reflection/CallReflectionResolver.php @@ -28,36 +28,12 @@ final class CallReflectionResolver { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var TypeToCallReflectionResolverRegistry - */ - private $typeToCallReflectionResolverRegistry; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - ReflectionProvider $reflectionProvider, - TypeToCallReflectionResolverRegistry $typeToCallReflectionResolverRegistry + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private ReflectionProvider $reflectionProvider, + private TypeToCallReflectionResolverRegistry $typeToCallReflectionResolverRegistry ) { - $this->reflectionProvider = $reflectionProvider; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->typeToCallReflectionResolverRegistry = $typeToCallReflectionResolverRegistry; } public function resolveConstructor(New_ $new): ?MethodReflection diff --git a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantArrayTypeToCallReflectionResolver.php b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantArrayTypeToCallReflectionResolver.php index c6a9480b23d..f1a9776df19 100644 --- a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantArrayTypeToCallReflectionResolver.php +++ b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantArrayTypeToCallReflectionResolver.php @@ -21,14 +21,9 @@ */ final class ConstantArrayTypeToCallReflectionResolver implements TypeToCallReflectionResolverInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function supports(Type $type): bool diff --git a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantStringTypeToCallReflectionResolver.php b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantStringTypeToCallReflectionResolver.php index 9304b367ec8..a75b50a54ec 100644 --- a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantStringTypeToCallReflectionResolver.php +++ b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ConstantStringTypeToCallReflectionResolver.php @@ -28,14 +28,9 @@ final class ConstantStringTypeToCallReflectionResolver implements TypeToCallRefl */ private const STATIC_METHOD_REGEX = '#^(?[a-zA-Z_\\x7f-\\xff\\\\][a-zA-Z0-9_\\x7f-\\xff\\\\]*)::(?[a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)\\z#'; - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function supports(Type $type): bool diff --git a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ObjectTypeToCallReflectionResolver.php b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ObjectTypeToCallReflectionResolver.php index 6ace991f2f2..b89e8c285f4 100644 --- a/src/PHPStan/Reflection/TypeToCallReflectionResolver/ObjectTypeToCallReflectionResolver.php +++ b/src/PHPStan/Reflection/TypeToCallReflectionResolver/ObjectTypeToCallReflectionResolver.php @@ -16,14 +16,9 @@ */ final class ObjectTypeToCallReflectionResolver implements TypeToCallReflectionResolverInterface { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function supports(Type $type): bool diff --git a/src/PHPStan/Reflection/TypeToCallReflectionResolver/TypeToCallReflectionResolverRegistry.php b/src/PHPStan/Reflection/TypeToCallReflectionResolver/TypeToCallReflectionResolverRegistry.php index 6f345803824..6df0bc16b09 100644 --- a/src/PHPStan/Reflection/TypeToCallReflectionResolver/TypeToCallReflectionResolverRegistry.php +++ b/src/PHPStan/Reflection/TypeToCallReflectionResolver/TypeToCallReflectionResolverRegistry.php @@ -12,17 +12,12 @@ final class TypeToCallReflectionResolverRegistry { - /** - * @var TypeToCallReflectionResolverInterface[] - */ - private $resolvers = []; - /** * @param TypeToCallReflectionResolverInterface[] $resolvers */ - public function __construct(array $resolvers) - { - $this->resolvers = $resolvers; + public function __construct( + private array $resolvers + ) { } /** diff --git a/src/Php/PhpVersionProvider.php b/src/Php/PhpVersionProvider.php index 4433217484c..d2c5235fd35 100644 --- a/src/Php/PhpVersionProvider.php +++ b/src/Php/PhpVersionProvider.php @@ -14,22 +14,10 @@ */ final class PhpVersionProvider { - /** - * @var ParameterProvider - */ - private $parameterProvider; - - /** - * @var ProjectComposerJsonPhpVersionResolver - */ - private $projectComposerJsonPhpVersionResolver; - public function __construct( - ParameterProvider $parameterProvider, - ProjectComposerJsonPhpVersionResolver $projectComposerJsonPhpVersionResolver + private ParameterProvider $parameterProvider, + private ProjectComposerJsonPhpVersionResolver $projectComposerJsonPhpVersionResolver ) { - $this->parameterProvider = $parameterProvider; - $this->projectComposerJsonPhpVersionResolver = $projectComposerJsonPhpVersionResolver; } public function provide(): int diff --git a/src/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver.php b/src/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver.php index 8fd722b81f0..e0e05a1a008 100644 --- a/src/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver.php +++ b/src/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver.php @@ -13,29 +13,11 @@ */ final class ProjectComposerJsonPhpVersionResolver { - /** - * @var ComposerJsonFactory - */ - private $composerJsonFactory; - - /** - * @var VersionParser - */ - private $versionParser; - - /** - * @var PhpVersionFactory - */ - private $phpVersionFactory; - public function __construct( - ComposerJsonFactory $composerJsonFactory, - VersionParser $versionParser, - PhpVersionFactory $phpVersionFactory + private ComposerJsonFactory $composerJsonFactory, + private VersionParser $versionParser, + private PhpVersionFactory $phpVersionFactory ) { - $this->composerJsonFactory = $composerJsonFactory; - $this->versionParser = $versionParser; - $this->phpVersionFactory = $phpVersionFactory; } public function resolve(string $composerJson): ?int diff --git a/src/Php/Regex/RegexPatternArgumentManipulator.php b/src/Php/Regex/RegexPatternArgumentManipulator.php index c2a2a60ead6..47176691283 100644 --- a/src/Php/Regex/RegexPatternArgumentManipulator.php +++ b/src/Php/Regex/RegexPatternArgumentManipulator.php @@ -50,43 +50,13 @@ final class RegexPatternArgumentManipulator ], ]; - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var NodeComparator - */ - private $nodeComparator; - public function __construct( - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - NodeRepository $nodeRepository, - NodeComparator $nodeComparator + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private NodeRepository $nodeRepository, + private NodeComparator $nodeComparator ) { - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeRepository = $nodeRepository; - $this->nodeComparator = $nodeComparator; } /** diff --git a/src/PhpParser/Comparing/NodeComparator.php b/src/PhpParser/Comparing/NodeComparator.php index dc6aaf1b73f..1e547aee035 100644 --- a/src/PhpParser/Comparing/NodeComparator.php +++ b/src/PhpParser/Comparing/NodeComparator.php @@ -11,20 +11,10 @@ final class NodeComparator { - /** - * @var CommentRemover - */ - private $commentRemover; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - - public function __construct(CommentRemover $commentRemover, BetterStandardPrinter $betterStandardPrinter) - { - $this->commentRemover = $commentRemover; - $this->betterStandardPrinter = $betterStandardPrinter; + public function __construct( + private CommentRemover $commentRemover, + private BetterStandardPrinter $betterStandardPrinter + ) { } /** diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php index cc1d131d9c3..a29523e86ff 100644 --- a/src/PhpParser/Node/BetterNodeFinder.php +++ b/src/PhpParser/Node/BetterNodeFinder.php @@ -27,43 +27,13 @@ */ final class BetterNodeFinder { - /** - * @var NodeFinder - */ - private $nodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var TypeChecker - */ - private $typeChecker; - - /** - * @var NodeComparator - */ - private $nodeComparator; - - /** - * @var ClassAnalyzer - */ - private $classAnalyzer; - public function __construct( - NodeFinder $nodeFinder, - NodeNameResolver $nodeNameResolver, - TypeChecker $typeChecker, - NodeComparator $nodeComparator, - ClassAnalyzer $classAnalyzer + private NodeFinder $nodeFinder, + private NodeNameResolver $nodeNameResolver, + private TypeChecker $typeChecker, + private NodeComparator $nodeComparator, + private ClassAnalyzer $classAnalyzer ) { - $this->nodeFinder = $nodeFinder; - $this->nodeNameResolver = $nodeNameResolver; - $this->typeChecker = $typeChecker; - $this->nodeComparator = $nodeComparator; - $this->classAnalyzer = $classAnalyzer; } /** diff --git a/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php b/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php index 673819ef8d6..81e30154d00 100644 --- a/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php +++ b/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php @@ -12,18 +12,12 @@ */ final class FileWithoutNamespace extends NodeAbstract { - /** - * @var Stmt[] - */ - public $stmts = []; - /** * @param Stmt[] $stmts */ - public function __construct(array $stmts) - { - $this->stmts = $stmts; - + public function __construct( + public array $stmts + ) { parent::__construct(); } diff --git a/src/PhpParser/Node/NodeFactory.php b/src/PhpParser/Node/NodeFactory.php index cf89a5f14de..b636a4a3a37 100644 --- a/src/PhpParser/Node/NodeFactory.php +++ b/src/PhpParser/Node/NodeFactory.php @@ -90,57 +90,15 @@ final class NodeFactory */ private const REFERENCES = [self::REFERENCE_STATIC, self::REFERENCE_PARENT, self::REFERENCE_SELF]; - /** - * @var BuilderFactory - */ - private $builderFactory; - - /** - * @var StaticTypeMapper - */ - private $staticTypeMapper; - - /** - * @var PhpDocInfoFactory - */ - private $phpDocInfoFactory; - - /** - * @var PhpVersionProvider - */ - private $phpVersionProvider; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var PhpDocTypeChanger - */ - private $phpDocTypeChanger; - - /** - * @var CurrentNodeProvider - */ - private $currentNodeProvider; - public function __construct( - BuilderFactory $builderFactory, - PhpDocInfoFactory $phpDocInfoFactory, - PhpVersionProvider $phpVersionProvider, - StaticTypeMapper $staticTypeMapper, - NodeNameResolver $nodeNameResolver, - PhpDocTypeChanger $phpDocTypeChanger, - CurrentNodeProvider $currentNodeProvider + private BuilderFactory $builderFactory, + private PhpDocInfoFactory $phpDocInfoFactory, + private PhpVersionProvider $phpVersionProvider, + private StaticTypeMapper $staticTypeMapper, + private NodeNameResolver $nodeNameResolver, + private PhpDocTypeChanger $phpDocTypeChanger, + private CurrentNodeProvider $currentNodeProvider ) { - $this->builderFactory = $builderFactory; - $this->staticTypeMapper = $staticTypeMapper; - $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->phpVersionProvider = $phpVersionProvider; - $this->nodeNameResolver = $nodeNameResolver; - $this->phpDocTypeChanger = $phpDocTypeChanger; - $this->currentNodeProvider = $currentNodeProvider; } /** diff --git a/src/PhpParser/Node/Value/ValueResolver.php b/src/PhpParser/Node/Value/ValueResolver.php index 8c816d239f6..3c46efc8c14 100644 --- a/src/PhpParser/Node/Value/ValueResolver.php +++ b/src/PhpParser/Node/Value/ValueResolver.php @@ -28,48 +28,18 @@ */ final class ValueResolver { - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - /** * @var ConstExprEvaluator */ private $constExprEvaluator; - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var ConstFetchAnalyzer - */ - private $constFetchAnalyzer; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - /** - * @var CurrentFileProvider - */ - private $currentFileProvider; - public function __construct( - NodeNameResolver $nodeNameResolver, - NodeTypeResolver $nodeTypeResolver, - ConstFetchAnalyzer $constFetchAnalyzer, - ReflectionProvider $reflectionProvider, - CurrentFileProvider $currentFileProvider + private NodeNameResolver $nodeNameResolver, + private NodeTypeResolver $nodeTypeResolver, + private ConstFetchAnalyzer $constFetchAnalyzer, + private ReflectionProvider $reflectionProvider, + private CurrentFileProvider $currentFileProvider ) { - $this->nodeNameResolver = $nodeNameResolver; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->constFetchAnalyzer = $constFetchAnalyzer; - $this->reflectionProvider = $reflectionProvider; - $this->currentFileProvider = $currentFileProvider; } /** diff --git a/src/PhpParser/NodeFinder/PropertyFetchFinder.php b/src/PhpParser/NodeFinder/PropertyFetchFinder.php index 3eff45af74f..e1579b0e24a 100644 --- a/src/PhpParser/NodeFinder/PropertyFetchFinder.php +++ b/src/PhpParser/NodeFinder/PropertyFetchFinder.php @@ -16,29 +16,11 @@ final class PropertyFetchFinder { - /** - * @var NodeRepository - */ - private $nodeRepository; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - public function __construct( - NodeRepository $nodeRepository, - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver + private NodeRepository $nodeRepository, + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver ) { - $this->nodeRepository = $nodeRepository; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; } /** diff --git a/src/PhpParser/NodeTraverser/RectorNodeTraverser.php b/src/PhpParser/NodeTraverser/RectorNodeTraverser.php index c48a33225e4..b067118bf4e 100644 --- a/src/PhpParser/NodeTraverser/RectorNodeTraverser.php +++ b/src/PhpParser/NodeTraverser/RectorNodeTraverser.php @@ -13,16 +13,6 @@ final class RectorNodeTraverser extends NodeTraverser { - /** - * @var PhpRectorInterface[] - */ - private $phpRectors = []; - - /** - * @var NodeFinder - */ - private $nodeFinder; - /** * @var bool */ @@ -31,10 +21,10 @@ final class RectorNodeTraverser extends NodeTraverser /** * @param PhpRectorInterface[] $phpRectors */ - public function __construct(array $phpRectors, NodeFinder $nodeFinder) - { - $this->phpRectors = $phpRectors; - $this->nodeFinder = $nodeFinder; + public function __construct( + private array $phpRectors, + private NodeFinder $nodeFinder + ) { } /** diff --git a/src/PhpParser/Parser/InlineCodeParser.php b/src/PhpParser/Parser/InlineCodeParser.php index fd05adcd544..7df730277dc 100644 --- a/src/PhpParser/Parser/InlineCodeParser.php +++ b/src/PhpParser/Parser/InlineCodeParser.php @@ -45,36 +45,12 @@ final class InlineCodeParser */ private const ENDING_SEMI_COLON_REGEX = '#;(\s+)?$#'; - /** - * @var Parser - */ - private $parser; - - /** - * @var NodeScopeAndMetadataDecorator - */ - private $nodeScopeAndMetadataDecorator; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - public function __construct( - BetterStandardPrinter $betterStandardPrinter, - NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, - Parser $parser, - SmartFileSystem $smartFileSystem + private BetterStandardPrinter $betterStandardPrinter, + private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, + private Parser $parser, + private SmartFileSystem $smartFileSystem ) { - $this->parser = $parser; - $this->betterStandardPrinter = $betterStandardPrinter; - $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator; - $this->smartFileSystem = $smartFileSystem; } /** diff --git a/src/PhpParser/Parser/NikicPhpParserFactory.php b/src/PhpParser/Parser/NikicPhpParserFactory.php index 7fcbfcc2ae3..d53c6207ebd 100644 --- a/src/PhpParser/Parser/NikicPhpParserFactory.php +++ b/src/PhpParser/Parser/NikicPhpParserFactory.php @@ -10,20 +10,10 @@ final class NikicPhpParserFactory { - /** - * @var Lexer - */ - private $lexer; - - /** - * @var ParserFactory - */ - private $parserFactory; - - public function __construct(Lexer $lexer, ParserFactory $parserFactory) - { - $this->lexer = $lexer; - $this->parserFactory = $parserFactory; + public function __construct( + private Lexer $lexer, + private ParserFactory $parserFactory + ) { } public function create(): Parser diff --git a/src/PhpParser/Parser/Parser.php b/src/PhpParser/Parser/Parser.php index e3ea008ad5e..f1528ad0b53 100644 --- a/src/PhpParser/Parser/Parser.php +++ b/src/PhpParser/Parser/Parser.php @@ -16,20 +16,10 @@ final class Parser */ private $nodesByFile = []; - /** - * @var NikicParser - */ - private $nikicParser; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - public function __construct(NikicParser $nikicParser, SmartFileSystem $smartFileSystem) - { - $this->nikicParser = $nikicParser; - $this->smartFileSystem = $smartFileSystem; + public function __construct( + private NikicParser $nikicParser, + private SmartFileSystem $smartFileSystem + ) { } /** diff --git a/src/PhpParser/Parser/SimplePhpParser.php b/src/PhpParser/Parser/SimplePhpParser.php index 3cabc8c3183..419d372d56b 100644 --- a/src/PhpParser/Parser/SimplePhpParser.php +++ b/src/PhpParser/Parser/SimplePhpParser.php @@ -12,20 +12,10 @@ final class SimplePhpParser { - /** - * @var Parser - */ - private $parser; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - public function __construct(Parser $parser, SmartFileSystem $smartFileSystem) - { - $this->parser = $parser; - $this->smartFileSystem = $smartFileSystem; + public function __construct( + private Parser $parser, + private SmartFileSystem $smartFileSystem + ) { } /** diff --git a/src/PhpParser/Printer/BetterStandardPrinter.php b/src/PhpParser/Printer/BetterStandardPrinter.php index 4ca0a72838f..0e835536710 100644 --- a/src/PhpParser/Printer/BetterStandardPrinter.php +++ b/src/PhpParser/Printer/BetterStandardPrinter.php @@ -69,22 +69,12 @@ final class BetterStandardPrinter extends Standard */ private $tabOrSpaceIndentCharacter = ' '; - /** - * @var DocBlockUpdater - */ - private $docBlockUpdater; - - /** - * @var IndentCharacterDetector - */ - private $indentCharacterDetector; - /** * @param mixed[] $options */ public function __construct( - IndentCharacterDetector $indentCharacterDetector, - DocBlockUpdater $docBlockUpdater, + private IndentCharacterDetector $indentCharacterDetector, + private DocBlockUpdater $docBlockUpdater, array $options = [] ) { parent::__construct($options); @@ -94,9 +84,6 @@ public function __construct( $this->insertionMap['Stmt_ClassMethod->returnType'] = [')', false, ': ', null]; $this->insertionMap['Stmt_Function->returnType'] = [')', false, ': ', null]; $this->insertionMap['Expr_Closure->returnType'] = [')', false, ': ', null]; - - $this->indentCharacterDetector = $indentCharacterDetector; - $this->docBlockUpdater = $docBlockUpdater; } /** diff --git a/src/PhpParser/Printer/FormatPerservingPrinter.php b/src/PhpParser/Printer/FormatPerservingPrinter.php index 0d2ddb7fbd8..98faaee22dc 100644 --- a/src/PhpParser/Printer/FormatPerservingPrinter.php +++ b/src/PhpParser/Printer/FormatPerservingPrinter.php @@ -16,20 +16,10 @@ */ final class FormatPerservingPrinter { - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - - public function __construct(BetterStandardPrinter $betterStandardPrinter, SmartFileSystem $smartFileSystem) - { - $this->betterStandardPrinter = $betterStandardPrinter; - $this->smartFileSystem = $smartFileSystem; + public function __construct( + private BetterStandardPrinter $betterStandardPrinter, + private SmartFileSystem $smartFileSystem + ) { } /** diff --git a/src/PhpParser/Printer/NodesWithFileDestinationPrinter.php b/src/PhpParser/Printer/NodesWithFileDestinationPrinter.php index 66537ad1a62..a4769c6e648 100644 --- a/src/PhpParser/Printer/NodesWithFileDestinationPrinter.php +++ b/src/PhpParser/Printer/NodesWithFileDestinationPrinter.php @@ -11,29 +11,11 @@ final class NodesWithFileDestinationPrinter { - /** - * @var PostFileProcessor - */ - private $postFileProcessor; - - /** - * @var Lexer - */ - private $lexer; - - /** - * @var BetterStandardPrinter - */ - private $betterStandardPrinter; - public function __construct( - BetterStandardPrinter $betterStandardPrinter, - Lexer $lexer, - PostFileProcessor $postFileProcessor + private BetterStandardPrinter $betterStandardPrinter, + private Lexer $lexer, + private PostFileProcessor $postFileProcessor ) { - $this->postFileProcessor = $postFileProcessor; - $this->lexer = $lexer; - $this->betterStandardPrinter = $betterStandardPrinter; } public function printNodesWithFileDestination(FileWithNodesInterface $fileWithNodes): string diff --git a/src/Reflection/ClassMethodReflectionFactory.php b/src/Reflection/ClassMethodReflectionFactory.php index 4d0683c6cc9..49aa3101bc9 100644 --- a/src/Reflection/ClassMethodReflectionFactory.php +++ b/src/Reflection/ClassMethodReflectionFactory.php @@ -12,14 +12,9 @@ final class ClassMethodReflectionFactory { - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - - public function __construct(ReflectionProvider $reflectionProvider) - { - $this->reflectionProvider = $reflectionProvider; + public function __construct( + private ReflectionProvider $reflectionProvider + ) { } public function createFromPHPStanTypeAndMethodName(Type $type, string $methodName): ?ReflectionMethod diff --git a/src/Reflection/ClassReflectionToAstResolver.php b/src/Reflection/ClassReflectionToAstResolver.php index 663d2dfc614..d1a353f0931 100644 --- a/src/Reflection/ClassReflectionToAstResolver.php +++ b/src/Reflection/ClassReflectionToAstResolver.php @@ -15,36 +15,12 @@ final class ClassReflectionToAstResolver { - /** - * @var Parser - */ - private $parser; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - Parser $parser, - SmartFileSystem $smartFileSystem, - BetterNodeFinder $betterNodeFinder, - ReflectionProvider $reflectionProvider + private Parser $parser, + private SmartFileSystem $smartFileSystem, + private BetterNodeFinder $betterNodeFinder, + private ReflectionProvider $reflectionProvider ) { - $this->parser = $parser; - $this->smartFileSystem = $smartFileSystem; - $this->betterNodeFinder = $betterNodeFinder; - $this->reflectionProvider = $reflectionProvider; } public function getClassFromObjectType(ObjectType $objectType): ?Class_ diff --git a/src/Reflection/FunctionLikeReflectionParser.php b/src/Reflection/FunctionLikeReflectionParser.php index 9cb1aa251a7..557c0a4c198 100644 --- a/src/Reflection/FunctionLikeReflectionParser.php +++ b/src/Reflection/FunctionLikeReflectionParser.php @@ -27,57 +27,15 @@ final class FunctionLikeReflectionParser { - /** - * @var Parser - */ - private $parser; - - /** - * @var SmartFileSystem - */ - private $smartFileSystem; - - /** - * @var NodeFinder - */ - private $nodeFinder; - - /** - * @var NodeScopeAndMetadataDecorator - */ - private $nodeScopeAndMetadataDecorator; - - /** - * @var NodeTypeResolver - */ - private $nodeTypeResolver; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - - /** - * @var ReflectionProvider - */ - private $reflectionProvider; - public function __construct( - Parser $parser, - SmartFileSystem $smartFileSystem, - NodeFinder $nodeFinder, - NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, - NodeTypeResolver $nodeTypeResolver, - NodeNameResolver $nodeNameResolver, - ReflectionProvider $reflectionProvider + private Parser $parser, + private SmartFileSystem $smartFileSystem, + private NodeFinder $nodeFinder, + private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, + private NodeTypeResolver $nodeTypeResolver, + private NodeNameResolver $nodeNameResolver, + private ReflectionProvider $reflectionProvider ) { - $this->parser = $parser; - $this->smartFileSystem = $smartFileSystem; - $this->nodeFinder = $nodeFinder; - $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator; - $this->nodeTypeResolver = $nodeTypeResolver; - $this->nodeNameResolver = $nodeNameResolver; - $this->reflectionProvider = $reflectionProvider; } public function parseMethodReflection(MethodReflection $methodReflection): ?ClassMethod diff --git a/src/Reflection/MethodReflectionToAstResolver.php b/src/Reflection/MethodReflectionToAstResolver.php index 2a946eeaf8c..5024e3b6545 100644 --- a/src/Reflection/MethodReflectionToAstResolver.php +++ b/src/Reflection/MethodReflectionToAstResolver.php @@ -15,34 +15,16 @@ final class MethodReflectionToAstResolver { - /** - * @var FileInfoParser - */ - private $fileInfoParser; - - /** - * @var BetterNodeFinder - */ - private $betterNodeFinder; - - /** - * @var NodeNameResolver - */ - private $nodeNameResolver; - /** * @var array> */ private $analyzedMethodsInFileName = []; public function __construct( - FileInfoParser $fileInfoParser, - BetterNodeFinder $betterNodeFinder, - NodeNameResolver $nodeNameResolver + private FileInfoParser $fileInfoParser, + private BetterNodeFinder $betterNodeFinder, + private NodeNameResolver $nodeNameResolver ) { - $this->fileInfoParser = $fileInfoParser; - $this->betterNodeFinder = $betterNodeFinder; - $this->nodeNameResolver = $nodeNameResolver; } public function resolveProjectClassMethod(PhpMethodReflection $phpMethodReflection): ?ClassMethod diff --git a/src/Reporting/MissingRectorRulesReporter.php b/src/Reporting/MissingRectorRulesReporter.php index 6ba1311fbe9..90791d0c3f0 100644 --- a/src/Reporting/MissingRectorRulesReporter.php +++ b/src/Reporting/MissingRectorRulesReporter.php @@ -11,23 +11,13 @@ final class MissingRectorRulesReporter { - /** - * @var SymfonyStyle - */ - private $symfonyStyle; - - /** - * @var RectorInterface[] - */ - private $rectors = []; - /** * @param RectorInterface[] $rectors */ - public function __construct(array $rectors, SymfonyStyle $symfonyStyle) - { - $this->symfonyStyle = $symfonyStyle; - $this->rectors = $rectors; + public function __construct( + private array $rectors, + private SymfonyStyle $symfonyStyle + ) { } public function reportIfMissing(): ?int diff --git a/src/StaticReflection/DynamicSourceLocatorDecorator.php b/src/StaticReflection/DynamicSourceLocatorDecorator.php index 1464c8564c8..191ade0aa13 100644 --- a/src/StaticReflection/DynamicSourceLocatorDecorator.php +++ b/src/StaticReflection/DynamicSourceLocatorDecorator.php @@ -14,29 +14,11 @@ */ final class DynamicSourceLocatorDecorator { - /** - * @var FileSystemFilter - */ - private $fileSystemFilter; - - /** - * @var DynamicSourceLocatorProvider - */ - private $dynamicSourceLocatorProvider; - - /** - * @var PhpFilesFinder - */ - private $phpFilesFinder; - public function __construct( - FileSystemFilter $fileSystemFilter, - DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, - PhpFilesFinder $phpFilesFinder + private FileSystemFilter $fileSystemFilter, + private DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, + private PhpFilesFinder $phpFilesFinder ) { - $this->fileSystemFilter = $fileSystemFilter; - $this->dynamicSourceLocatorProvider = $dynamicSourceLocatorProvider; - $this->phpFilesFinder = $phpFilesFinder; } /** diff --git a/src/ValueObject/Application/File.php b/src/ValueObject/Application/File.php index 6b6ff37779b..43c2dc9cc91 100644 --- a/src/ValueObject/Application/File.php +++ b/src/ValueObject/Application/File.php @@ -15,16 +15,6 @@ */ final class File { - /** - * @var SmartFileInfo - */ - private $smartFileInfo; - - /** - * @var string - */ - private $fileContent; - /** * @var bool */ @@ -65,10 +55,10 @@ final class File */ private $rectorErrors = []; - public function __construct(SmartFileInfo $smartFileInfo, string $fileContent) - { - $this->smartFileInfo = $smartFileInfo; - $this->fileContent = $fileContent; + public function __construct( + private SmartFileInfo $smartFileInfo, + private string $fileContent + ) { $this->originalFileContent = $fileContent; } diff --git a/src/ValueObject/Application/RectorError.php b/src/ValueObject/Application/RectorError.php index cee4e9c01a4..075a3f9bc4d 100644 --- a/src/ValueObject/Application/RectorError.php +++ b/src/ValueObject/Application/RectorError.php @@ -8,31 +8,16 @@ final class RectorError { - /** - * @var string - */ - private $message; - /** * @var SmartFileInfo */ private $fileInfo; - /** - * @var int|null - */ - private $line; - - /** - * @var string|null - */ - private $rectorClass; - - public function __construct(string $message, ?int $line = null, ?string $rectorClass = null) - { - $this->message = $message; - $this->line = $line; - $this->rectorClass = $rectorClass; + public function __construct( + private string $message, + private ?int $line = null, + private ?string $rectorClass = null + ) { } public function getRelativeFilePath(): string diff --git a/src/ValueObject/Bootstrap/BootstrapConfigs.php b/src/ValueObject/Bootstrap/BootstrapConfigs.php index 36e9dfaa45f..005e0a79058 100644 --- a/src/ValueObject/Bootstrap/BootstrapConfigs.php +++ b/src/ValueObject/Bootstrap/BootstrapConfigs.php @@ -8,23 +8,13 @@ final class BootstrapConfigs { - /** - * @var SmartFileInfo|null - */ - private $mainConfigFileInfo; - - /** - * @var SmartFileInfo[] - */ - private $setConfigFileInfos = []; - /** * @param SmartFileInfo[] $setConfigFileInfos */ - public function __construct(?SmartFileInfo $mainConfigFileInfo, array $setConfigFileInfos) - { - $this->mainConfigFileInfo = $mainConfigFileInfo; - $this->setConfigFileInfos = $setConfigFileInfos; + public function __construct( + private ?SmartFileInfo $mainConfigFileInfo, + private array $setConfigFileInfos + ) { } public function getMainConfigFileInfo(): ?SmartFileInfo diff --git a/src/ValueObject/ProcessResult.php b/src/ValueObject/ProcessResult.php index 3b37eb38311..a52ea5d77bb 100644 --- a/src/ValueObject/ProcessResult.php +++ b/src/ValueObject/ProcessResult.php @@ -24,21 +24,6 @@ final class ProcessResult */ private $errors = []; - /** - * @var int - */ - private $addedFilesCount; - - /** - * @var int - */ - private $removedFilesCount; - - /** - * @var int - */ - private $removedNodeCount; - /** * @param FileDiff[] $fileDiffs * @param RectorError[] $errors @@ -46,18 +31,15 @@ final class ProcessResult public function __construct( array $fileDiffs, array $errors, - int $addedFilesCount, - int $removedFilesCount, - int $removedNodeCount + private int $addedFilesCount, + private int $removedFilesCount, + private int $removedNodeCount ) { Assert::allIsAOf($fileDiffs, FileDiff::class); Assert::allIsAOf($errors, RectorError::class); $this->fileDiffs = $fileDiffs; $this->errors = $errors; - $this->addedFilesCount = $addedFilesCount; - $this->removedFilesCount = $removedFilesCount; - $this->removedNodeCount = $removedNodeCount; } /** diff --git a/src/ValueObject/Reporting/FileDiff.php b/src/ValueObject/Reporting/FileDiff.php index e8f334004a7..bac5a5b5cec 100644 --- a/src/ValueObject/Reporting/FileDiff.php +++ b/src/ValueObject/Reporting/FileDiff.php @@ -10,39 +10,15 @@ final class FileDiff { - /** - * @var string - */ - private $diff; - - /** - * @var string - */ - private $diffConsoleFormatted; - - /** - * @var RectorWithLineChange[] - */ - private $rectorWithLineChanges = []; - - /** - * @var SmartFileInfo - */ - private $smartFileInfo; - /** * @param RectorWithLineChange[] $rectorWithLineChanges */ public function __construct( - SmartFileInfo $smartFileInfo, - string $diff, - string $diffConsoleFormatted, - array $rectorWithLineChanges = [] + private SmartFileInfo $smartFileInfo, + private string $diff, + private string $diffConsoleFormatted, + private array $rectorWithLineChanges = [] ) { - $this->smartFileInfo = $smartFileInfo; - $this->diff = $diff; - $this->rectorWithLineChanges = $rectorWithLineChanges; - $this->diffConsoleFormatted = $diffConsoleFormatted; } public function getDiff(): string diff --git a/src/ValueObject/SprintfStringAndArgs.php b/src/ValueObject/SprintfStringAndArgs.php index 1966a6ab3fc..124f386be15 100644 --- a/src/ValueObject/SprintfStringAndArgs.php +++ b/src/ValueObject/SprintfStringAndArgs.php @@ -9,23 +9,13 @@ final class SprintfStringAndArgs { - /** - * @var Expr[] - */ - private $arrayItems = []; - - /** - * @var String_ - */ - private $string; - /** * @param Expr[] $arrayItems */ - public function __construct(String_ $string, array $arrayItems) - { - $this->string = $string; - $this->arrayItems = $arrayItems; + public function __construct( + private String_ $string, + private array $arrayItems + ) { } /** diff --git a/src/ValueObjectFactory/Application/FileFactory.php b/src/ValueObjectFactory/Application/FileFactory.php index a2d3c534c1e..54fd6a16f9a 100644 --- a/src/ValueObjectFactory/Application/FileFactory.php +++ b/src/ValueObjectFactory/Application/FileFactory.php @@ -13,23 +13,13 @@ */ final class FileFactory { - /** - * @var FileProcessorInterface[] - */ - private $fileProcessors = []; - - /** - * @var FilesFinder - */ - private $filesFinder; - /** * @param FileProcessorInterface[] $fileProcessors */ - public function __construct(FilesFinder $filesFinder, array $fileProcessors) - { - $this->fileProcessors = $fileProcessors; - $this->filesFinder = $filesFinder; + public function __construct( + private FilesFinder $filesFinder, + private array $fileProcessors + ) { } /** diff --git a/src/ValueObjectFactory/ProcessResultFactory.php b/src/ValueObjectFactory/ProcessResultFactory.php index 87432bdc47c..6b38f82a24d 100644 --- a/src/ValueObjectFactory/ProcessResultFactory.php +++ b/src/ValueObjectFactory/ProcessResultFactory.php @@ -11,22 +11,10 @@ final class ProcessResultFactory { - /** - * @var RemovedAndAddedFilesCollector - */ - private $removedAndAddedFilesCollector; - - /** - * @var NodesToRemoveCollector - */ - private $nodesToRemoveCollector; - public function __construct( - RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, - NodesToRemoveCollector $nodesToRemoveCollector + private RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, + private NodesToRemoveCollector $nodesToRemoveCollector ) { - $this->removedAndAddedFilesCollector = $removedAndAddedFilesCollector; - $this->nodesToRemoveCollector = $nodesToRemoveCollector; } /** From b66d096a7e369e4cfeddbe53ad3ca4c8f4cbefa6 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Tue, 11 May 2021 00:27:16 +0100 Subject: [PATCH 6/6] skip already promoted property --- ...kip_promoted_property_and_one_more.php.inc | 26 +++++++++++++++++++ .../NodeResolver/PromotedPropertyResolver.php | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_promoted_property_and_one_more.php.inc diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_promoted_property_and_one_more.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_promoted_property_and_one_more.php.inc new file mode 100644 index 00000000000..6f71a92424d --- /dev/null +++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_promoted_property_and_one_more.php.inc @@ -0,0 +1,26 @@ +originalFile = $fileContent; + } + + public function getOriginalFile(): string + { + return $this->originalFile; + } + + public function getFileContent(): string + { + return $this->fileContent; + } +} diff --git a/rules/Php80/NodeResolver/PromotedPropertyResolver.php b/rules/Php80/NodeResolver/PromotedPropertyResolver.php index 375fb1ef4a7..add2021f287 100644 --- a/rules/Php80/NodeResolver/PromotedPropertyResolver.php +++ b/rules/Php80/NodeResolver/PromotedPropertyResolver.php @@ -92,6 +92,10 @@ private function matchPropertyPromotionCandidate( continue; } + if ($matchedParam->flags !== 0) { + continue; + } + // is param used above assign? if ($this->isParamUsedBeforeAssign($assignedExpr, $firstParamAsVariable)) { continue;