diff --git a/CHANGELOG.md b/CHANGELOG.md index 17a336c0b59f..950e98a70f0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [v4.2.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.3) (2022-08-06) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.2...v4.2.3) + +* SECURITY: Improve CSRF protection (for Shield CSRF security fix) + ## [v4.2.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.2) (2022-08-05) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.1...v4.2.2) diff --git a/admin/RELEASE.md b/admin/RELEASE.md index 47e553e6d2e0..3448c3e72926 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -2,7 +2,7 @@ > Documentation guide based on the releases of `4.0.5` and `4.1.0` on January 31, 2021. > -> Updated for `4.1.6` on December 24, 2021. +> Updated for `4.2.3` on August 6, 2022. > > -MGatner @@ -29,8 +29,9 @@ git clone git@github.com:codeigniter4/CodeIgniter4.git git clone git@github.com:codeigniter4/userguide.git ``` * Vet the **admin/** folders for any removed hidden files (Action deploy scripts *do not remove these*) +* Merge any Security Advisory PRs in private forks -## CodeIgniter4 +## Process > Note: Most changes that need noting in the User Guide and docs should have been included > with their PR, so this process assumes you will not be generating much new content. @@ -75,6 +76,7 @@ composer create-project codeigniter4/appstarter release-test cd release-test composer test && composer info codeigniter4/framework ``` +* publish any Security Advisories that were resolved from private forks ## User Guide diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 7dbfbc8e5705..285576f4352a 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -47,7 +47,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.2.2'; + public const CI_VERSION = '4.2.3'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index cae666d86e56..bcb0792d2ed4 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.2.4 v4.2.3 v4.2.2 v4.2.1 diff --git a/user_guide_src/source/changelogs/v4.2.3.rst b/user_guide_src/source/changelogs/v4.2.3.rst index 83fd15df2924..cfa036fd69b8 100644 --- a/user_guide_src/source/changelogs/v4.2.3.rst +++ b/user_guide_src/source/changelogs/v4.2.3.rst @@ -1,7 +1,7 @@ Version 4.2.3 ############# -Release Date: Unreleased +Release Date: August 6, 2022 **4.2.3 release of CodeIgniter4** diff --git a/user_guide_src/source/changelogs/v4.2.4.rst b/user_guide_src/source/changelogs/v4.2.4.rst new file mode 100644 index 000000000000..c6ffb56dba7c --- /dev/null +++ b/user_guide_src/source/changelogs/v4.2.4.rst @@ -0,0 +1,35 @@ +Version 4.2.4 +############# + +Release Date: Unreleased + +**4.2.4 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 2 + +BREAKING +******** + +none. + +Enhancements +************ + +none. + +Changes +******* + +none. + +Deprecations +************ + +none. + +Bugs Fixed +********** + +See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 35d868a4ff49..6282570cfdb8 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -24,7 +24,7 @@ version = '4.2' # The full version, including alpha/beta/rc tags. -release = '4.2.2' +release = '4.2.3' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_423.rst b/user_guide_src/source/installation/upgrade_423.rst new file mode 100644 index 000000000000..68cb3be6f51e --- /dev/null +++ b/user_guide_src/source/installation/upgrade_423.rst @@ -0,0 +1,5 @@ +############################# +Upgrading from 4.2.2 to 4.2.3 +############################# + +Version ``4.2.3`` is an internal change for security measures and requires no intervention in projects.