refactor: Enable Rector Code Quality set (#10429)

Author: samsonasik

rector.php

@@ -13,11 +13,10 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\CodeQuality\Rector\BooleanNot\NegatedAndsToPositiveOrsRector;
-use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
+use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector;
-use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
@@ -49,13 +48,14 @@
 use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
 use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\SafeDeclareStrictTypesRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
 return RectorConfig::configure()
     ->withPhpSets(php82: true)
-    ->withPreparedSets(deadCode: true, instanceOf: true, phpunitCodeQuality: true)
+    ->withPreparedSets(deadCode: true, codeQuality: true, instanceOf: true, phpunitCodeQuality: true)
     ->withComposerBased(phpunit: true)
     ->withParallel(120, 8, 10)
     ->withCache(
@@ -177,6 +177,8 @@
 
         // to be applied in separate PRs to ease review
         NegatedAndsToPositiveOrsRector::class,
+        SafeDeclareStrictTypesRector::class,
+        LocallyCalledStaticMethodToNonStaticRector::class,
     ])
     // auto import fully qualified class names
     ->withImportNames()
@@ -193,8 +195,6 @@
         RemoveErrorSuppressInTryCatchStmtsRector::class,
         FuncGetArgsToVariadicParamRector::class,
         MakeInheritedMethodVisibilitySameAsParentRector::class,
-        SimplifyEmptyCheckOnEmptyArrayRector::class,
-        TernaryEmptyArrayArrayDimFetchToCoalesceRector::class,
         DisallowedEmptyRuleFixerRector::class,
         PrivatizeFinalClassPropertyRector::class,
         VersionCompareFuncCallToConstantRector::class,
@@ -208,5 +208,4 @@
     ->withConfiguredRule(RenameConstantRector::class, [
         'FILTER_DEFAULT' => 'FILTER_UNSAFE_RAW',
     ])
-    ->withCodeQualityLevel(61)
     ->reportUnusedSkips();

system/CLI/CLI.php

@@ -819,7 +819,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
         if ($thisStep !== false) {
             // Don't allow div by zero or negative numbers....
             $thisStep   = abs($thisStep);
-            $totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
+            $totalSteps = max(1, $totalSteps);
 
             $percent = (int) (($thisStep / $totalSteps) * 100);
             $step    = (int) round($percent / 10);

system/Cookie/Cookie.php

@@ -366,7 +366,7 @@ public function getMaxAge(): int
     {
         $maxAge = $this->expires - Time::now()->getTimestamp();
 
-        return $maxAge >= 0 ? $maxAge : 0;
+        return max($maxAge, 0);
     }
 
     /**

system/Pager/Pager.php

@@ -434,7 +434,7 @@ protected function calculateCurrentPage(string $group)
 
             $page = (int) (service('superglobals')->get($pageSelector, '1'));
 
-            $this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
+            $this->groups[$group]['currentPage'] = max(1, $page);
         }
     }
 }