refactor: run rector

kenjis · kenjis · commit 9f2785facfed · 2023-11-29T13:32:38.000+09:00
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
@@ -39,7 +39,7 @@ public function run()
         Services::routes()->loadRoutes();
 
         $runner  = Services::commands();
-        $params  = array_merge(CLI::getSegments(), CLI::getOptions());
+        $params  = [...CLI::getSegments(), ...CLI::getOptions()];
         $params  = $this->parseParamsForHelpOption($params);
         $command = array_shift($params) ?? 'list';
 
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
@@ -51,7 +51,7 @@ public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
 
-        $this->config = array_merge($this->config, $config->memcached);
+        $this->config = [...$this->config, ...$config->memcached];
     }
 
     /**
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -53,7 +53,7 @@ public function __construct(Cache $config)
         $this->prefix = $config->prefix;
 
         if (isset($config->redis)) {
-            $this->config = array_merge($this->config, $config->redis);
+            $this->config = [...$this->config, ...$config->redis];
         }
     }
 
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
@@ -51,7 +51,7 @@ public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
 
-        $this->config = array_merge($this->config, $config->redis);
+        $this->config = [...$this->config, ...$config->redis];
     }
 
     /**
diff --git a/system/Commands/Generators/CellGenerator.php b/system/Commands/Generators/CellGenerator.php
@@ -77,7 +77,7 @@ public function run(array $params)
         $this->component = 'Cell';
         $this->directory = 'Cells';
 
-        $params = array_merge($params, ['suffix' => null]);
+        $params = [...$params, 'suffix' => null];
 
         $this->templatePath  = config(Generators::class)->views[$this->name]['class'];
         $this->template      = 'cell.tpl.php';
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
@@ -123,7 +123,7 @@ protected function prepare(string $class): string
             }
 
             $return = '\\' . trim($return, '\\') . '::class';
-            $this->call('make:entity', array_merge([$baseClass], $this->params));
+            $this->call('make:entity', [$baseClass, ...$this->params]);
         } else {
             $return = "'{$return}'";
         }
diff --git a/system/Commands/Translation/LocalizationFinder.php b/system/Commands/Translation/LocalizationFinder.php
@@ -130,7 +130,7 @@ private function process(string $currentDir, string $currentLocale): void
             $countNewKeys += ArrayHelper::recursiveCount($languageDiff);
 
             if ($this->showNew) {
-                $tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
+                $tableRows = [...$this->arrayToTableRows($langFileName, $languageDiff), ...$tableRows];
             } else {
                 $newLanguageKeys = array_replace_recursive($foundLanguageKeys[$langFileName], $languageStoredKeys);
 
@@ -303,7 +303,7 @@ private function arrayToTableRows(string $langFileName, array $array): array
 
         foreach ($array as $value) {
             if (is_array($value)) {
-                $rows = array_merge($rows, $this->arrayToTableRows($langFileName, $value));
+                $rows = [...$rows, ...$this->arrayToTableRows($langFileName, $value)];
 
                 continue;
             }
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
@@ -261,7 +261,7 @@ protected function registerProperties()
 
             foreach ($properties as $property => $value) {
                 if (isset($this->{$property}) && is_array($this->{$property}) && is_array($value)) {
-                    $this->{$property} = array_merge($this->{$property}, $value);
+                    $this->{$property} = [...$this->{$property}, ...$value];
                 } else {
                     $this->{$property} = $value;
                 }
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -266,7 +266,7 @@ public static function __callStatic(string $name, array $arguments)
     public static function serviceExists(string $name): ?string
     {
         static::buildServicesCache();
-        $services = array_merge(self::$serviceNames, [Services::class]);
+        $services = [...self::$serviceNames, Services::class];
         $name     = strtolower($name);
 
         foreach ($services as $service) {
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -1094,7 +1094,7 @@ public function processIndexes(string $table): bool
         $this->fields      = $fields;
 
         if ($this->foreignKeys !== []) {
-            $sqls = array_merge($sqls, $this->_processForeignKeys($table, true));
+            $sqls = [...$sqls, ...$this->_processForeignKeys($table, true)];
         }
 
         foreach ($sqls as $sql) {
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
@@ -306,7 +306,7 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
     public function join(string $table, $cond, string $type = '', ?bool $escape = null)
     {
         if (! in_array('FULL OUTER', $this->joinTypes, true)) {
-            $this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
+            $this->joinTypes = [...$this->joinTypes, 'FULL OUTER'];
         }
 
         return parent::join($table, $cond, $type, $escape);
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
@@ -271,7 +271,7 @@ public function addForeignKey(array $foreignKeys)
             $fk[] = $obj;
         }
 
-        $this->foreignKeys = array_merge($this->foreignKeys, $fk);
+        $this->foreignKeys = [...$this->foreignKeys, ...$fk];
 
         return $this;
     }
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -326,7 +326,7 @@ protected function structureTimelineData(array $elements): array
         }
 
         // Make sure our younger siblings know their relatives, too
-        return array_merge([$element], $this->structureTimelineData($elements));
+        return [$element, ...$this->structureTimelineData($elements)];
     }
 
     /**
diff --git a/system/Email/Email.php b/system/Email/Email.php
@@ -2249,7 +2249,7 @@ protected static function substr($str, $start, $length = null)
     protected function setArchiveValues(): array
     {
         // Get property values and add anything prepped in tmpArchive
-        $this->archive = array_merge(get_object_vars($this), $this->tmpArchive);
+        $this->archive = [...get_object_vars($this), ...$this->tmpArchive];
         unset($this->archive['archive']);
 
         // Clear tmpArchive for next run
diff --git a/system/Events/Events.php b/system/Events/Events.php
@@ -91,7 +91,7 @@ public static function initialize()
             return false; // @codeCoverageIgnore
         }, $files));
 
-        static::$files = array_unique(array_merge($files, [$events]));
+        static::$files = array_unique([...$files, $events]);
 
         foreach (static::$files as $file) {
             include $file;
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
@@ -136,7 +136,7 @@ function array_flatten_with_dots(iterable $array, string $id = ''): array
             $newKey = $id . $key;
 
             if (is_array($value) && $value !== []) {
-                $flattened = array_merge($flattened, array_flatten_with_dots($value, $newKey . '.'));
+                $flattened = [...$flattened, ...array_flatten_with_dots($value, $newKey . '.')];
             } else {
                 $flattened[$newKey] = $value;
             }
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
@@ -413,7 +413,7 @@ abstract protected function _flip(string $direction);
      */
     public function text(string $text, array $options = [])
     {
-        $options                = array_merge($this->textDefaults, $options);
+        $options                = [...$this->textDefaults, ...$options];
         $options['color']       = trim($options['color'], '# ');
         $options['shadowColor'] = trim($options['shadowColor'], '# ');
 
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -390,7 +390,7 @@ public function addPlaceholder($placeholder, ?string $pattern = null): RouteColl
             $placeholder = [$placeholder => $pattern];
         }
 
-        $this->placeholders = array_merge($this->placeholders, $placeholder);
+        $this->placeholders = [...$this->placeholders, ...$placeholder];
 
         return $this;
     }
@@ -783,7 +783,7 @@ public function group(string $name, ...$params)
             if (isset($options['filter'])) {
                 // Merge filters.
                 $currentFilter     = (array) ($this->currentOptions['filter'] ?? []);
-                $options['filter'] = array_merge($currentFilter, (array) $options['filter']);
+                $options['filter'] = [...$currentFilter, ...(array) $options['filter']];
             }
 
             // Merge options other than filters.
@@ -1147,7 +1147,7 @@ public function view(string $from, string $view, ?array $options = null): RouteC
             ->render($view, $options);
 
         $routeOptions = $options ?? [];
-        $routeOptions = array_merge($routeOptions, ['view' => $view]);
+        $routeOptions = [...$routeOptions, 'view' => $view];
 
         $this->create(Method::GET, $from, $to, $routeOptions);
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -505,7 +505,7 @@ public function get(?string $key = null)
         }
 
         $userdata = [];
-        $_exclude = array_merge(['__ci_vars'], $this->getFlashKeys(), $this->getTempKeys());
+        $_exclude = ['__ci_vars', ...$this->getFlashKeys(), ...$this->getTempKeys()];
 
         $keys = array_keys($_SESSION);
 
@@ -537,7 +537,7 @@ public function has(string $key): bool
     public function push(string $key, array $data)
     {
         if ($this->has($key) && is_array($value = $this->get($key))) {
-            $this->set($key, array_merge($value, $data));
+            $this->set($key, [...$value, ...$data]);
         }
     }
 
diff --git a/system/View/Cells/Cell.php b/system/View/Cells/Cell.php
@@ -75,7 +75,7 @@ final protected function view(?string $view, array $data = []): string
     {
         $properties = $this->getPublicProperties();
         $properties = $this->includeComputedProperties($properties);
-        $properties = array_merge($properties, $data);
+        $properties = [...$properties, ...$data];
 
         $view = (string) $view;
 
diff --git a/system/View/Table.php b/system/View/Table.php
@@ -228,7 +228,7 @@ public function addRow()
             $tmpRow = array_filter($tmpRow, static fn ($k) => array_key_exists($k, $keyIndex), ARRAY_FILTER_USE_KEY);
 
             // add missing keys to row, but use $this->emptyCells
-            $tmpRow = array_merge($tmpRow, array_map(fn ($v) => ['data' => $this->emptyCells], $missingKeys));
+            $tmpRow = [...$tmpRow, ...array_map(fn ($v) => ['data' => $this->emptyCells], $missingKeys)];
 
             // order keys by $keyIndex values
             uksort($tmpRow, static fn ($k1, $k2) => $keyIndex[$k1] <=> $keyIndex[$k2]);
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
@@ -81,7 +81,7 @@ protected function makeController(array $userConfig = [], string $routePath = ''
         $headers = [
             'Accept' => 'text/html',
         ];
-        $headers = array_merge($headers, $userHeaders);
+        $headers = [...$headers, ...$userHeaders];
 
         foreach ($headers as $key => $value) {
             $this->request->setHeader($key, $value);
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
@@ -870,8 +870,8 @@ public function testGetPostSecondStreams(): void
     {
         $_GET['get']   = '3';
         $_POST['post'] = '5';
-        $this->assertSame(array_merge($_GET, $_POST), $this->request->getPostGet());
-        $this->assertSame(array_merge($_POST, $_GET), $this->request->getGetPost());
+        $this->assertSame([...$_GET, ...$_POST], $this->request->getPostGet());
+        $this->assertSame([...$_POST, ...$_GET], $this->request->getGetPost());
     }
 
     public function testGetBodyWithFalseBody(): void
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
@@ -243,11 +243,7 @@ public function testDeleteFilesHandlesRecursion(): void
 
     public function testDeleteFilesLeavesHTFiles(): void
     {
-        $structure = array_merge($this->structure, [
-            '.htaccess'  => 'Deny All',
-            'index.html' => 'foo',
-            'index.php'  => 'blah',
-        ]);
+        $structure = [...$this->structure, '.htaccess' => 'Deny All', 'index.html' => 'foo', 'index.php' => 'blah'];
 
         $vfs = vfsStream::setup('root', null, $structure);
 
@@ -265,11 +261,7 @@ public function testDeleteFilesLeavesHTFiles(): void
 
     public function testDeleteFilesIncludingHidden(): void
     {
-        $structure = array_merge($this->structure, [
-            '.htaccess'  => 'Deny All',
-            'index.html' => 'foo',
-            'index.php'  => 'blah',
-        ]);
+        $structure = [...$this->structure, '.htaccess' => 'Deny All', 'index.html' => 'foo', 'index.php' => 'blah'];
 
         $vfs = vfsStream::setup('root', null, $structure);
 
diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php
@@ -30,7 +30,7 @@ private function createRouteCollection(array $config = [], $moduleConfig = null)
             'Config' => APPPATH . 'Config',
             'App'    => APPPATH,
         ];
-        $config = array_merge($config, $defaults);
+        $config = [...$config, ...$defaults];
 
         Services::autoloader()->addNamespace($config);
 
diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php
@@ -39,7 +39,7 @@ protected function getCollector(array $config = [], array $files = [], $moduleCo
             'Config' => APPPATH . 'Config',
             'App'    => APPPATH,
         ];
-        $config = array_merge($config, $defaults);
+        $config = [...$config, ...$defaults];
 
         Services::autoloader()->addNamespace($config);
 
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
@@ -42,7 +42,7 @@ protected function getCollector(array $config = [], array $files = [], $moduleCo
             'Config' => APPPATH . 'Config',
             'App'    => APPPATH,
         ];
-        $config = array_merge($config, $defaults);
+        $config = [...$config, ...$defaults];
 
         Services::autoloader()->addNamespace($config);
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(Cache $config)`
`51`	`51`	`{`
`52`	`52`	`$this->prefix = $config->prefix;`
`53`	`53`
`54`		`- $this->config = array_merge($this->config, $config->memcached);`
	`54`	`+ $this->config = [...$this->config, ...$config->memcached];`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function __construct(Cache $config)`
`53`	`53`	`$this->prefix = $config->prefix;`
`54`	`54`
`55`	`55`	`if (isset($config->redis)) {`
`56`		`- $this->config = array_merge($this->config, $config->redis);`
	`56`	`+ $this->config = [...$this->config, ...$config->redis];`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ protected function prepare(string $class): string`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`$return = '\\' . trim($return, '\\') . '::class';`
`126`		`- $this->call('make:entity', array_merge([$baseClass], $this->params));`
	`126`	`+ $this->call('make:entity', [$baseClass, ...$this->params]);`
`127`	`127`	`} else {`
`128`	`128`	`$return = "'{$return}'";`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ protected function registerProperties()`
`261`	`261`
`262`	`262`	`foreach ($properties as $property => $value) {`
`263`	`263`	`if (isset($this->{$property}) && is_array($this->{$property}) && is_array($value)) {`
`264`		`- $this->{$property} = array_merge($this->{$property}, $value);`
	`264`	`+ $this->{$property} = [...$this->{$property}, ...$value];`
`265`	`265`	`} else {`
`266`	`266`	`$this->{$property} = $value;`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public static function __callStatic(string $name, array $arguments)`
`266`	`266`	`public static function serviceExists(string $name): ?string`
`267`	`267`	`{`
`268`	`268`	`static::buildServicesCache();`
`269`		`- $services = array_merge(self::$serviceNames, [Services::class]);`
	`269`	`+ $services = [...self::$serviceNames, Services::class];`
`270`	`270`	`$name = strtolower($name);`
`271`	`271`
`272`	`272`	`foreach ($services as $service) {`
Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ public function processIndexes(string $table): bool`
`1094`	`1094`	`$this->fields = $fields;`
`1095`	`1095`
`1096`	`1096`	`if ($this->foreignKeys !== []) {`
`1097`		`- $sqls = array_merge($sqls, $this->_processForeignKeys($table, true));`
	`1097`	`+ $sqls = [...$sqls, ...$this->_processForeignKeys($table, true)];`
`1098`	`1098`	`}`
`1099`	`1099`
`1100`	`1100`	`foreach ($sqls as $sql) {`