[ci-review] Rector Rectify

rectorphp · May 10, 2021 · ae94015 · ae94015
1 parent d2f07c2
commit ae94015
Show file tree

Hide file tree

Showing 532 changed files with 2,287 additions and 8,621 deletions.
diff --git a/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php b/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php
@@ -33,20 +33,11 @@
  */
 final class RemoveAlwaysTrueConditionSetInConstructorRector extends AbstractRector
 {
-    /**
-     * @var StaticTypeAnalyzer
-     */
-    private $staticTypeAnalyzer;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    public function __construct(StaticTypeAnalyzer $staticTypeAnalyzer, TypeFactory $typeFactory)
+    public function __construct(
+        private StaticTypeAnalyzer $staticTypeAnalyzer,
+        private TypeFactory $typeFactory
+    )
     {
-        $this->staticTypeAnalyzer = $staticTypeAnalyzer;
-        $this->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,10 @@
  */
 final class FlipTypeControlToUseExclusiveTypeRector extends AbstractRector
 {
-    /**
-     * @var PhpDocTagRemover
-     */
-    private $phpDocTagRemover;
-
-    public function __construct(PhpDocTagRemover $phpDocTagRemover)
+    public function __construct(
+        private PhpDocTagRemover $phpDocTagRemover
+    )
     {
-        $this->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,10 @@ final class GetClassToInstanceOfRector extends AbstractRector
      */
     private const NO_NAMESPACED_CLASSNAMES = ['self', 'static'];
 
-    /**
-     * @var BinaryOpManipulator
-     */
-    private $binaryOpManipulator;
-
-    public function __construct(BinaryOpManipulator $binaryOpManipulator)
+    public function __construct(
+        private BinaryOpManipulator $binaryOpManipulator
+    )
     {
-        $this->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,10 @@
  */
 final class SimplifyArraySearchRector extends AbstractRector
 {
-    /**
-     * @var BinaryOpManipulator
-     */
-    private $binaryOpManipulator;
-
-    public function __construct(BinaryOpManipulator $binaryOpManipulator)
+    public function __construct(
+        private BinaryOpManipulator $binaryOpManipulator
+    )
     {
-        $this->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,11 @@
  */
 final class SimplifyConditionsRector extends AbstractRector
 {
-    /**
-     * @var AssignAndBinaryMap
-     */
-    private $assignAndBinaryMap;
-
-    /**
-     * @var BinaryOpManipulator
-     */
-    private $binaryOpManipulator;
-
-    public function __construct(AssignAndBinaryMap $assignAndBinaryMap, BinaryOpManipulator $binaryOpManipulator)
+    public function __construct(
+        private AssignAndBinaryMap $assignAndBinaryMap,
+        private BinaryOpManipulator $binaryOpManipulator
+    )
     {
-        $this->assignAndBinaryMap = $assignAndBinaryMap;
-        $this->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,10 @@
  */
 final class CombineIfRector extends AbstractRector
 {
-    /**
-     * @var CommentsMerger
-     */
-    private $commentsMerger;
-
-    public function __construct(CommentsMerger $commentsMerger)
+    public function __construct(
+        private CommentsMerger $commentsMerger
+    )
     {
-        $this->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,10 @@ final class ConsecutiveNullCompareReturnsToNullCoalesceQueueRector extends Abstr
      */
     private $coalescingNodes = [];
 
-    /**
-     * @var IfManipulator
-     */
-    private $ifManipulator;
-
-    public function __construct(IfManipulator $ifManipulator)
+    public function __construct(
+        private IfManipulator $ifManipulator
+    )
     {
-        $this->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,11 @@
  */
 final class ExplicitBoolCompareRector extends AbstractRector
 {
-    /**
-     * @var StringTypeAnalyzer
-     */
-    private $stringTypeAnalyzer;
-
-    /**
-     * @var ArrayTypeAnalyzer
-     */
-    private $arrayTypeAnalyzer;
-
-    public function __construct(StringTypeAnalyzer $stringTypeAnalyzer, ArrayTypeAnalyzer $arrayTypeAnalyzer)
+    public function __construct(
+        private StringTypeAnalyzer $stringTypeAnalyzer,
+        private ArrayTypeAnalyzer $arrayTypeAnalyzer
+    )
     {
-        $this->stringTypeAnalyzer = $stringTypeAnalyzer;
-        $this->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,10 @@
  */
 final class SimplifyIfNotNullReturnRector extends AbstractRector
 {
-    /**
-     * @var IfManipulator
-     */
-    private $ifManipulator;
-
-    public function __construct(IfManipulator $ifManipulator)
+    public function __construct(
+        private IfManipulator $ifManipulator
+    )
     {
-        $this->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,12 @@
  */
 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
-    ) {
-        $this->ifManipulator = $ifManipulator;
-        $this->assignVariableTypeResolver = $assignVariableTypeResolver;
-        $this->varTagRemover = $varTagRemover;
+        private IfManipulator $ifManipulator,
+        private AssignVariableTypeResolver $assignVariableTypeResolver,
+        private 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,11 @@
  */
 final class SimplifyIfReturnBoolRector extends AbstractRector
 {
-    /**
-     * @var CommentsMerger
-     */
-    private $commentsMerger;
-
-    /**
-     * @var ExprBoolCaster
-     */
-    private $exprBoolCaster;
-
-    public function __construct(CommentsMerger $commentsMerger, ExprBoolCaster $exprBoolCaster)
+    public function __construct(
+        private CommentsMerger $commentsMerger,
+        private ExprBoolCaster $exprBoolCaster
+    )
     {
-        $this->commentsMerger = $commentsMerger;
-        $this->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,10 @@
  */
 final class IssetOnPropertyObjectToPropertyExistsRector extends AbstractRector
 {
-    /**
-     * @var ReflectionProvider
-     */
-    private $reflectionProvider;
-
-    public function __construct(ReflectionProvider $reflectionProvider)
+    public function __construct(
+        private ReflectionProvider $reflectionProvider
+    )
     {
-        $this->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,10 @@
  */
 final class FixClassCaseSensitivityNameRector extends AbstractRector
 {
-    /**
-     * @var ReflectionProvider
-     */
-    private $reflectionProvider;
-
-    public function __construct(ReflectionProvider $reflectionProvider)
+    public function __construct(
+        private ReflectionProvider $reflectionProvider
+    )
     {
-        $this->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,10 @@
  */
 final class SimplifyUselessVariableRector extends AbstractRector
 {
-    /**
-     * @var AssignAndBinaryMap
-     */
-    private $assignAndBinaryMap;
-
-    public function __construct(AssignAndBinaryMap $assignAndBinaryMap)
+    public function __construct(
+        private AssignAndBinaryMap $assignAndBinaryMap
+    )
     {
-        $this->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,10 @@
  */
 final class SingularSwitchToIfRector extends AbstractRector
 {
-    /**
-     * @var SwitchManipulator
-     */
-    private $switchManipulator;
-
-    public function __construct(SwitchManipulator $switchManipulator)
+    public function __construct(
+        private SwitchManipulator $switchManipulator
+    )
     {
-        $this->switchManipulator = $switchManipulator;
     }
 
     public function getRuleDefinition(): RuleDefinition

diff --git a/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php b/rules/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector.php
@@ -19,14 +19,10 @@
  */
 final class SimplifyTautologyTernaryRector extends AbstractRector
 {
-    /**
-     * @var BinaryOpManipulator
-     */
-    private $binaryOpManipulator;
-
-    public function __construct(BinaryOpManipulator $binaryOpManipulator)
+    public function __construct(
+        private BinaryOpManipulator $binaryOpManipulator
+    )
     {
-        $this->binaryOpManipulator = $binaryOpManipulator;
     }
 
     public function getRuleDefinition(): RuleDefinition

diff --git a/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php b/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php
@@ -21,14 +21,10 @@
  */
 final class UnnecessaryTernaryExpressionRector extends AbstractRector
 {
-    /**
-     * @var AssignAndBinaryMap
-     */
-    private $assignAndBinaryMap;
-
-    public function __construct(AssignAndBinaryMap $assignAndBinaryMap)
+    public function __construct(
+        private AssignAndBinaryMap $assignAndBinaryMap
+    )
     {
-        $this->assignAndBinaryMap = $assignAndBinaryMap;
     }
 
     public function getRuleDefinition(): RuleDefinition

diff --git a/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php b/rules/CodeQuality/TypeResolver/ArrayDimFetchTypeResolver.php
@@ -14,14 +14,10 @@
 
 final class ArrayDimFetchTypeResolver
 {
-    /**
-     * @var NodeTypeResolver
-     */
-    private $nodeTypeResolver;
-
-    public function __construct(NodeTypeResolver $nodeTypeResolver)
+    public function __construct(
+        private NodeTypeResolver $nodeTypeResolver
+    )
     {
-        $this->nodeTypeResolver = $nodeTypeResolver;
     }
 
     public function resolve(ArrayDimFetch $arrayDimFetch): ArrayType

diff --git a/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php b/rules/CodeQuality/TypeResolver/AssignVariableTypeResolver.php
@@ -11,14 +11,10 @@
 
 final class AssignVariableTypeResolver
 {
-    /**
-     * @var NodeTypeResolver
-     */
-    private $nodeTypeResolver;
-
-    public function __construct(NodeTypeResolver $nodeTypeResolver)
+    public function __construct(
+        private NodeTypeResolver $nodeTypeResolver
+    )
     {
-        $this->nodeTypeResolver = $nodeTypeResolver;
     }
 
     public function resolve(Assign $assign): Type