From 37e63299f5c39d99f990c3ad984d3aaab59f17d2 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 7 Dec 2024 17:42:53 +0700 Subject: [PATCH] refactor: skip CompactToVariablesRector --- rector.php | 3 +++ system/Commands/Generators/ModelGenerator.php | 2 +- system/Commands/Translation/LocalizationFinder.php | 6 +++--- system/Test/Fabricator.php | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rector.php b/rector.php index 5058e5f2ab..6dd90292df 100644 --- a/rector.php +++ b/rector.php @@ -17,6 +17,7 @@ use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector; 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 @@ return RectorConfig::configure() // 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 index f611b52f02..5450bda79b 100644 --- a/system/Commands/Generators/ModelGenerator.php +++ b/system/Commands/Generators/ModelGenerator.php @@ -130,6 +130,6 @@ class ModelGenerator extends BaseCommand $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 index 7010fb8c74..e7d4eff696 100644 --- a/system/Commands/Translation/LocalizationFinder.php +++ b/system/Commands/Translation/LocalizationFinder.php @@ -195,7 +195,7 @@ class LocalizationFinder extends BaseCommand 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 @@ class LocalizationFinder extends BaseCommand } } - return ['foundLanguageKeys' => $foundLanguageKeys, 'badLanguageKeys' => $badLanguageKeys]; + return compact('foundLanguageKeys', 'badLanguageKeys'); } private function isIgnoredFile(SplFileInfo $file): bool @@ -384,6 +384,6 @@ class LocalizationFinder extends BaseCommand $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 index c34213c5cf..8da0c60fc0 100644 --- a/system/Test/Fabricator.php +++ b/system/Test/Fabricator.php @@ -272,7 +272,7 @@ class Fabricator */ 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 @@ class Fabricator */ 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 @@ class Fabricator */ 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; }