Skip to content
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.

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

4.4.8 Ready code #8719

Merged
merged 97 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
a0d20d7
docs: add missing SECURITY to v4.4.7
kenjis Mar 29, 2024
7568d9f
Merge pull request #8676 from kenjis/fix-CHANGELOG.md
kenjis Mar 29, 2024
3503b4d
Merge remote-tracking branch 'origin/master' into develop
kenjis Mar 29, 2024
b9179a9
docs: add changelog and upgrade for v4.4.8
kenjis Mar 29, 2024
5dee40b
chore: delete release branch if exists
kenjis Mar 29, 2024
1079c80
docs: small update
kenjis Mar 29, 2024
abdf2a8
docs: update OWASP TOP 10 items
kenjis Mar 23, 2024
589cf2a
docs: update from A01 to A03
kenjis Mar 28, 2024
ffce31f
docs: update from A04, A05
kenjis Mar 28, 2024
b8025ee
docs: update from A06 to A10
kenjis Mar 28, 2024
d3ed47c
docs: fix RST format
kenjis Mar 28, 2024
0ea008b
docs: break long lines
kenjis Mar 28, 2024
9c6fec3
docs: remove "content metadata"
kenjis Mar 28, 2024
c707e9a
docs: update title of link
kenjis Mar 28, 2024
f54cdde
docs: fix PHPDoc types in BaseModel
kenjis Mar 29, 2024
d272bfe
refactor: simplify ImageMagickHandler::getVersion()
paulbalandan Mar 29, 2024
7cc6a9f
Merge pull request #8677 from kenjis/docs-changelog-4.4.8
kenjis Mar 30, 2024
9b1fffe
Merge pull request #8678 from kenjis/update-prepare-release
kenjis Mar 30, 2024
2c7d445
fix: early terminate processing of invalid library path
paulbalandan Mar 29, 2024
f22b8cf
Merge pull request #8680 from paulbalandan/imagemagick-library-path
paulbalandan Mar 30, 2024
7ca24b2
Merge pull request #8681 from paulbalandan/imagemagick-getversion
paulbalandan Mar 30, 2024
24b94ee
docs: add empty line
kenjis Mar 30, 2024
c691ecb
docs: update description
kenjis Mar 30, 2024
fad2cde
docs: add spaces
kenjis Mar 30, 2024
b2a1a8a
docs: decorate argument values
kenjis Mar 30, 2024
be473e2
docs: add missing `\`
kenjis Mar 30, 2024
c729ffd
docs: replace WEBP with WebP
kenjis Mar 30, 2024
4948a28
docs: add missing "Upgrade Image Manipulation Class"
kenjis Mar 30, 2024
dd974c8
chore: realign contents of .gitattributes
paulbalandan Mar 30, 2024
3b86d09
Merge pull request #8679 from kenjis/fix-phpdoc-type-BaseModel
kenjis Mar 30, 2024
67fa536
Merge pull request #8685 from kenjis/docs-images.rst
kenjis Mar 30, 2024
50eafce
docs: add sub section titles
kenjis Mar 31, 2024
0d68190
docs: use real Exception class in sample code
kenjis Mar 31, 2024
2f6402a
docs: update sample config class
kenjis Mar 31, 2024
042a7bd
docs: update screenshot of error page
kenjis Mar 31, 2024
3ccc5b0
docs: add link to Logging page
kenjis Mar 31, 2024
55f26cd
docs: improve sample code
kenjis Mar 31, 2024
83ea16f
docs: add "" for readability
kenjis Mar 31, 2024
0d493d1
docs: add link and change paragraph order for readability
kenjis Mar 31, 2024
37931d0
docs: add missing "HTTP Status Code and Error Views"
kenjis Mar 31, 2024
e6bdf90
fix: bug that the error view is determined by Exception code
kenjis Mar 31, 2024
c65e05d
docs: move "Logging Deprecation Warnings" in section "Configuration"
kenjis Mar 31, 2024
8047699
docs: add about default error view files
kenjis Mar 31, 2024
b651344
docs: add changelog
kenjis Mar 31, 2024
b4855dd
docs: show full classnames
kenjis Mar 31, 2024
17763f3
docs: update outdated description
kenjis Mar 31, 2024
dc7e86c
Update upgrade_447.rst
mullernato Mar 31, 2024
b559dbd
docs: fix sample .htaccess
kenjis Mar 31, 2024
c6b7505
Merge pull request #8691 from mullernato/patch-1
kenjis Mar 31, 2024
13071b8
docs: fix notation for $db
kenjis Apr 1, 2024
1b97065
docs: fix RST format
kenjis Apr 1, 2024
2493142
Merge pull request #8686 from kenjis/docs-upgrade_images
kenjis Apr 2, 2024
533717c
Merge pull request #8687 from paulbalandan/gitattributes-add
kenjis Apr 2, 2024
d5660ce
Merge pull request #8688 from kenjis/improve-errors.rst
kenjis Apr 2, 2024
22db69c
Merge pull request #8689 from kenjis/fix-ExceptionHandler-determineView
kenjis Apr 2, 2024
975f121
Merge pull request #8690 from kenjis/update-transactions.rst
kenjis Apr 2, 2024
caa6080
Merge pull request #8692 from kenjis/docs-running-add-htaccess
kenjis Apr 2, 2024
c96dc6d
Merge pull request #8694 from kenjis/docs-db-metadata.rst
kenjis Apr 2, 2024
04483e3
docs: update descriptions
kenjis Apr 3, 2024
8ed690e
chore: remove useless @return BaseConnection|ConnectionInterface on B…
samsonasik Apr 3, 2024
a2802a6
update to @return BaseConnection
samsonasik Apr 3, 2024
518b912
Merge pull request #8701 from samsonasik/chore-return-doc
samsonasik Apr 3, 2024
98ce544
fix: Pager::only([]) does not work
kenjis Apr 3, 2024
22f4c38
chore: remove ignoreErrors
kenjis Apr 3, 2024
0987c9a
chore: [Rector] Apply ExplicitBoolCompareRector
samsonasik Apr 3, 2024
f005318
Merge pull request #8652 from kenjis/docs-update-security.rst
kenjis Apr 3, 2024
a7ab6c2
docs: add sub section OWASP Top 10 2021
kenjis Mar 28, 2024
24089a3
docs: add "OWASP API Security Top 10 2023"
kenjis Mar 28, 2024
9bf27a1
Merge pull request #8700 from kenjis/update-set-current-locale
kenjis Apr 3, 2024
ea56ea2
docs: fix PHPDoc types in Database
kenjis Apr 3, 2024
bf3677c
refactor: remove unneeded code
kenjis Apr 3, 2024
f1d6b1b
style: fix indentations
kenjis Apr 4, 2024
78afe57
docs: add escaping to variables
kenjis Apr 4, 2024
ec84410
docs: add "// ..." to sample code
kenjis Apr 4, 2024
e2ac94a
docs: update @var types
kenjis Apr 4, 2024
0d84ce8
docs: update return type
Pebryan354 Apr 4, 2024
1455e8d
remove !== "0" check
samsonasik Apr 4, 2024
57c0c5a
Merge pull request #8704 from samsonasik/rector-explicit-bool
samsonasik Apr 4, 2024
e2ccc91
add: return type int & float
Pebryan354 Apr 5, 2024
289cd96
Merge pull request #8702 from kenjis/fix-pager-only-empty
kenjis Apr 5, 2024
07e3999
Merge pull request #8703 from kenjis/fix-PHPDoc-types-in-Database
kenjis Apr 5, 2024
716d362
Update system/Database/BaseResult.php
Pebryan354 Apr 5, 2024
d6347e6
apply suggestion
Pebryan354 Apr 5, 2024
1f6baa0
Merge pull request #8708 from kenjis/fix-var-in-BaseModel
kenjis Apr 5, 2024
35809c5
Merge pull request #8707 from kenjis/update-model-event-sample
kenjis Apr 5, 2024
ea22788
Merge pull request #8706 from kenjis/fix-docs-alternative_php-sample
kenjis Apr 5, 2024
2a3794a
Merge pull request #8705 from kenjis/update-htaccess
kenjis Apr 5, 2024
a5d4f7a
Merge pull request #8709 from Pebryan354/Pebryan354/update-return-type
kenjis Apr 5, 2024
88b6fb9
chore(deps-dev): update rector/rector requirement from 1.0.3 to 1.0.4
dependabot[bot] Apr 5, 2024
5c00ca8
Merge pull request #8714 from codeigniter4/dependabot/composer/rector…
samsonasik Apr 5, 2024
e05781b
Merge pull request #8669 from kenjis/docs-security-top10-api
kenjis Apr 5, 2024
f9ed5a6
docs: fix @param types
kenjis Apr 6, 2024
a1e5d64
docs: make CI3 notation consistent
kenjis Apr 6, 2024
3bfe413
Merge pull request #8717 from kenjis/docs-CI3-notation
kenjis Apr 6, 2024
d8ee64b
Merge pull request #8716 from kenjis/docs-fix-UploadedFile-types
kenjis Apr 6, 2024
00a15fc
Prep for 4.4.8 release
kenjis Apr 6, 2024
796cb8e
Merge pull request #8718 from kenjis/release-4.4.8
kenjis Apr 7, 2024
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
44 changes: 23 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,33 @@

# git files
.gitattributes export-ignore
.gitignore export-ignore
.gitignore export-ignore

# Don't give admin files
.github/ export-ignore
admin/ export-ignore
contributing/ export-ignore
.editorconfig export-ignore
.nojekyll export-ignore
# admin files
.github/ export-ignore
admin/ export-ignore
contributing/ export-ignore
.editorconfig export-ignore
CODE_OF_CONDUCT.md export-ignore
CONTRIBUTING.md export-ignore
CONTRIBUTING.md export-ignore

# They don't want our test files
tests/AutoReview/ export-ignore
tests/system/ export-ignore
utils/ export-ignore
deptrac.yaml export-ignore
rector.php export-ignore
phpunit.xml.dist export-ignore
phpstan-baseline.neon.dist export-ignore
phpstan.neon.dist export-ignore
phpstan-bootstrap.php export-ignore
.php-cs-fixer.dist.php export-ignore
.php-cs-fixer.no-header.php export-ignore
# contributor/development files
tests/ export-ignore
utils/ export-ignore
.php-cs-fixer.dist.php export-ignore
.php-cs-fixer.no-header.php export-ignore
.php-cs-fixer.user-guide.php export-ignore
deptrac.yaml export-ignore
phpstan-baseline.neon.dist export-ignore
phpstan-bootstrap.php export-ignore
phpstan.neon.dist export-ignore
phpunit.xml.dist export-ignore
psalm_autoload.php export-ignore
psalm-baseline.php export-ignore
psalm.xml export-ignore
rector.php export-ignore

# The source user guide, either
# source user guide
user_guide_src/ export-ignore
.nojekyll export-ignore
phpdoc.dist.xml export-ignore
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,37 @@
# Changelog

## [v4.4.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.8) (2024-04-07)
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.7...v4.4.8)

### Fixed Bugs

* fix: [ImageMagickHandler] early terminate processing of invalid library path by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8680
* docs: fix PHPDoc types in BaseModel by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8679
* fix: the error view is determined by Exception code by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8689
* fix: `Pager::only([])` does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8702
* refactor: remove unneeded code in SQLite3\Table and fix PHPDoc types in Database by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8703
* docs: fix return type in BaseResult by @Pebryan354 in https://github.com/codeigniter4/CodeIgniter4/pull/8709

### Refactoring

* refactor: simplify ImageMagickHandler::getVersion() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8681
* refactor: [Rector] Apply ExplicitBoolCompareRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/8704

## [v4.4.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.7) (2024-03-29)
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.6...v4.4.7)

### SECURITY

* **Language:** *Language class DoS Vulnerability* was fixed. See the
[Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-39fp-mqmm-gxj6)
for more information.
* **URI Security:** The feature to check if URIs do not contain not permitted
strings has been added. This check is equivalent to the URI Security found in
CodeIgniter 3. This is enabled by default, but upgraded users need to add
a setting to enable it.
* **Filters:** A bug where URI paths processed by Filters were not URL-decoded
has been fixed.

### Breaking Changes
* fix: Time::difference() DST bug by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8661

Expand Down
10 changes: 5 additions & 5 deletions admin/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Work off direct clones of the repos so the release branches persist for a time.
> generating much new content.

* [ ] Replace **CHANGELOG.md** with the new version generated above
* [ ] Update **user_guide_src/source/changelogs/{version}.rst**
* [ ] Update **user_guide_src/source/changelogs/v4.x.x.rst**
* Remove the section titles that have no items
* [ ] Update **user_guide_src/source/installation/upgrade_{ver}.rst**
* fill in the "All Changes" section, and add it to **upgrading.rst**
Expand Down Expand Up @@ -150,10 +150,10 @@ Work off direct clones of the repos so the release branches persist for a time.
composer test && composer info codeigniter4/framework
```
* [ ] Verify that the user guide actions succeeded:
* "[Deploy Distributable Repos](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/deploy-distributables.yml)", the main repo
* "[Deploy Production](https://github.com/codeigniter4/userguide/actions/workflows/deploy.yml)", UG repo
* "[pages-build-deployment](https://github.com/codeigniter4/userguide/actions/workflows/pages/pages-build-deployment)", UG repo
* Check if "CodeIgniter4.x.x.epub" is added to UG repo. "CodeIgniter.epub" was
* [ ] "[Deploy Distributable Repos](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/deploy-distributables.yml)", the main repo
* [ ] "[Deploy Production](https://github.com/codeigniter4/userguide/actions/workflows/deploy.yml)", UG repo
* [ ] "[pages-build-deployment](https://github.com/codeigniter4/userguide/actions/workflows/pages/pages-build-deployment)", UG repo
* [ ] Check if "CodeIgniter4.x.x.epub" is added to UG repo. "CodeIgniter.epub" was
created when v4.3.8 was released.
* [ ] Fast-forward `develop` branch to catch the merge commit from `master`
```console
Expand Down
1 change: 1 addition & 0 deletions admin/prepare-release.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function replace_file_content(string $path, string $pattern, string $replace): v

// Creates a branch for release.
system('git switch develop');
system('git branch -D release-' . $version);
system('git switch -c release-' . $version);

// Updates version number in "CodeIgniter.php".
Expand Down
4 changes: 2 additions & 2 deletions app/.htaccess
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<IfModule authz_core_module>
Require all denied
Require all denied
</IfModule>
<IfModule !authz_core_module>
Deny from all
Deny from all
</IfModule>
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"phpunit/phpcov": "^8.2",
"phpunit/phpunit": "^9.1",
"predis/predis": "^1.1 || ^2.0",
"rector/rector": "1.0.3",
"rector/rector": "1.0.4",
"vimeo/psalm": "^5.0"
},
"replace": {
Expand Down
2 changes: 1 addition & 1 deletion phpdoc.dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<output>api/build/</output>
<cache>api/cache/</cache>
</paths>
<version number="4.4.7">
<version number="4.4.8">
<api format="php">
<source dsn=".">
<path>system</path>
Expand Down
Loading
Loading