[ci-review] Rector Rectify

rectorphp · Jul 3, 2022 · 11fffc5 · 11fffc5
1 parent f4f6b93
commit 11fffc5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/rules/CodeQuality/Rector/For_/ForToForeachRector.php b/rules/CodeQuality/Rector/For_/ForToForeachRector.php
@@ -145,8 +145,8 @@ public function refactor(Node $node): ?Node
 
     private function processForToForeach(For_ $for, string $iteratedVariable): ?Foreach_
     {
-        $originalVariableSingle = $this->inflector->singularize($iteratedVariable);
-        $iteratedVariableSingle = $originalVariableSingle;
+        $originalVariableSingle = null;
+        $iteratedVariableSingle = $this->inflector->singularize($iteratedVariable);
 
         if ($iteratedVariableSingle === $iteratedVariable) {
             $iteratedVariableSingle = 'single' . ucfirst($iteratedVariableSingle);
@@ -167,7 +167,10 @@ private function processForToForeach(For_ $for, string $iteratedVariable): ?Fore
         return null;
     }
 
-    private function createForeachFromForWithIteratedVariableSingle(For_ $for, string $iteratedVariableSingle): Foreach_
+    private function createForeachFromForWithIteratedVariableSingle(
+        \For_ $for,
+        string $iteratedVariableSingle
+    ): Foreach_
     {
         $foreach = $this->foreachFactory->createFromFor(
             $for,

diff --git a/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustVariableAssignRector.php b/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustVariableAssignRector.php
@@ -22,7 +22,7 @@
 final class RemoveJustVariableAssignRector extends AbstractRector
 {
     public function __construct(
-        private VariableAnalyzer $variableAnalyzer
+        private readonly VariableAnalyzer $variableAnalyzer
     ) {
     }
 

diff --git a/rules/Privatization/Reflection/ClassConstantsResolver.php b/rules/Privatization/Reflection/ClassConstantsResolver.php
@@ -19,10 +19,11 @@ public function __construct(
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array<string, mixed>|null
      */
-    public function getClassConstantNamesToValues(string $classWithConstants): array
+    public function getClassConstantNamesToValues(string $classWithConstants): ?array
     {
+        $constantNamesToValues = null;
         if (isset($this->cachedConstantNamesToValues[$classWithConstants])) {
             return $this->cachedConstantNamesToValues[$classWithConstants];
         }
@@ -34,8 +35,7 @@ public function getClassConstantNamesToValues(string $classWithConstants): array
         $classReflection = $this->reflectionProvider->getClass($classWithConstants);
         $nativeReflection = $classReflection->getNativeReflection();
 
-        $constantNamesToValues = $nativeReflection->getConstants();
-        $this->cachedConstantNamesToValues = $constantNamesToValues;
+        $this->cachedConstantNamesToValues = $nativeReflection->getConstants();
 
         return $constantNamesToValues;
     }

diff --git a/rules/Transform/Rector/Assign/PropertyFetchToMethodCallRector.php b/rules/Transform/Rector/Assign/PropertyFetchToMethodCallRector.php
@@ -122,8 +122,7 @@ private function processGetter(PropertyFetch $propertyFetch): ?Node
             );
 
             if ($propertyToMethodCall->getNewGetArguments() !== []) {
-                $args = $this->nodeFactory->createArgs($propertyToMethodCall->getNewGetArguments());
-                $methodCall->args = $args;
+                $methodCall->args = $this->nodeFactory->createArgs($propertyToMethodCall->getNewGetArguments());
             }
 
             return $methodCall;