Skip to content

Commit

Permalink
Merge pull request #8719 from codeigniter4/develop
Browse files Browse the repository at this point in the history
4.4.8 Ready code
  • Loading branch information
kenjis authored Apr 7, 2024
2 parents fd3da67 + 796cb8e commit e134990
Show file tree
Hide file tree
Showing 107 changed files with 1,453 additions and 742 deletions.
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

0 comments on commit e134990

Please sign in to comment.