Merge pull request #9743 from samsonasik/refactor-apply-code-quality-51

refactor: apply code quality level 51 for Rector

Author: samsonasik

rector.php

@@ -13,10 +13,9 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
-use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
-use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
 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;
@@ -167,6 +166,9 @@
         CompactToVariablesRector::class,
 
         RemoveDataProviderParamKeysRector::class,
+
+        // possibly isset() on purpose, on updated Config classes property accross versions
+        IssetOnPropertyObjectToPropertyExistsRector::class,
     ])
     // auto import fully qualified class names
     ->withImportNames(removeUnusedImports: true)
@@ -179,9 +181,7 @@
         CountArrayToEmptyArrayComparisonRector::class,
         ChangeNestedForeachIfsToEarlyContinueRector::class,
         ChangeIfElseValueAssignToEarlyReturnRector::class,
-        InlineIfToExplicitIfRector::class,
         PreparedValueToEarlyReturnRector::class,
-        UnusedForeachValueToArrayKeysRector::class,
         RemoveErrorSuppressInTryCatchStmtsRector::class,
         FuncGetArgsToVariadicParamRector::class,
         MakeInheritedMethodVisibilitySameAsParentRector::class,
@@ -202,4 +202,4 @@
         // keep '\\' prefix string on string '\Foo\Bar'
         StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
     ])
-    ->withCodeQualityLevel(41);
+    ->withCodeQualityLevel(51);

system/Commands/Database/CreateDatabase.php

@@ -109,7 +109,7 @@ public function run(array $params)
                 $config->{$group}['database'] = $name;
 
                 if ($name !== ':memory:') {
-                    $dbName = ! str_contains($name, DIRECTORY_SEPARATOR) ? WRITEPATH . $name : $name;
+                    $dbName = str_contains($name, DIRECTORY_SEPARATOR) ? $name : WRITEPATH . $name;
 
                     if (is_file($dbName)) {
                         CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');

system/Database/BaseBuilder.php

@@ -1152,7 +1152,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
             return $this;
         }
 
-        $keyValue = ! is_array($field) ? [$field => $match] : $field;
+        $keyValue = is_array($field) ? $field : [$field => $match];
 
         foreach ($keyValue as $k => $v) {
             if ($insensitiveSearch) {
@@ -3065,7 +3065,7 @@ protected function compileSelect($selectOverride = false): string
         if ($selectOverride !== false) {
             $sql = $selectOverride;
         } else {
-            $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+            $sql = $this->QBDistinct ? 'SELECT DISTINCT ' : 'SELECT ';
 
             if (empty($this->QBSelect)) {
                 $sql .= '*';

system/Database/BaseUtils.php

@@ -250,7 +250,7 @@ public function getXMLFromResult(ResultInterface $query, array $params = []): st
             $xml .= $tab . '<' . $element . '>' . $newline;
 
             foreach ($row as $key => $val) {
-                $val = (! empty($val)) ? xml_convert((string) $val) : '';
+                $val = empty($val) ? '' : xml_convert((string) $val);
 
                 $xml .= $tab . $tab . '<' . $key . '>' . $val . '</' . $key . '>' . $newline;
             }

system/Database/Database.php

@@ -136,9 +136,9 @@ protected function parseDSN(array $params): array
      */
     protected function initDriver(string $driver, string $class, $argument): object
     {
-        $classname = (! str_contains($driver, '\\'))
-            ? "CodeIgniter\\Database\\{$driver}\\{$class}"
-            : $driver . '\\' . $class;
+        $classname = str_contains($driver, '\\')
+            ? $driver . '\\' . $class
+            : "CodeIgniter\\Database\\{$driver}\\{$class}";
 
         return new $classname($argument);
     }

system/Database/MigrationRunner.php

@@ -659,7 +659,7 @@ public function getHistory(string $group = 'default'): array
 
         $query = $builder->orderBy('id', 'ASC')->get();
 
-        return ! empty($query) ? $query->getResultObject() : [];
+        return empty($query) ? [] : $query->getResultObject();
     }
 
     /**
@@ -676,7 +676,7 @@ public function getBatchHistory(int $batch, $order = 'asc'): array
             ->orderBy('id', $order)
             ->get();
 
-        return ! empty($query) ? $query->getResultObject() : [];
+        return empty($query) ? [] : $query->getResultObject();
     }
 
     /**

system/Database/SQLSRV/Builder.php

@@ -584,7 +584,7 @@ protected function compileSelect($selectOverride = false): string
         if ($selectOverride !== false) {
             $sql = $selectOverride;
         } else {
-            $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+            $sql = $this->QBDistinct ? 'SELECT DISTINCT ' : 'SELECT ';
 
             // SQL Server can't work with select * if group by is specified
             if (empty($this->QBSelect) && $this->QBGroupBy !== [] && is_array($this->QBGroupBy)) {

system/Debug/Timer.php

@@ -46,7 +46,7 @@ class Timer
     public function start(string $name, ?float $time = null)
     {
         $this->timers[strtolower($name)] = [
-            'start' => ! empty($time) ? $time : microtime(true),
+            'start' => empty($time) ? microtime(true) : $time,
             'end'   => null,
         ];
 

system/Email/Email.php

@@ -839,7 +839,7 @@ public function setNewline($newline = "\n")
      */
     public function setCRLF($CRLF = "\n")
     {
-        $this->CRLF = ! in_array($CRLF, ["\n", "\r\n", "\r"], true) ? "\n" : $CRLF;
+        $this->CRLF = in_array($CRLF, ["\n", "\r\n", "\r"], true) ? $CRLF : "\n";
 
         return $this;
     }
@@ -2222,7 +2222,7 @@ protected function mimeTypes($ext = '')
     {
         $mime = Mimes::guessTypeFromExtension(strtolower($ext));
 
-        return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+        return empty($mime) ? 'application/x-unknown-content-type' : $mime;
     }
 
     public function __destruct()

system/HTTP/Response.php

@@ -221,7 +221,7 @@ public function getStatusCode(): int
     public function getReasonPhrase()
     {
         if ($this->reason === '') {
-            return ! empty($this->statusCode) ? static::$statusCodes[$this->statusCode] : '';
+            return empty($this->statusCode) ? '' : static::$statusCodes[$this->statusCode];
         }
 
         return $this->reason;