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

Author: kenjis

rector.php

@@ -39,7 +39,6 @@
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
 use Rector\PHPUnit\Rector\MethodCall\AssertPropertyExistsRector;
-use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
@@ -112,11 +111,6 @@
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
 
-        // @TODO remove if https://github.com/rectorphp/rector-phpunit/issues/86 is fixed
-        GetMockBuilderGetMockToCreateMockRector::class => [
-            __DIR__ . '/tests/system/Email/EmailTest.php',
-        ],
-
         SimplifyRegexPatternRector::class,
     ]);
 

system/Cache/Handlers/FileHandler.php

@@ -44,6 +44,8 @@ class FileHandler extends BaseHandler
     protected $mode;
 
     /**
+     * Note: Use `CacheFactory::getHandler()` to instantiate.
+     *
      * @throws CacheException
      */
     public function __construct(Cache $config)

system/Cache/Handlers/MemcachedHandler.php

@@ -42,6 +42,9 @@ class MemcachedHandler extends BaseHandler
         'raw'    => false,
     ];
 
+    /**
+     * Note: Use `CacheFactory::getHandler()` to instantiate.
+     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;

system/Cache/Handlers/PredisHandler.php

@@ -43,6 +43,9 @@ class PredisHandler extends BaseHandler
      */
     protected $redis;
 
+    /**
+     * Note: Use `CacheFactory::getHandler()` to instantiate.
+     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;

system/Cache/Handlers/RedisHandler.php

@@ -42,6 +42,9 @@ class RedisHandler extends BaseHandler
      */
     protected $redis;
 
+    /**
+     * Note: Use `CacheFactory::getHandler()` to instantiate.
+     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;

system/Cache/Handlers/WincacheHandler.php

@@ -22,6 +22,9 @@
  */
 class WincacheHandler extends BaseHandler
 {
+    /**
+     * Note: Use `CacheFactory::getHandler()` to instantiate.
+     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;

user_guide_src/source/dbmgmt/migration.rst

@@ -9,9 +9,9 @@ need to go and run them. You would also have to keep track of which changes
 need to be run against the production machines next time you deploy.
 
 The database table **migrations** tracks which migrations have already been
-run so all you have to do is make sure your migrations are in place and
-call ``$migration->latest()`` to bring the database up to the most recent
-state. You can also use ``$migration->setNamespace(null)->latest()`` to
+run, so all you have to do is make sure your migrations are in place and
+run the ``spark migrate`` command to bring the database up to the most recent
+state. You can also use ``spark migrate --all`` to
 include migrations from all namespaces.
 
 .. contents::
@@ -94,23 +94,14 @@ This will look for any migrations located at both **APPPATH/Database/Migrations*
 **ROOTPATH/MyCompany/Database/Migrations**. This makes it simple to include migrations in your
 re-usable, modular code suites.
 
-*************
-Usage Example
-*************
-
-In this example some simple code is placed in **app/Controllers/Migrate.php**
-to update the schema:
-
-.. literalinclude:: migration/005.php
-
 .. _command-line-tools:
 
 *******************
 Command-Line Tools
 *******************
 
 CodeIgniter ships with several :doc:`commands </cli/spark_commands>` that are available from the command line to help
-you work with migrations. These tools are not required to use migrations but might make things easier for those of you
+you work with migrations. These tools make things easier for those of you
 that wish to use them. The tools primarily provide access to the same methods that are available within the MigrationRunner class.
 
 migrate
@@ -171,6 +162,9 @@ status
 Displays a list of all migrations and the date and time they ran, or '--' if they have not been run::
 
   > php spark migrate:status
+
+  ...
+
   +----------------------+-------------------+-----------------------+---------+---------------------+-------+
   | Namespace            | Version           | Filename              | Group   | Migrated On         | Batch |
   +----------------------+-------------------+-----------------------+---------+---------------------+-------+
@@ -194,13 +188,17 @@ creates is the Pascal case version of the filename.
 
   > php spark make:migration <class> [options]
 
-You can use (make:migration) with the following options:
+You can use (``make:migration``) with the following options:
+
+- ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``.
+- ``--suffix``    - Append the component title to the class name.
+
+The following options are also available to generate the migration file for
+database sessions:
 
 - ``--session``   - Generates the migration file for database sessions.
 - ``--table``     - Table name to use for database sessions. Default: ``ci_sessions``.
 - ``--dbgroup``   - Database group to use for database sessions. Default: ``default``.
-- ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``.
-- ``--suffix``    - Append the component title to the class name.
 
 *********************
 Migration Preferences
@@ -229,7 +227,7 @@ Class Reference
         :returns:    An array of migration files
         :rtype:    array
 
-        An array of migration filenames are returned that are found in the **path** property.
+        An array of migration filenames are returned that are found in the ``path`` property.
 
     .. php:method:: latest($group)
 
@@ -259,7 +257,7 @@ Class Reference
         :returns:    ``true`` on success, ``false`` on failure
         :rtype:    bool
 
-        This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated.
+        This forces a single file to migrate regardless of order or batches. Method ``up()`` or ``down()`` is detected based on whether it has already been migrated.
 
         .. note:: This method is recommended only for testing and could cause data consistency issues.
 

user_guide_src/source/dbmgmt/migration/005.php

@@ -122,7 +122,7 @@ The loaded environment variables are accessed using any of the following:
 
 .. literalinclude:: configuration/005.php
 
-.. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
+.. warning:: Note that your settings from the **.env** file are added to ``$_SERVER`` and ``$_ENV``. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons), or a detailed error report in the ``development`` environment is shown, **your secure credentials are publicly exposed**.
 
 Nesting Variables
 -----------------

user_guide_src/source/general/configuration.rst

@@ -3,9 +3,11 @@ Error Handling
 ##############
 
 CodeIgniter builds error reporting into your system through Exceptions, both the `SPL collection <https://www.php.net/manual/en/spl.exceptions.php>`_, as
-well as a few custom exceptions that are provided by the framework. Depending on your environment's setup,
+well as a few exceptions that are provided by the framework.
+
+Depending on your environment's setup,
 the default action when an error or exception is thrown is to display a detailed error report unless the application
-is running under the ``production`` environment. In this case, a more generic message is displayed to
+is running under the ``production`` environment. In the ``production`` environment, a more generic message is displayed to
 keep the best user experience for your users.
 
 .. contents::
@@ -43,12 +45,19 @@ the error handler to function as normal, you can throw a new exception within th
 Configuration
 =============
 
-By default, CodeIgniter will display all errors in the ``development`` and ``testing`` environments, and will not
+Error Reporting
+---------------
+
+By default, CodeIgniter will display a detailed error report with all errors in the ``development`` and ``testing`` environments, and will not
 display any errors in the ``production`` environment. You can change this by setting the ``CI_ENVIRONMENT`` variable
-in the **.env** file.
+in the :ref:`.env <dotenv-file>` file.
 
 .. important:: Disabling error reporting DOES NOT stop logs from being written if there are errors.
 
+.. warning:: Note that your settings from the **.env** file are added to ``$_SERVER``
+    and ``$_ENV``. As a side effect, this means that if the detailed error report
+    is displayed, **your secure credentials are publicly exposed**.
+
 Logging Exceptions
 ------------------