Skip to content

Commit 797d377

Browse files
paulbalandanpaulbalandan
committed
Merge branch 'develop' into 4.6
2 parents f67bc68 + c3ac0f9 commit 797d377

File tree

303 files changed

+1129
-1256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+1129
-1256
lines changed

‎.github/mergeable.yml

+22-29
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,33 @@
22

33
version: 2
44
mergeable:
5-
- when: issues.opened
5+
- when: issues.opened, issues.reopened
66
validate:
7-
- do: description
8-
and:
9-
- must_include:
10-
regex: '^### PHP Version'
11-
- must_include:
12-
regex: '^### CodeIgniter4 Version'
13-
- do: author
14-
and:
15-
- must_exclude:
16-
regex: 'kenjis'
17-
- must_exclude:
18-
regex: 'lonnieezell'
19-
- must_exclude:
20-
regex: 'MGatner'
21-
- must_exclude:
22-
regex: 'michalsn'
23-
- must_exclude:
24-
regex: 'paulbalandan'
25-
- must_exclude:
26-
regex: 'samsonasik'
7+
- do: or
8+
validate:
9+
- do: and
10+
validate:
11+
- do: description
12+
must_include:
13+
regex: '### PHP Version'
14+
- do: description
15+
must_include:
16+
regex: '### CodeIgniter Version'
17+
- do: author
18+
must_include:
19+
regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik$
2720
fail:
2821
- do: comment
29-
payload: |
30-
Hi there! :wave:
22+
payload:
23+
body: |
24+
Hi there, @@author! :wave:
3125
32-
It looks like you opened an issue without following the bug report template:
26+
It looks like you opened an issue without following the bug report template:
3327
34-
Bug report ([open an issue](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+))
28+
* Bug report ([open an issue](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+))
29+
* For feature request or support question, please use the [forums](https://forum.codeigniter.com/forum-30.html).
3530
36-
If you are opening a feature request or support question, please do so in the [forums](https://forum.codeigniter.com/forum-30.html).
31+
The current issue will be closed. This is a precaution to save maintainers' time, I hope you'll understand.
3732
38-
The current issue will be closed. This is a precaution to save maintainers' time, I hope you'll understand.
39-
40-
Sincerely, the mergeable bot 🤖
33+
Sincerely, the mergeable bot 🤖
4134
- do: close

‎.php-cs-fixer.dist.php

+14-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,19 @@
3939
__DIR__ . '/spark',
4040
]);
4141

42-
$overrides = [];
42+
$overrides = [
43+
'get_class_to_class_keyword' => true,
44+
'trailing_comma_in_multiline' => [
45+
'after_heredoc' => true,
46+
'elements' => [
47+
'arguments',
48+
'array_destructuring',
49+
'arrays',
50+
'match',
51+
'parameters',
52+
],
53+
],
54+
];
4355

4456
$options = [
4557
'cacheFile' => 'build/.php-cs-fixer.cache',
@@ -53,5 +65,5 @@
5365
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
5466
'CodeIgniter 4 framework',
5567
'CodeIgniter Foundation',
56-
'[email protected]'
68+
'[email protected]',
5769
);

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2014-2019 British Columbia Institute of Technology
4-
Copyright (c) 2019-2024 CodeIgniter Foundation
4+
Copyright (c) 2019-present CodeIgniter Foundation
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎admin/create-new-changelog.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ function replace_file_content(string $path, string $pattern, string $replace): v
4747
replace_file_content(
4848
$changelogIndex,
4949
'/\.\. toctree::\n :titlesonly:\n/u',
50-
".. toctree::\n :titlesonly:\n\n v{$version}"
50+
".. toctree::\n :titlesonly:\n\n v{$version}",
5151
);
5252
// Replace {version}
5353
$length = mb_strlen("Version {$version}");
5454
$underline = str_repeat('#', $length);
5555
replace_file_content(
5656
$changelog,
5757
'/#################\nVersion {version}\n#################/u',
58-
"{$underline}\nVersion {$version}\n{$underline}"
58+
"{$underline}\nVersion {$version}\n{$underline}",
5959
);
6060
replace_file_content(
6161
$changelog,
6262
'/{version}/u',
63-
"{$version}"
63+
"{$version}",
6464
);
6565

6666
// Copy upgrading
@@ -72,15 +72,15 @@ function replace_file_content(string $path, string $pattern, string $replace): v
7272
replace_file_content(
7373
$upgradingIndex,
7474
'/ backward_compatibility_notes\n/u',
75-
" backward_compatibility_notes\n\n upgrade_{$versionWithoutDots}"
75+
" backward_compatibility_notes\n\n upgrade_{$versionWithoutDots}",
7676
);
7777
// Replace {version}
7878
$length = mb_strlen("Upgrading from {$versionCurrent} to {$version}");
7979
$underline = str_repeat('#', $length);
8080
replace_file_content(
8181
$upgrading,
8282
'/##############################\nUpgrading from {version} to {version}\n##############################/u',
83-
"{$underline}\nUpgrading from {$versionCurrent} to {$version}\n{$underline}"
83+
"{$underline}\nUpgrading from {$versionCurrent} to {$version}\n{$underline}",
8484
);
8585

8686
// Commits

‎admin/prepare-release.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,39 @@ function replace_file_content(string $path, string $pattern, string $replace): v
3333
replace_file_content(
3434
'./system/CodeIgniter.php',
3535
'/public const CI_VERSION = \'.*?\';/u',
36-
"public const CI_VERSION = '{$version}';"
36+
"public const CI_VERSION = '{$version}';",
3737
);
3838

3939
// Updates version number in "conf.py".
4040
replace_file_content(
4141
'./user_guide_src/source/conf.py',
4242
'/^version = \'.*?\'/mu',
43-
"version = '{$minor}'"
43+
"version = '{$minor}'",
4444
);
4545
replace_file_content(
4646
'./user_guide_src/source/conf.py',
4747
'/^release = \'.*?\'/mu',
48-
"release = '{$version}'"
48+
"release = '{$version}'",
4949
);
5050

5151
// Updates version number in "phpdoc.dist.xml".
5252
replace_file_content(
5353
'./phpdoc.dist.xml',
5454
'!<title>CodeIgniter v.*? API</title>!mu',
55-
"<title>CodeIgniter v{$minor} API</title>"
55+
"<title>CodeIgniter v{$minor} API</title>",
5656
);
5757
replace_file_content(
5858
'./phpdoc.dist.xml',
5959
'/<version number=".*?">/mu',
60-
"<version number=\"{$version}\">"
60+
"<version number=\"{$version}\">",
6161
);
6262

6363
// Updates release date in changelogs.
6464
$date = date('F j, Y');
6565
replace_file_content(
6666
"./user_guide_src/source/changelogs/v{$version}.rst",
6767
'/^Release Date: .*/mu',
68-
"Release Date: {$date}"
68+
"Release Date: {$date}",
6969
);
7070

7171
// Commits

‎admin/starter/tests/unit/HealthTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testBaseUrlHasBeenSet(): void
3232
$config = new App();
3333
$this->assertTrue(
3434
$validation->check($config->baseURL, 'valid_url'),
35-
'baseURL "' . $config->baseURL . '" in .env is not valid URL'
35+
'baseURL "' . $config->baseURL . '" in .env is not valid URL',
3636
);
3737
}
3838

@@ -43,7 +43,7 @@ public function testBaseUrlHasBeenSet(): void
4343
// BaseURL in app/Config/App.php is a valid URL?
4444
$this->assertTrue(
4545
$validation->check($reader->baseURL, 'valid_url'),
46-
'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL'
46+
'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL',
4747
);
4848
}
4949
}

‎preload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function load(): void
8686
$phpFiles = new RegexIterator(
8787
$fullTree,
8888
'/.+((?<!Test)+\.php$)/i',
89-
RecursiveRegexIterator::GET_MATCH
89+
RecursiveRegexIterator::GET_MATCH,
9090
);
9191

9292
foreach ($phpFiles as $key => $file) {

‎public/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$message = sprintf(
1212
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
1313
$minPhpVersion,
14-
PHP_VERSION
14+
PHP_VERSION,
1515
);
1616

1717
header('HTTP/1.1 503 Service Unavailable.', true, 503);

‎rector.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
->withCache(
6262
// Github action cache or local
6363
is_dir('/tmp') ? '/tmp/rector' : null,
64-
FileCacheStorage::class
64+
FileCacheStorage::class,
6565
)
6666
// paths to refactor; solid alternative to CLI arguments
6767
->withPaths([

‎spark

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
4040
$message = sprintf(
4141
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
4242
$minPhpVersion,
43-
PHP_VERSION
43+
PHP_VERSION,
4444
);
4545

4646
exit($message);

‎system/API/ResponseTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ protected function format($data = null)
307307
$mime = $this->request->negotiate(
308308
'media',
309309
$format->getConfig()->supportedResponseFormats,
310-
false
310+
false,
311311
);
312312
}
313313

‎system/Autoloader/Autoloader.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public function sanitizeFilename(string $filename): string
347347

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

‎system/Autoloader/FileLocator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ public function findQualifiedNameFromPath(string $path)
295295
str_replace(
296296
'/',
297297
'\\',
298-
mb_substr($path, mb_strlen($namespace['path']))
298+
mb_substr($path, mb_strlen($namespace['path'])),
299299
),
300-
'\\'
300+
'\\',
301301
);
302302
// Remove the file extension (.php)
303303
$className = mb_substr($className, 0, -4);

‎system/BaseModel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ protected function createDataConverter(): void
379379
$this->converter = new DataConverter(
380380
$this->casts,
381381
$this->castHandlers,
382-
$this->db
382+
$this->db,
383383
);
384384
}
385385
}
@@ -1081,7 +1081,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
10811081
if ($updateIndex === null) {
10821082
throw new InvalidArgumentException(
10831083
'The index ("' . $index . '") for updateBatch() is missing in the data: '
1084-
. json_encode($row)
1084+
. json_encode($row),
10851085
);
10861086
}
10871087

‎system/Boot.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ protected static function checkMissingExtensions(): void
288288

289289
$message = sprintf(
290290
'The framework needs the following extension(s) installed and loaded: %s.',
291-
implode(', ', $missingExtensions)
291+
implode(', ', $missingExtensions),
292292
);
293293

294294
header('HTTP/1.1 503 Service Unavailable.', true, 503);

‎system/CLI/CLI.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -610,11 +610,11 @@ public static function color(string $text, string $foreground, ?string $backgrou
610610
$nonColoredText = preg_replace(
611611
$pattern,
612612
'<<__colored_string__>>',
613-
$text
613+
$text,
614614
);
615615
$nonColoredChunks = preg_split(
616616
'/<<__colored_string__>>/u',
617-
$nonColoredText
617+
$nonColoredText,
618618
);
619619

620620
foreach ($nonColoredChunks as $i => $chunk) {

‎system/CLI/Console.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function showHeader(bool $suppress = false)
6363
'CodeIgniter v%s Command Line Tool - Server Time: %s UTC%s',
6464
CodeIgniter::CI_VERSION,
6565
date('Y-m-d H:i:s'),
66-
date('P')
66+
date('P'),
6767
), 'green');
6868
CLI::newLine();
6969
}

0 commit comments

Comments
 (0)