add more promoted properties

rectorphp · May 10, 2021 · a48531e · a48531e
1 parent ccf64d4
commit a48531e
Show file tree

Hide file tree

Showing 585 changed files with 2,118 additions and 9,897 deletions.
diff --git 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
@@ -50,14 +50,9 @@ final class Indent
      */
     private const PARSE_INDENT_REGEX = '/^(?P<indent>( +|\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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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