refactor: skip CompactToVariablesRector

codeigniter4 · Dec 7, 2024 · 37e6329 · 37e6329
1 parent 21b8877
commit 37e6329
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/rector.php b/rector.php
@@ -17,6 +17,7 @@
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
+use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -171,6 +172,8 @@
 
         // Unnecessary (string) is inserted
         NullToStrictStringFuncCallArgRector::class,
+
+        CompactToVariablesRector::class,
     ])
     // auto import fully qualified class names
     ->withImportNames(removeUnusedImports: true)

diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
@@ -130,6 +130,6 @@ protected function prepare(string $class): string
             $return = "'{$return}'";
         }
 
-        return $this->parseTemplate($class, ['{dbGroup}', '{table}', '{return}'], [$dbGroup, $table, $return], ['dbGroup' => $dbGroup]);
+        return $this->parseTemplate($class, ['{dbGroup}', '{table}', '{return}'], [$dbGroup, $table, $return], compact('dbGroup'));
     }
 }
diff --git a/system/Commands/Translation/LocalizationFinder.php b/system/Commands/Translation/LocalizationFinder.php
@@ -195,7 +195,7 @@ private function findTranslationsInFile($file): array
         preg_match_all('/lang\(\'([._a-z0-9\-]+)\'\)/ui', $fileContent, $matches);
 
         if ($matches[1] === []) {
-            return ['foundLanguageKeys' => $foundLanguageKeys, 'badLanguageKeys' => $badLanguageKeys];
+            return compact('foundLanguageKeys', 'badLanguageKeys');
         }
 
         foreach ($matches[1] as $phraseKey) {
@@ -228,7 +228,7 @@ private function findTranslationsInFile($file): array
             }
         }
 
-        return ['foundLanguageKeys' => $foundLanguageKeys, 'badLanguageKeys' => $badLanguageKeys];
+        return compact('foundLanguageKeys', 'badLanguageKeys');
     }
 
     private function isIgnoredFile(SplFileInfo $file): bool
@@ -384,6 +384,6 @@ private function findLanguageKeysInFiles(array $files): array
             $badLanguageKeys   = array_merge($findInFile['badLanguageKeys'], $badLanguageKeys);
         }
 
-        return ['foundLanguageKeys' => $foundLanguageKeys, 'badLanguageKeys' => $badLanguageKeys, 'countFiles' => $countFiles];
+        return compact('foundLanguageKeys', 'badLanguageKeys', 'countFiles');
     }
 }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
@@ -272,7 +272,7 @@ public function setOverrides(array $overrides = [], $persist = true): self
      */
     public function setUnique(string $field, bool $reset = false, int $maxRetries = 10000): static
     {
-        $this->modifiedFields['unique'][$field] = ['reset' => $reset, 'maxRetries' => $maxRetries];
+        $this->modifiedFields['unique'][$field] = compact('reset', 'maxRetries');
 
         return $this;
     }
@@ -284,7 +284,7 @@ public function setUnique(string $field, bool $reset = false, int $maxRetries =
      */
     public function setOptional(string $field, float $weight = 0.5, mixed $default = null): static
     {
-        $this->modifiedFields['optional'][$field] = ['weight' => $weight, 'default' => $default];
+        $this->modifiedFields['optional'][$field] = compact('weight', 'default');
 
         return $this;
     }
@@ -298,7 +298,7 @@ public function setOptional(string $field, float $weight = 0.5, mixed $default =
      */
     public function setValid(string $field, ?Closure $validator = null, int $maxRetries = 10000): static
     {
-        $this->modifiedFields['valid'][$field] = ['validator' => $validator, 'maxRetries' => $maxRetries];
+        $this->modifiedFields['valid'][$field] = compact('validator', 'maxRetries');
 
         return $this;
     }