Apply rector on PHP 8.1 + minor refactoring

Author: Tigrov

CHANGELOG.md

@@ -10,7 +10,7 @@
   for type casting performance. Related with yiisoft/db#752 (@Tigrov)
 - Chg #272: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)
 - Enh #275: Refactor PHP type of `ColumnSchemaInterface` instances (@Tigrov)
-- Chg #277: Raise minimum PHP version to `^8.1` (@Tigrov)
+- Enh #277: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

rector.php

@@ -5,7 +5,8 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php73\Rector\String_\SensitiveHereNowDocRector;
-use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -22,11 +23,12 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 
     $rectorConfig->skip([
-        ClosureToArrowFunctionRector::class,
+        NullToStrictStringFuncCallArgRector::class,
+        ReadOnlyPropertyRector::class,
         SensitiveHereNowDocRector::class,
     ]);
 };

src/DMLQueryBuilder.php

@@ -40,7 +40,7 @@ public function insertBatch(string $table, iterable $rows, array $columns = [],
         $tableAndColumns = ' INTO ' . $this->quoter->quoteTableName($table);
 
         if (count($columns) > 0) {
-            $quotedColumnNames = array_map([$this->quoter, 'quoteColumnName'], $columns);
+            $quotedColumnNames = array_map($this->quoter->quoteColumnName(...), $columns);
 
             $tableAndColumns .= ' (' . implode(', ', $quotedColumnNames) . ')';
         }

src/DQLQueryBuilder.php

@@ -14,7 +14,6 @@
 use Yiisoft\Db\QueryBuilder\Condition\InCondition;
 use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
 
-use function array_merge;
 use function implode;
 
 /**
@@ -84,13 +83,11 @@ public function buildWithQueries(array $withs, array &$params): string
 
     protected function defaultExpressionBuilders(): array
     {
-        return array_merge(
-            parent::defaultExpressionBuilders(),
-            [
-                InCondition::class => InConditionBuilder::class,
-                LikeCondition::class => LikeConditionBuilder::class,
-                Expression::class => ExpressionBuilder::class,
-            ],
-        );
+        return [
+            ...parent::defaultExpressionBuilders(),
+            InCondition::class => InConditionBuilder::class,
+            LikeCondition::class => LikeConditionBuilder::class,
+            Expression::class => ExpressionBuilder::class,
+        ];
     }
 }

src/Schema.php

@@ -24,7 +24,6 @@
 
 use function array_change_key_case;
 use function array_map;
-use function array_merge;
 use function array_reverse;
 use function implode;
 use function is_array;
@@ -290,7 +289,7 @@ protected function loadTableIndexes(string $tableName): array
         ])->queryAll();
 
         /** @psalm-var array[] $indexes */
-        $indexes = array_map('array_change_key_case', $indexes);
+        $indexes = array_map(array_change_key_case(...), $indexes);
         $indexes = DbArrayHelper::index($indexes, null, ['name']);
 
         $result = [];
@@ -605,7 +604,7 @@ protected function findConstraints(TableSchemaInterface $table): void
         }
 
         foreach ($constraints as $index => $constraint) {
-            $table->foreignKey($index, array_merge([$constraint['tableName']], $constraint['columns']));
+            $table->foreignKey($index, [$constraint['tableName'], ...$constraint['columns']]);
         }
     }
 
@@ -737,7 +736,7 @@ private function loadTableConstraints(string $tableName, string $returnType): mi
         ])->queryAll();
 
         /** @psalm-var array[] $constraints */
-        $constraints = array_map('array_change_key_case', $constraints);
+        $constraints = array_map(array_change_key_case(...), $constraints);
         $constraints = DbArrayHelper::index($constraints, null, ['type', 'name']);
 
         $result = [
@@ -827,12 +826,10 @@ protected function findViewNames(string $schema = ''): array
      * @param string $name The table name.
      *
      * @return array The cache key.
-     *
-     * @psalm-suppress DeprecatedMethod
      */
     protected function getCacheKey(string $name): array
     {
-        return array_merge([self::class], $this->generateCacheKey(), [$this->db->getQuoter()->getRawTableName($name)]);
+        return [self::class, ...$this->generateCacheKey(), $this->db->getQuoter()->getRawTableName($name)];
     }
 
     /**
@@ -844,6 +841,6 @@ protected function getCacheKey(string $name): array
      */
     protected function getCacheTag(): string
     {
-        return md5(serialize(array_merge([self::class], $this->generateCacheKey())));
+        return md5(serialize([self::class, ...$this->generateCacheKey()]));
     }
 }

tests/Provider/ColumnSchemaBuilderProvider.php

@@ -17,12 +17,10 @@ public static function types(): array
         $types[0][0] = 'integer UNSIGNED DEFAULT NULL NULL';
         $types[1][0] = 'integer(10) UNSIGNED';
 
-        return array_merge(
-            $types,
-            [
-                ['integer UNSIGNED', SchemaInterface::TYPE_INTEGER, null, [['unsigned']]],
-            ],
-        );
+        return [
+            ...$types,
+            ['integer UNSIGNED', SchemaInterface::TYPE_INTEGER, null, [['unsigned']]],
+        ];
     }
 
     public static function createColumnTypes(): array