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

Conflicts:
	user_guide_src/source/installation/upgrading.rst

Author: kenjis

.github/workflows/test-userguide.yml

@@ -25,3 +25,4 @@ jobs:
       - uses: ammaraskar/[email protected]
         with:
           docs-folder: user_guide_src
+          build-command: 'make html SPHINXOPTS="-W --keep-going -w /tmp/sphinx-log"'

system/Email/Email.php

@@ -288,6 +288,13 @@ class Email
      */
     protected $debugMessage = [];
 
+    /**
+     * Raw debug messages
+     *
+     * @var string[]
+     */
+    private array $debugMessageRaw = [];
+
     /**
      * Recipients
      *
@@ -434,16 +441,17 @@ public function initialize($config)
      */
     public function clear($clearAttachments = false)
     {
-        $this->subject      = '';
-        $this->body         = '';
-        $this->finalBody    = '';
-        $this->headerStr    = '';
-        $this->replyToFlag  = false;
-        $this->recipients   = [];
-        $this->CCArray      = [];
-        $this->BCCArray     = [];
-        $this->headers      = [];
-        $this->debugMessage = [];
+        $this->subject         = '';
+        $this->body            = '';
+        $this->finalBody       = '';
+        $this->headerStr       = '';
+        $this->replyToFlag     = false;
+        $this->recipients      = [];
+        $this->CCArray         = [];
+        $this->BCCArray        = [];
+        $this->headers         = [];
+        $this->debugMessage    = [];
+        $this->debugMessageRaw = [];
 
         $this->setHeader('Date', $this->setDate());
 
@@ -1658,7 +1666,12 @@ protected function spoolEmail()
         }
 
         if (! $success) {
-            $this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
+            $message = lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol)));
+
+            log_message('error', 'Email: ' . $message);
+            log_message('error', $this->printDebuggerRaw());
+
+            $this->setErrorMessage($message);
 
             return false;
         }
@@ -1937,7 +1950,8 @@ protected function sendCommand($cmd, $data = '')
 
         $reply = $this->getSMTPData();
 
-        $this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+        $this->debugMessage[]    = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+        $this->debugMessageRaw[] = $cmd . ': ' . $reply;
 
         if ($resp === null || ((int) static::substr($reply, 0, 3) !== $resp)) {
             $this->setErrorMessage(lang('Email.SMTPError', [$reply]));
@@ -2090,8 +2104,8 @@ protected function getHostname()
     }
 
     /**
-     * @param array $include List of raw data chunks to include in the output
-     *                       Valid options are: 'headers', 'subject', 'body'
+     * @param array|string $include List of raw data chunks to include in the output
+     *                              Valid options are: 'headers', 'subject', 'body'
      *
      * @return string
      */
@@ -2119,12 +2133,21 @@ public function printDebugger($include = ['headers', 'subject', 'body'])
         return $msg . ($rawData === '' ? '' : '<pre>' . $rawData . '</pre>');
     }
 
+    /**
+     * Returns raw debug messages
+     */
+    private function printDebuggerRaw(): string
+    {
+        return implode("\n", $this->debugMessageRaw);
+    }
+
     /**
      * @param string $msg
      */
     protected function setErrorMessage($msg)
     {
-        $this->debugMessage[] = $msg . '<br />';
+        $this->debugMessage[]    = $msg . '<br />';
+        $this->debugMessageRaw[] = $msg;
     }
 
     /**

system/Session/Session.php

@@ -25,6 +25,8 @@
  *
  * Session configuration is done through session variables and cookie related
  * variables in app/config/App.php
+ *
+ * @property string $session_id
  */
 class Session implements SessionInterface
 {

user_guide_src/source/changelogs/v4.2.2.rst

@@ -32,6 +32,7 @@ Deprecations
 
 - The parameters of ``Services::request()`` are deprecated.
 - The first parameter ``$cacheConfig`` of ``CodeIgniter::gatherOutput()`` is deprecated.
+- The second parameter ``$ifNotExists`` of ``Forge::_createTable()`` is deprecated.
 
 Bugs Fixed
 **********

user_guide_src/source/database/utilities/001.php

@@ -1,9 +1,12 @@
 <?php
 
-$model                    = new class () extends \CodeIgniter\Model {
+class MyModel extends \CodeIgniter\Model
+{
     protected $table      = 'foo';
     protected $primaryKey = 'id';
-};
+}
+
+$model = new MyModel();
 
 $util = \CodeIgniter\Database\Config::utils();
 

user_guide_src/source/installation/installing_composer.rst

@@ -56,7 +56,7 @@ Initial Configuration
 ---------------------
 
 After installation, a few initial configurations are required.
-See :ref:`initial-configuration` for the details. 
+See :ref:`initial-configuration` for the details.
 
 .. _app-starter-upgrading:
 
@@ -67,17 +67,6 @@ Whenever there is a new release, then from the command line in your project root
 
     > composer update
 
-If you want to compare the latest framework source structure for non-system directory (app, public, etc), you can update with ``--prefer-source``::
-
-    > composer update codeigniter4/framework --prefer-source
-
-If ``--prefer-source`` doesn't automatically update to pull latest framework source structure, you can remove first::
-
-    rm -rf vendor/codeigniter4/framework && composer update codeigniter4/framework --prefer-source
-
-If you used the ``--no-dev`` option when you created the project, it
-would be appropriate to do so here too, i.e., ``composer update --no-dev``.
-
 Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
@@ -97,7 +86,6 @@ Folders in your project after set up:
 
 - app, public, tests, writable
 - vendor/codeigniter4/framework/system
-- vendor/codeigniter4/framework/app & public (compare with yours after updating when using ``--prefer-source``)
 
 Latest Dev
 ----------
@@ -112,13 +100,13 @@ develop branch explicitly.
 
 In your project root::
 
-    php builds development
+    > php builds development
 
 The command above will update **composer.json** to point to the ``develop`` branch of the
 working repository, and update the corresponding paths in config and XML files. To revert
 these changes run::
 
-    php builds release
+    > php builds release
 
 After using the ``builds`` command be sure to run ``composer update`` to sync your vendor
 folder with the latest target build.
@@ -138,22 +126,17 @@ will be your document root.
 
 In your project root::
 
-    > composer require codeigniter4/framework --prefer-source
+    > composer require codeigniter4/framework
 
-As with the earlier two composer install methods, you can omit installing
+As with the earlier composer install method, you can omit installing
 phpunit and its dependencies by adding the ``--no-dev`` argument to the ``composer require`` command.
 
 Setting Up
 ----------
 
-Copy the ``app``, ``public``, and ``writable`` folders from ``vendor/codeigniter4/framework``
-to your project root
-
-Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from
-``vendor/codeigniter4/framework`` to your project root
-
-You will have to adjust the system path to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``,
-- the ``$systemDirectory`` variable in **app/Config/Paths.php**
+    1. Copy the ``app``, ``public``, ``tests`` and ``writable`` folders from ``vendor/codeigniter4/framework`` to your project root
+    2. Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from ``vendor/codeigniter4/framework`` to your project root
+    3. You will have to adjust the ``$systemDirectory`` property in **app/Config/Paths.php** to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``.
 
 Initial Configuration
 ---------------------
@@ -168,7 +151,7 @@ Upgrading
 
 Whenever there is a new release, then from the command line in your project root::
 
-    > composer update --prefer-source
+    > composer update
 
 Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
@@ -187,7 +170,7 @@ Structure
 
 Folders in your project after set up:
 
-- app, public, writable (when using ``--prefer-source``)
+- app, public, tests, writable
 - vendor/codeigniter4/framework/system
 
 Translations Installation

user_guide_src/source/installation/installing_manual.rst

@@ -55,7 +55,8 @@ Structure
 =========
 
 Folders in your project after set up:
-app, public, system, writable
+
+- app, public, tests, writable, system
 
 Translations Installation
 =========================

user_guide_src/source/installation/upgrade_422.rst

@@ -26,7 +26,7 @@ Web Page Caching Bug Fix
 Others
 ======
 
-- The method ``Forge::createTable()`` no longer executes a ``CREATE TABLE IF NOT EXISTS``. If table is not found in ``$db->tableExists($table)`` then ``CREATE TABLE`` is executed.
+- The method ``Forge::createTable()`` no longer executes a ``CREATE TABLE IF NOT EXISTS``.  When `$ifNotExists` is true, if the table is not found in ``$db->tableExists($table)`` then ``CREATE TABLE`` is executed.
 - The second parameter ``$ifNotExists`` of ``Forge::_createTable()`` is deprecated. It is no longer used and will be removed in a future release.
 - When you use :php:func:`random_string` with the first parameter ``'crypto'``, now if you set the second parameter ``$len`` to an odd number, ``InvalidArgumentException`` will be thrown. Change the parameter to an even number.
 

user_guide_src/source/installation/upgrade_423.rst

@@ -2,4 +2,8 @@
 Upgrading from 4.2.2 to 4.2.3
 #############################
 
+.. contents::
+    :local:
+    :depth: 2
+
 Version ``4.2.3`` is an internal change for security measures and requires no intervention in projects.

user_guide_src/source/installation/upgrading.rst

@@ -13,6 +13,7 @@ upgrading from.
     :titlesonly:
 
     upgrade_430
+    upgrade_423
     upgrade_422
     upgrade_421
     upgrade_420