[ci-review] Rector Rectify

rectorphp · May 17, 2021 · 37219bf · 37219bf
1 parent 57098c3
commit 37219bf
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php
@@ -78,7 +78,7 @@ public function refactor(Node $node): ?Node
             }
 
             if (! $node instanceof Assign) {
-                return ! (bool) $this->betterNodeFinder->find($node, function (Node $n) use ($arrayVariable) {
+                return ! (bool) $this->betterNodeFinder->find($node, function (Node $n) use ($arrayVariable): bool {
                     return $this->nodeComparator->areNodesEqual($arrayVariable, $n);
                 });
             }

diff --git a/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php b/rules/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector.php
@@ -127,8 +127,8 @@ public function refactor(Node $node): ?Node
 
     private function createAnonymousClassName(): string
     {
-        $fileInfo = $this->file->getSmartFileInfo();
+        $smartFileInfo = $this->file->getSmartFileInfo();
 
-        return self::ANONYMOUS_CLASS_PREFIX . md5($fileInfo->getRealPath()) . '__' . count($this->classes);
+        return self::ANONYMOUS_CLASS_PREFIX . md5($smartFileInfo->getRealPath()) . '__' . count($this->classes);
     }
 }
diff --git a/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php b/rules/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector.php
@@ -96,10 +96,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $fileInfo = $this->file->getSmartFileInfo();
+        $smartFileInfo = $this->file->getSmartFileInfo();
 
         // this rule is parsing strings, so it heavy on performance; to lower it, we'll process only known opt-in files
-        if (! $this->isRelevantFileInfo($fileInfo)) {
+        if (! $this->isRelevantFileInfo($smartFileInfo)) {
             return null;
         }
 

diff --git a/rules/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector.php b/rules/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector.php
@@ -45,10 +45,7 @@ final class SetCookieOptionsArrayToArgumentsRector extends AbstractRector
         6 => false,
     ];
 
-    /**
-     * @var int
-     */
-    private $highestIndex = 1;
+    private int $highestIndex = 1;
 
     public function getRuleDefinition(): RuleDefinition
     {

diff --git a/rules/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php b/rules/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php
@@ -42,7 +42,7 @@ final class AddDefaultValueForUndefinedVariableRector extends AbstractRector
     /**
      * @var string[]
      */
-    private $definedVariables = [];
+    private array $definedVariables = [];
 
     public function getRuleDefinition(): RuleDefinition
     {

diff --git a/rules/Php71/Rector/Name/ReservedObjectRector.php b/rules/Php71/Rector/Name/ReservedObjectRector.php
@@ -29,7 +29,7 @@ final class ReservedObjectRector extends AbstractRector implements ConfigurableR
     /**
      * @var array<string, string>
      */
-    private $reservedKeywordsToReplacements = [];
+    private array $reservedKeywordsToReplacements = [];
 
     public function getRuleDefinition(): RuleDefinition
     {

diff --git a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php b/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php
@@ -43,12 +43,9 @@ final class PseudoNamespaceToNamespaceRector extends AbstractRector implements C
     /**
      * @var PseudoNamespaceToNamespace[]
      */
-    private $pseudoNamespacesToNamespaces = [];
+    private array $pseudoNamespacesToNamespaces = [];
 
-    /**
-     * @var string|null
-     */
-    private $newNamespace;
+    private ?string $newNamespace = null;
 
     public function __construct(
         private PhpDocTypeRenamer $phpDocTypeRenamer