chore: add more trailing commas in more places

.php-cs-fixer.dist.php

@@ -40,7 +40,17 @@
     ]);
 
 $overrides = [
-    'get_class_to_class_keyword' => true,
+    'get_class_to_class_keyword'  => true,
+    'trailing_comma_in_multiline' => [
+        'after_heredoc' => true,
+        'elements'      => [
+            'arguments',
+            'array_destructuring',
+            'arrays',
+            'match',
+            'parameters',
+        ],
+    ],
 ];
 
 $options = [
@@ -55,5 +65,5 @@
 return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
     'CodeIgniter 4 framework',
     'CodeIgniter Foundation',
-    '[email protected]'
+    '[email protected]',
 );

admin/create-new-changelog.php

@@ -47,20 +47,20 @@ function replace_file_content(string $path, string $pattern, string $replace): v
 replace_file_content(
     $changelogIndex,
     '/\.\. toctree::\n    :titlesonly:\n/u',
-    ".. toctree::\n    :titlesonly:\n\n    v{$version}"
+    ".. toctree::\n    :titlesonly:\n\n    v{$version}",
 );
 // Replace {version}
 $length    = mb_strlen("Version {$version}");
 $underline = str_repeat('#', $length);
 replace_file_content(
     $changelog,
     '/#################\nVersion {version}\n#################/u',
-    "{$underline}\nVersion {$version}\n{$underline}"
+    "{$underline}\nVersion {$version}\n{$underline}",
 );
 replace_file_content(
     $changelog,
     '/{version}/u',
-    "{$version}"
+    "{$version}",
 );
 
 // Copy upgrading
@@ -72,15 +72,15 @@ function replace_file_content(string $path, string $pattern, string $replace): v
 replace_file_content(
     $upgradingIndex,
     '/    backward_compatibility_notes\n/u',
-    "    backward_compatibility_notes\n\n    upgrade_{$versionWithoutDots}"
+    "    backward_compatibility_notes\n\n    upgrade_{$versionWithoutDots}",
 );
 // Replace {version}
 $length    = mb_strlen("Upgrading from {$versionCurrent} to {$version}");
 $underline = str_repeat('#', $length);
 replace_file_content(
     $upgrading,
     '/##############################\nUpgrading from {version} to {version}\n##############################/u',
-    "{$underline}\nUpgrading from {$versionCurrent} to {$version}\n{$underline}"
+    "{$underline}\nUpgrading from {$versionCurrent} to {$version}\n{$underline}",
 );
 
 // Commits

admin/prepare-release.php

@@ -33,39 +33,39 @@ function replace_file_content(string $path, string $pattern, string $replace): v
 replace_file_content(
     './system/CodeIgniter.php',
     '/public const CI_VERSION = \'.*?\';/u',
-    "public const CI_VERSION = '{$version}';"
+    "public const CI_VERSION = '{$version}';",
 );
 
 // Updates version number in "conf.py".
 replace_file_content(
     './user_guide_src/source/conf.py',
     '/^version = \'.*?\'/mu',
-    "version = '{$minor}'"
+    "version = '{$minor}'",
 );
 replace_file_content(
     './user_guide_src/source/conf.py',
     '/^release = \'.*?\'/mu',
-    "release = '{$version}'"
+    "release = '{$version}'",
 );
 
 // Updates version number in "phpdoc.dist.xml".
 replace_file_content(
     './phpdoc.dist.xml',
     '!<title>CodeIgniter v.*? API</title>!mu',
-    "<title>CodeIgniter v{$minor} API</title>"
+    "<title>CodeIgniter v{$minor} API</title>",
 );
 replace_file_content(
     './phpdoc.dist.xml',
     '/<version number=".*?">/mu',
-    "<version number=\"{$version}\">"
+    "<version number=\"{$version}\">",
 );
 
 // Updates release date in changelogs.
 $date = date('F j, Y');
 replace_file_content(
     "./user_guide_src/source/changelogs/v{$version}.rst",
     '/^Release Date: .*/mu',
-    "Release Date: {$date}"
+    "Release Date: {$date}",
 );
 
 // Commits

admin/starter/tests/unit/HealthTest.php

@@ -32,7 +32,7 @@ public function testBaseUrlHasBeenSet(): void
             $config = new App();
             $this->assertTrue(
                 $validation->check($config->baseURL, 'valid_url'),
-                'baseURL "' . $config->baseURL . '" in .env is not valid URL'
+                'baseURL "' . $config->baseURL . '" in .env is not valid URL',
             );
         }
 
@@ -43,7 +43,7 @@ public function testBaseUrlHasBeenSet(): void
         // BaseURL in app/Config/App.php is a valid URL?
         $this->assertTrue(
             $validation->check($reader->baseURL, 'valid_url'),
-            'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL'
+            'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL',
         );
     }
 }

preload.php

@@ -86,7 +86,7 @@ public function load(): void
             $phpFiles  = new RegexIterator(
                 $fullTree,
                 '/.+((?<!Test)+\.php$)/i',
-                RecursiveRegexIterator::GET_MATCH
+                RecursiveRegexIterator::GET_MATCH,
             );
 
             foreach ($phpFiles as $key => $file) {

public/index.php

@@ -11,7 +11,7 @@
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
         $minPhpVersion,
-        PHP_VERSION
+        PHP_VERSION,
     );
 
     header('HTTP/1.1 503 Service Unavailable.', true, 503);

rector.php

@@ -62,7 +62,7 @@
     ->withCache(
         // Github action cache or local
         is_dir('/tmp') ? '/tmp/rector' : null,
-        FileCacheStorage::class
+        FileCacheStorage::class,
     )
     // paths to refactor; solid alternative to CLI arguments
     ->withPaths([

spark

@@ -40,7 +40,7 @@ if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
         $minPhpVersion,
-        PHP_VERSION
+        PHP_VERSION,
     );
 
     exit($message);

system/API/ResponseTrait.php

@@ -319,7 +319,7 @@ protected function format($data = null)
             $mime = $this->request->negotiate(
                 'media',
                 $format->getConfig()->supportedResponseFormats,
-                false
+                false,
             );
         }
 

system/Autoloader/Autoloader.php

@@ -347,7 +347,7 @@ public function sanitizeFilename(string $filename): string
 
             throw new InvalidArgumentException(
                 'The file path contains special characters "' . $chars
-                . '" that are not allowed: "' . $filename . '"'
+                . '" that are not allowed: "' . $filename . '"',
             );
         }
         if ($result === false) {
@@ -386,7 +386,7 @@ private function loadComposerNamespaces(ClassLoader $composer, array $composerPa
             throw new RuntimeException(
                 'Your Composer version is too old.'
                 . ' Please update Composer (run `composer self-update`) to v2.0.14 or later'
-                . ' and remove your vendor/ directory, and run `composer update`.'
+                . ' and remove your vendor/ directory, and run `composer update`.',
             );
         }
         // This method requires Composer 2.0.14 or later.

system/Autoloader/FileLocator.php

@@ -295,9 +295,9 @@ public function findQualifiedNameFromPath(string $path)
                         str_replace(
                             '/',
                             '\\',
-                            mb_substr($path, mb_strlen($namespace['path']))
+                            mb_substr($path, mb_strlen($namespace['path'])),
                         ),
-                        '\\'
+                        '\\',
                     );
                 // Remove the file extension (.php)
                 $className = mb_substr($className, 0, -4);

system/BaseModel.php

@@ -379,7 +379,7 @@ protected function createDataConverter(): void
             $this->converter = new DataConverter(
                 $this->casts,
                 $this->castHandlers,
-                $this->db
+                $this->db,
             );
         }
     }
@@ -1081,7 +1081,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                 if ($updateIndex === null) {
                     throw new InvalidArgumentException(
                         'The index ("' . $index . '") for updateBatch() is missing in the data: '
-                        . json_encode($row)
+                        . json_encode($row),
                     );
                 }
 

system/Boot.php

@@ -288,7 +288,7 @@ protected static function checkMissingExtensions(): void
 
         $message = sprintf(
             'The framework needs the following extension(s) installed and loaded: %s.',
-            implode(', ', $missingExtensions)
+            implode(', ', $missingExtensions),
         );
 
         header('HTTP/1.1 503 Service Unavailable.', true, 503);

system/CLI/CLI.php

@@ -610,11 +610,11 @@ public static function color(string $text, string $foreground, ?string $backgrou
             $nonColoredText = preg_replace(
                 $pattern,
                 '<<__colored_string__>>',
-                $text
+                $text,
             );
             $nonColoredChunks = preg_split(
                 '/<<__colored_string__>>/u',
-                $nonColoredText
+                $nonColoredText,
             );
 
             foreach ($nonColoredChunks as $i => $chunk) {

system/CLI/Console.php

@@ -63,7 +63,7 @@ public function showHeader(bool $suppress = false)
             'CodeIgniter v%s Command Line Tool - Server Time: %s UTC%s',
             CodeIgniter::CI_VERSION,
             date('Y-m-d H:i:s'),
-            date('P')
+            date('P'),
         ), 'green');
         CLI::newLine();
     }

system/CLI/GeneratorTrait.php

@@ -171,7 +171,7 @@ private function generateFile(string $target, string $content): void
                 CLI::prompt(
                     'Are you sure you want to continue?',
                     ['y', 'n'],
-                    'required'
+                    'required',
                 ) === 'n'
             ) {
                 CLI::newLine();
@@ -193,7 +193,7 @@ private function generateFile(string $target, string $content): void
             CLI::error(
                 lang('CLI.generator.fileExist', [clean_path($target)]),
                 'light_gray',
-                'red'
+                'red',
             );
             CLI::newLine();
 
@@ -216,7 +216,7 @@ private function generateFile(string $target, string $content): void
             CLI::error(
                 lang('CLI.generator.fileError', [clean_path($target)]),
                 'light_gray',
-                'red'
+                'red',
             );
             CLI::newLine();
 
@@ -227,7 +227,7 @@ private function generateFile(string $target, string $content): void
         if ($this->getOption('force') && $isFile) {
             CLI::write(
                 lang('CLI.generator.fileOverwrite', [clean_path($target)]),
-                'yellow'
+                'yellow',
             );
             CLI::newLine();
 
@@ -236,7 +236,7 @@ private function generateFile(string $target, string $content): void
 
         CLI::write(
             lang('CLI.generator.fileCreate', [clean_path($target)]),
-            'green'
+            'green',
         );
         CLI::newLine();
     }
@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
                 '\\',
                 array_map(
                     pascalize(...),
-                    explode('\\', str_replace('/', '\\', trim($class)))
-                )
+                    explode('\\', str_replace('/', '\\', trim($class))),
+                ),
             ),
-            '\\/'
+            '\\/',
         );
     }
 
@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
             return view(
                 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
                 $data,
-                ['debug' => false]
+                ['debug' => false],
             );
         }
     }
@@ -370,15 +370,15 @@ protected function parseTemplate(
         string $class,
         array $search = [],
         array $replace = [],
-        array $data = []
+        array $data = [],
     ): string {
         // Retrieves the namespace part from the fully qualified class name.
         $namespace = trim(
             implode(
                 '\\',
-                array_slice(explode('\\', $class), 0, -1)
+                array_slice(explode('\\', $class), 0, -1),
             ),
-            '\\'
+            '\\',
         );
         $search[]  = '<@php';
         $search[]  = '{namespace}';
@@ -404,7 +404,7 @@ protected function buildContent(string $class): string
             && preg_match(
                 '/(?P<imports>(?:^use [^;]+;$\n?)+)/m',
                 $template,
-                $match
+                $match,
             )
         ) {
             $imports = explode("\n", trim($match['imports']));
@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
             CLI::error(
                 lang('CLI.namespaceNotDefined', [$namespace]),
                 'light_gray',
-                'red'
+                'red',
             );
             CLI::newLine();
 
@@ -446,16 +446,16 @@ protected function buildPath(string $class): string
             . str_replace(
                 '\\',
                 DIRECTORY_SEPARATOR,
-                trim(str_replace($namespace . '\\', '', $class), '\\')
+                trim(str_replace($namespace . '\\', '', $class), '\\'),
             ) . '.php';
 
         return implode(
             DIRECTORY_SEPARATOR,
             array_slice(
                 explode(DIRECTORY_SEPARATOR, $file),
                 0,
-                -1
-            )
+                -1,
+            ),
         ) . DIRECTORY_SEPARATOR . $this->basename($file);
     }
 
@@ -470,9 +470,9 @@ protected function getNamespace(): string
             str_replace(
                 '/',
                 '\\',
-                $this->getOption('namespace') ?? APP_NAMESPACE
+                $this->getOption('namespace') ?? APP_NAMESPACE,
             ),
-            '\\'
+            '\\',
         );
     }