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

Author: kenjis

app/Config/Email.php

@@ -26,7 +26,7 @@ class Email extends BaseConfig
     public string $mailPath = '/usr/sbin/sendmail';
 
     /**
-     * SMTP Server Address
+     * SMTP Server Hostname
      */
     public string $SMTPHost = '';
 

system/Database/BaseBuilder.php

@@ -2272,7 +2272,7 @@ public function getCompiledInsert(bool $reset = true)
      *
      * @param array|object|null $set
      *
-     * @return bool
+     * @return BaseResult|bool|Query
      *
      * @throws DatabaseException
      */

system/Email/Email.php

@@ -73,7 +73,7 @@ class Email
     public $protocol = 'mail';
 
     /**
-     * STMP Server host
+     * STMP Server Hostname
      *
      * @var string
      */

system/Honeypot/Honeypot.php

@@ -76,6 +76,10 @@ public function hasContent(RequestInterface $request)
      */
     public function attachHoneypot(ResponseInterface $response)
     {
+        if ($response->getBody() === null) {
+            return;
+        }
+
         if ($response->getCSP()->enabled()) {
             // Add id attribute to the container tag.
             $this->config->container = str_ireplace(

tests/system/Honeypot/HoneypotTest.php

@@ -69,6 +69,15 @@ public function testAttachHoneypot(): void
         $this->assertStringNotContainsString($this->config->name, $this->response->getBody());
     }
 
+    public function testAttachHoneypotBodyNull(): void
+    {
+        $this->response->setBody(null);
+
+        $this->honeypot->attachHoneypot($this->response);
+
+        $this->assertNull($this->response->getBody());
+    }
+
     public function testAttachHoneypotAndContainer(): void
     {
         $this->response->setBody('<form></form>');

user_guide_src/source/incoming/routing.rst

@@ -69,6 +69,8 @@ and the ``productLookupByID()`` method passing in the match as a variable to the
 
 .. literalinclude:: routing/009.php
 
+.. _routing-http-verb-routes:
+
 HTTP verb Routes
 ================
 
@@ -185,11 +187,20 @@ Placeholders Description
 .. note:: ``{locale}`` cannot be used as a placeholder or other part of the route, as it is reserved for use
     in :doc:`localization </outgoing/localization>`.
 
-Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
+.. _routing-placeholder-any:
+
+The Behavior of (:any)
+^^^^^^^^^^^^^^^^^^^^^^
+
+Note that a single ``(:any)`` will match multiple segments in the URL if present.
+
+For example the route:
 
 .. literalinclude:: routing/010.php
 
-will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
+will match **product/123**, **product/123/456**, **product/123/456/789** and so on.
+
+The implementation in the
 Controller should take into account the maximum parameters:
 
 .. literalinclude:: routing/011.php

user_guide_src/source/installation/upgrade_emails.rst

@@ -14,6 +14,7 @@ Documentations
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
+- The behavior when using the SMTP protocol has been slightly changed. You may not be able to communicate with your SMTP server properly if you use the CI3 settings. See :ref:`email-ssl-tls-for-smtp` and :ref:`email-preferences`.
 
 Upgrade Guide
 =============

user_guide_src/source/installation/upgrade_routing.rst

@@ -17,18 +17,22 @@ What has been changed
 - In CI4 the Auto Routing is disabled by default.
 - In CI4 the new more secure :ref:`auto-routing-improved` is introduced.
 - In CI4 the routing is no longer configured by setting the routes as array.
+- The Wildcard ``(:any)`` In CI3 will be the Placeholder ``(:segment)`` in CI4. The ``(:any)`` in CI4 matches multiple segements. See :ref:`URI Routing <routing-placeholder-any>`.
 
 Upgrade Guide
 =============
 
 1. If you use the Auto Routing in the same way as CI3, you need to enable :ref:`auto-routing-legacy`.
-2. The placeholder ``(:any)`` in CI3 will be ``(:segment)`` in CI4.
-3. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
+2. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
 
     - ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'Blogs::index');``. This would map to the ``index()`` method in the ``Blogs`` controller.
-    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:segment)', 'Catalog::productLookup');``
+    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:segment)', 'Catalog::productLookup');``. Don't forget to replace ``(:any)`` with ``(:segment)``.
     - ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
 
+    .. note:: For backward compatibility, ``$routes->add()`` is used here. But we
+        strongly recommend to use :ref:`routing-http-verb-routes` like
+        ``$routes->get()`` instead of ``$routes->add()`` for security.
+
 Code Example
 ============
 
@@ -43,3 +47,7 @@ CodeIgniter Version 4.x
 Path: **app/Config/Routes.php**:
 
 .. literalinclude:: upgrade_routing/001.php
+
+.. note:: For backward compatibility, ``$routes->add()`` is used here. But we
+    strongly recommend to use :ref:`routing-http-verb-routes` like
+    ``$routes->get()`` instead of ``$routes->add()`` for security.

user_guide_src/source/installation/upgrade_routing/001.php

@@ -1,16 +1,11 @@
 <?php
 
-namespace Config;
+use CodeIgniter\Router\RouteCollection;
 
-// ...
-
-/*
- * --------------------------------------------------------------------
- * Route Definitions
- * --------------------------------------------------------------------
+/**
+ * @var RouteCollection $routes
  */
-
-// ...
+$routes->get('/', 'Home::index');
 
 $routes->add('posts/index', 'Posts::index');
 $routes->add('teams/create', 'Teams::create');
@@ -21,5 +16,3 @@
 $routes->add('drivers/create', 'Drivers::create');
 $routes->add('drivers/update', 'Drivers::update');
 $routes->add('posts/(:segment)', 'Posts::view/$1');
-
-// ...

user_guide_src/source/libraries/email.rst

@@ -102,6 +102,8 @@ The settings used for the last successful send are available from the
 instance property ``$archive``. This is helpful for testing and debugging
 to determine that actual values at the time of the ``send()`` call.
 
+.. _email-preferences:
+
 Email Preferences
 =================
 
@@ -115,7 +117,7 @@ Preference          Default Value       Options                      Description
 **protocol**        mail                ``mail``, ``sendmail``,      The mail sending protocol.
                                         or ``smtp``
 **mailPath**        /usr/sbin/sendmail  None                         The server path to Sendmail.
-**SMTPHost**        No Default          None                         SMTP Server Address.
+**SMTPHost**        No Default          None                         SMTP Server Hostname.
 **SMTPUser**        No Default          None                         SMTP Username.
 **SMTPPass**        No Default          None                         SMTP Password.
 **SMTPPort**        25                  None                         SMTP Port. (If set to ``465``, TLS will be used for the connection