Merge branch 'master' into develop

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [v4.1.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.4) (2021-09-06)
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+[CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) (based on PSR-12).
+
+*Note: Full changelog forthcoming.*
+
 ## [v4.1.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.3) (2021-06-06)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.2...v4.1.3)

system/CodeIgniter.php

@@ -44,7 +44,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.3';
+    public const CI_VERSION = '4.1.4';
 
     private const MIN_PHP_VERSION = '7.3';
 

user_guide_src/source/changelogs/v4.1.4.rst

@@ -1,10 +1,13 @@
 Version 4.1.4
 =============
 
-Release Date: Not released
+Release Date: September 6, 2021
 
 **4.1.4 release of CodeIgniter4**
 
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
 Breaking Changes:
 
 - The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:

user_guide_src/source/conf.py

@@ -24,7 +24,7 @@ copyright = '2019-2021 CodeIgniter Foundation'
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.3'
+release = '4.1.4'
 
 # -- General configuration ---------------------------------------------------
 

user_guide_src/source/installation/upgrade_414.rst

@@ -0,0 +1,95 @@
+#############################
+Upgrading from 4.1.3 to 4.1.4
+#############################
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
+**Method Scope**
+
+The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses.
+If you relied on any of these methods being public (highly unlikely) adjust your code accordingly::
+
+* ``CodeIgniter\Database\MySQLi\Connection::execute()``
+* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+* ``CodeIgniter\Database\Postgre\Connection::execute()``
+* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLite3\Connection::execute()``
+* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+
+Project Files
+=============
+
+Numerous files in the project space (root, app, public, writable) received updates. Due to
+these files being outside of the system scope they will not be changed without your intervention.
+There are some third-party CodeIgniter modules available to assist with merging changes to
+the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+Content Changes
+---------------
+
+The following files received significant changes (including deprecations or visual adjustments)
+and it is recommended that you merge the updated versions with your application:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Security.php``
+* ``app/Views/errors/html/*``
+* ``env``
+* ``spark``
+
+All Changes
+-----------
+
+This is a list of all files in the project space that received changes;
+many will be simple comments or formatting that have no affect on the runtime:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/ContentSecurityPolicy.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Logger.php``
+* ``app/Config/Mimes.php``
+* ``app/Config/Modules.php``
+* ``app/Config/Security.php``
+* ``app/Controllers/BaseController.php``
+* ``app/Views/errors/html/debug.css``
+* ``app/Views/errors/html/error_404.php``
+* ``app/Views/errors/html/error_exception.php``
+* ``app/Views/welcome_message.php``
+* ``composer.json``
+* ``contributing/guidelines.rst``
+* ``env``
+* ``phpstan.neon.dist``
+* ``phpunit.xml.dist``
+* ``public/.htaccess``
+* ``public/index.php``
+* ``rector.php``
+* ``spark``

user_guide_src/source/installation/upgrading.rst

@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
     Upgrading from 4.1.1 to 4.1.2 <upgrade_412>
     Upgrading from 4.0.5 to 4.1.0 or 4.1.1 <upgrade_410>