[PHP 8.0] Bump to promoted properties (#4)

rectorphp · May 10, 2021 · f451b0b · f451b0b
1 parent 2deebfe
commit f451b0b
Show file tree

Hide file tree

Showing 824 changed files with 3,044 additions and 14,088 deletions.
diff --git 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
@@ -8,23 +8,16 @@
 
 final class DoctrineAnnotationTagValueNode extends AbstractValuesAwareNode
 {
-    /**
-     * @var string
-     */
-    private $annotationClass;
-
     /**
      * @param array<mixed, mixed> $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
@@ -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
@@ -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<string, PhpDocInfo>
      */
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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