Skip to content

Commit 9b27444

Browse files
authored
Merge pull request #8997 from codeigniter4/develop
4.5.3 Ready code
2 parents 9c2ba1f + 3c2b914 commit 9b27444

Some content is hidden

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

56 files changed

+3709
-197
lines changed

.github/scripts/deploy-userguide

+20-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,26 @@
66
SOURCE=$1
77
TARGET=$2
88
RELEASE=$3
9-
VERSION=`echo "$RELEASE" | cut -c 2-`
9+
10+
# Check if RELEASE is empty
11+
if [ -z "$RELEASE" ]; then
12+
echo "Error: \$RELEASE parameter is empty."
13+
exit 1
14+
fi
15+
16+
VERSION=$(echo "$RELEASE" | cut -c 2-)
17+
18+
# Check if VERSION is empty
19+
if [ -z "$VERSION" ]; then
20+
echo "Error: Failed to extract \$VERSION from \$RELEASE parameter '$RELEASE'."
21+
exit 1
22+
fi
23+
24+
# Check if VERSION matches the format X.Y.Z
25+
if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
26+
echo "Error: VERSION '$VERSION' does not match the expected format X.Y.Z."
27+
exit 1
28+
fi
1029

1130
echo "Preparing for version $3"
1231
echo "Merging files from $1 to $2"

.github/workflows/deploy-apidocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Build API in source repo
6262
working-directory: source
6363
run: |
64-
php tools/phpDocumentor run --ansi --verbose
64+
php tools/phpDocumentor --ansi --verbose
6565
cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
6666
6767
- name: Deploy to API repo

CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# Changelog
22

3+
## [v4.5.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.3) (2024-06-25)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.2...v4.5.3)
5+
6+
### Fixed Bugs
7+
8+
* fix: `RedisHandler::deleteMatching()` not deleting matching keys if cache prefix is used by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8952
9+
* fix: TypeError in DefinedRouteCollector::collect() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8957
10+
* fix: `migrate:rollback -b` does not work due to TypeError by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8958
11+
* fix: [Validation] `if_exist` does not work with array data by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8959
12+
* chore: add `Config` namespace to appstarter autoload.psr4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8963
13+
* fix: `spark routes` may show BadRequestException when a route has a regexp by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8974
14+
* docs: fix incorrect description for route group filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8978
15+
* fix: return and param types of BaseConnection by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8983
16+
* fix: precedence of command classes with the same `$name` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8898
17+
* fix: [OCI8] if conditions to build DSN by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8986
18+
* fix: [Auto Routing Improved] Default Method Fallback does not work with `$translateUriToCamelCase` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8980
19+
* fix: `command()` may execute `rewrite.php` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8995
20+
21+
### Refactoring
22+
23+
* refactor: BaseBuilder::orderBy() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8970
24+
* refactor: using phpunit 10 assertObjectHasNotProperty() and assertObjectHasProperty() by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/8991
25+
326
## [v4.5.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.2) (2024-06-10)
427
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.1...v4.5.2)
528

admin/starter/composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
},
2121
"autoload": {
2222
"psr-4": {
23-
"App\\": "app/"
23+
"App\\": "app/",
24+
"Config\\": "app/Config"
2425
},
2526
"exclude-from-classmap": [
2627
"**/Database/Migrations/**"

composer.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"phpunit/phpcov": "^9.0.2",
3333
"phpunit/phpunit": "^10.5.16",
3434
"predis/predis": "^1.1 || ^2.0",
35-
"rector/rector": "1.1.0",
35+
"rector/rector": "1.1.1",
3636
"vimeo/psalm": "^5.0"
3737
},
3838
"replace": {
@@ -64,7 +64,9 @@
6464
"CodeIgniter\\": "system/"
6565
},
6666
"exclude-from-classmap": [
67-
"**/Database/Migrations/**"
67+
"**/Database/Migrations/**",
68+
"system/ThirdParty/**",
69+
"tests/system/Config/fixtures/**"
6870
]
6971
},
7072
"autoload-dev": {

phpdoc.dist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<output>api/build/</output>
1111
<cache>api/cache/</cache>
1212
</paths>
13-
<version number="4.5.2">
13+
<version number="4.5.3">
1414
<api format="php">
1515
<source dsn=".">
1616
<path>system</path>

0 commit comments

Comments
 (0)