chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulbalandan merged 4 commits into from
Jan 13, 2025
Merged

chore: add more trailing commas in more places #9395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
160b0f6
Apply to parameters
paulbalandan Jan 10, 2025
5a2cb7d
Apply to array destructuring
paulbalandan Jan 10, 2025
61b4024
Apply to match
paulbalandan Jan 10, 2025
d9fae2d
Apply for arguments
paulbalandan Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.
],
],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
'CodeIgniter 4 framework',
'CodeIgniter Foundation',
'admin@codeigniter.com'
'admin@codeigniter.com',
);
10 changes: 5 additions & 5 deletions admin/create-new-changelog.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down
12 changes: 6 additions & 6 deletions admin/prepare-release.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
4 changes: 2 additions & 2 deletions admin/starter/tests/unit/HealthTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
);
}

Expand All@@ -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',
);
}
}
2 changes: 1 addition & 1 deletion preload.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion public/index.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion rector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down
2 changes: 1 addition & 1 deletion spark
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion system/API/ResponseTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
$mime = $this->request->negotiate(
'media',
$format->getConfig()->supportedResponseFormats,
false
false,
);
}

Expand Down
4 changes: 2 additions & 2 deletions system/Autoloader/Autoloader.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions system/Autoloader/FileLocator.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions system/BaseModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
$this->converter = new DataConverter(
$this->casts,
$this->castHandlers,
$this->db
$this->db,
);
}
}
Expand DownExpand Up@@ -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),
);
}

Expand Down
2 changes: 1 addition & 1 deletion system/Boot.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions system/CLI/CLI.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion system/CLI/Console.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
}
Expand Down
38 changes: 19 additions & 19 deletions system/CLI/GeneratorTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
}
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
'\\',
array_map(
pascalize(...),
explode('\\', str_replace('/', '\\', trim($class)))
)
explode('\\', str_replace('/', '\\', trim($class))),
),
),
'\\/'
'\\/',
);
}

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
return view(
"CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
$data,
['debug' => false]
['debug' => false],
);
}
}
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
CLI::error(
lang('CLI.namespaceNotDefined', [$namespace]),
'light_gray',
'red'
'red',
);
CLI::newLine();

Expand All@@ -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);
}

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
str_replace(
'/',
'\\',
$this->getOption('namespace') ?? APP_NAMESPACE
$this->getOption('namespace') ?? APP_NAMESPACE,
),
'\\'
'\\',
);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore: add more trailing commas in more places#9395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 4 commits into

from

Jan 13, 2025
 Merged


chore: add more trailing commas in more places
#9395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
160b0f6

Apply to parameters


paulbalandan Jan 10, 2025
5a2cb7d

Apply to array destructuring


paulbalandan Jan 10, 2025
61b4024

Apply to match


paulbalandan Jan 10, 2025
d9fae2d

Apply for arguments


paulbalandan Jan 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 12 additions & 2 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Comment thread
samsonasik marked this conversation as resolved.

 ],
 ],
];

$options = [
Expand All@@ -55,5 +65,5 @@
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
 'CodeIgniter 4 framework',
 'CodeIgniter Foundation',
 'admin@codeigniter.com'
 'admin@codeigniter.com',
);

10 changes: 5 additions & 5 deletions
admin/create-new-changelog.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand Down

12 changes: 6 additions & 6 deletions
admin/prepare-release.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
 );
 }

Expand All@@ -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',
 );
 }
}

2 changes: 1 addition & 1 deletion
preload.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
public/index.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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([
Expand Down

2 changes: 1 addition & 1 deletion
spark

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,7 +319,7 @@ protected function format($data = null)
 $mime = $this->request->negotiate(
 'media',
 $format->getConfig()->supportedResponseFormats,
 false
 false,
 );
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/Autoloader.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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.
Expand Down

4 changes: 2 additions & 2 deletions
system/Autoloader/FileLocator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,7 @@ protected function createDataConverter(): void
 $this->converter = new DataConverter(
 $this->casts,
 $this->castHandlers,
 $this->db
 $this->db,
 );
 }
 }
Expand DownExpand Up@@ -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),
 );
 }

Expand Down

2 changes: 1 addition & 1 deletion
system/Boot.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

2 changes: 1 addition & 1 deletion
system/CLI/Console.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
 }
Expand Down

38 changes: 19 additions & 19 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();

Expand All@@ -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();
 }
Expand DownExpand Up@@ -326,10 +326,10 @@ private function normalizeInputClassName(): string
 '\\',
 array_map(
 pascalize(...),
 explode('\\', str_replace('/', '\\', trim($class)))
 )
 explode('\\', str_replace('/', '\\', trim($class))),
 ),
 ),
 '\\/'
 '\\/',
 );
 }

Expand All@@ -351,7 +351,7 @@ protected function renderTemplate(array $data = []): string
 return view(
 "CodeIgniter\\Commands\\Generators\\Views\\{$this->template}",
 $data,
 ['debug' => false]
 ['debug' => false],
 );
 }
 }
Expand All@@ -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}';
Expand All@@ -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']));
Expand DownExpand Up@@ -432,7 +432,7 @@ protected function buildPath(string $class): string
 CLI::error(
 lang('CLI.namespaceNotDefined', [$namespace]),
 'light_gray',
 'red'
 'red',
 );
 CLI::newLine();

Expand All@@ -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);
 }

Expand All@@ -470,9 +470,9 @@ protected function getNamespace(): string
 str_replace(
 '/',
 '\\',
 $this->getOption('namespace') ?? APP_NAMESPACE
 $this->getOption('namespace') ?? APP_NAMESPACE,
 ),
 '\\'
 '\\',
 );
 }

Expand Down
Loading