Merge remote-tracking branch 'upstream/develop' into 4.4

composer.json

@@ -25,7 +25,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.15.16",
+        "rector/rector": "0.15.17",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

user_guide_src/source/installation/upgrade_430.rst

@@ -324,7 +324,7 @@ Config
     - The property ``$html5`` to determine whether to remove the solidus (``/``) character for void HTML
       elements (e.g. ``<input>``) is added, and set to ``true`` by default for HTML5 compatibility.
 - app/Config/Encryption.php
-    - The new property ``$rawData``,  ``$encryptKeyInfo``, and ``$authKeyInfo`` are added for for CI3
+    - The new property ``$rawData``,  ``$encryptKeyInfo``, and ``$authKeyInfo`` are added for CI3
       Encryption compatibility. See :ref:`encryption-compatible-with-ci3`.
 - app/Config/Exceptions.php
     - Two additional public properties were added: ``$logDeprecations`` and ``$deprecationLogLevel``.

user_guide_src/source/installation/upgrade_432.rst

@@ -64,10 +64,6 @@ 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:
 
-Config
-------
-
-- app/Config/Email.php
 - app/Config/Mimes.php
 - app/Views/errors/html/error_exception.php
 - composer.json
@@ -80,7 +76,6 @@ This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
 - app/Config/App.php
-- app/Config/Email.php
 - app/Config/Mimes.php
 - app/Views/errors/html/error_exception.php
 - composer.json