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

Conflicts:
	system/Helpers/html_helper.php
	tests/system/Helpers/HTMLHelperTest.php
	user_guide_src/source/installation/upgrade_4xx.rst
	user_guide_src/source/installation/upgrade_validations/002.php

Author: kenjis

system/HTTP/RequestTrait.php

@@ -44,7 +44,7 @@ trait RequestTrait
     /**
      * Gets the user's IP address.
      *
-     * @return string IP address if it can be detected, or empty string.
+     * @return string IP address if it can be detected.
      *                If the IP address is not a valid IP address,
      *                then will return '0.0.0.0'.
      */
@@ -73,6 +73,11 @@ public function getIPAddress(): string
 
         $this->ipAddress = $this->getServer('REMOTE_ADDR');
 
+        // If this is a CLI request, $this->ipAddress is null.
+        if ($this->ipAddress === null) {
+            return $this->ipAddress = '0.0.0.0';
+        }
+
         if ($proxyIPs) {
             // @TODO Extract all this IP address logic to another class.
             foreach ($proxyIPs as $proxyIP => $header) {
@@ -151,7 +156,7 @@ public function getIPAddress(): string
             return $this->ipAddress = '0.0.0.0';
         }
 
-        return empty($this->ipAddress) ? '' : $this->ipAddress;
+        return $this->ipAddress;
     }
 
     /**

system/Helpers/html_helper.php

@@ -222,13 +222,20 @@ function script_tag($src = '', bool $indexPage = false): string
     /**
      * Link
      *
-     * Generates link to a CSS file
+     * Generates link tag
      *
-     * @param array|string $href      Stylesheet href or an array
-     * @param bool         $indexPage should indexPage be added to the CSS path.
+     * @param array<string, bool|string>|string $href      Stylesheet href or an array
+     * @param bool                              $indexPage should indexPage be added to the CSS path.
      */
-    function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false, string $hreflang = ''): string
-    {
+    function link_tag(
+        $href = '',
+        string $rel = 'stylesheet',
+        string $type = 'text/css',
+        string $title = '',
+        string $media = '',
+        bool $indexPage = false,
+        string $hreflang = ''
+    ): string {
         // extract fields if needed
         if (is_array($href)) {
             $rel       = $href['rel'] ?? $rel;
@@ -252,7 +259,7 @@ function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/c
 
         $attributes['rel'] = $rel;
 
-        if (! in_array($rel, ['alternate', 'canonical'], true)) {
+        if ($type !== '' && $rel !== 'canonical' && $hreflang === '' && ! ($rel === 'alternate' && $media !== '')) {
             $attributes['type'] = $type;
         }
 

tests/system/Helpers/HTMLHelperTest.php

@@ -365,11 +365,71 @@ public function testLinkTagXHTML()
         $doctypes->html5 = $default;
     }
 
-    public function testLinkTagComplete()
+    public function testLinkTagMedia()
     {
-        $target   = 'https://styles.com/css/mystyles.css';
-        $expected = '<link href="https://styles.com/css/mystyles.css" rel="banana" type="fruit" media="VHS" title="Go away">';
-        $this->assertSame($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
+        $target = 'https://styles.com/css/mystyles.css';
+        $tag    = link_tag($target, 'stylesheet', 'text/css', '', 'print');
+
+        $expected = '<link href="https://styles.com/css/mystyles.css" rel="stylesheet" type="text/css" media="print">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagTitle()
+    {
+        $tag = link_tag('default.css', 'stylesheet', 'text/css', 'Default Style');
+
+        $expected = '<link href="http://example.com/default.css" rel="stylesheet" type="text/css" title="Default Style">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagFavicon()
+    {
+        $tag = link_tag('favicon.ico', 'shortcut icon', 'image/ico');
+
+        $expected = '<link href="http://example.com/favicon.ico" rel="shortcut icon" type="image/ico">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagRss()
+    {
+        $tag = link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
+
+        $expected = '<link href="http://example.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagAlternate()
+    {
+        $tag = link_tag(
+            'http://sp.example.com/',
+            'alternate',
+            '',
+            '',
+            'only screen and (max-width: 640px)'
+        );
+
+        $expected = '<link href="http://sp.example.com/" rel="alternate" media="only screen and (max-width: 640px)">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagArrayAlternate()
+    {
+        $tag = link_tag([
+            'href'  => 'http://sp.example.com/',
+            'rel'   => 'alternate',
+            'media' => 'only screen and (max-width: 640px)',
+        ]);
+
+        $expected = '<link href="http://sp.example.com/" rel="alternate" media="only screen and (max-width: 640px)">';
+        $this->assertSame($expected, $tag);
+    }
+
+    public function testLinkTagCanonical()
+    {
+        $tag = link_tag('http://www.example.com/', 'canonical');
+
+        $expected = '<link href="http://www.example.com/" rel="canonical">';
+        $this->assertSame($expected, $tag);
     }
 
     public function testLinkTagArray()
@@ -382,6 +442,18 @@ public function testLinkTagArray()
         $this->assertSame($expected, link_tag($parms));
     }
 
+    public function testLinkTagArrayHreflang()
+    {
+        $tag = link_tag([
+            'href'     => 'https://example.com/en',
+            'rel'      => 'alternate',
+            'hreflang' => 'x-default',
+        ]);
+
+        $expected = '<link href="https://example.com/en" hreflang="x-default" rel="alternate">';
+        $this->assertSame($expected, $tag);
+    }
+
     public function testDocType()
     {
         $target   = 'html4-strict';

user_guide_src/source/incoming/controllers.rst

@@ -16,6 +16,8 @@ A Controller is simply a class file that handles a HTTP request. :doc:`URI Routi
 Every controller you create should extend ``BaseController`` class.
 This class provides several features that are available to all of your controllers.
 
+.. _controller-constructor:
+
 Constructor
 ***********
 

user_guide_src/source/incoming/request.rst

@@ -1,26 +1,29 @@
+#############
 Request Class
-*************
+#############
 
 The request class is an object-oriented representation of an HTTP request. This is meant to
 work for both incoming, such as a request to the application from a browser, and outgoing requests,
-like would be used to send a request from the application to a third-party application. This class
+like would be used to send a request from the application to a third-party application.
+
+This class
 provides the common functionality they both need, but both cases have custom classes that extend
-from the Request class to add specific functionality.
+from the Request class to add specific functionality. In practice, you will need to use these classes.
 
 See the documentation for the :doc:`IncomingRequest Class </incoming/incomingrequest>` and
 :doc:`CURLRequest Class </libraries/curlrequest>` for more usage details.
 
 Class Reference
-===============
+***************
 
 .. php:namespace:: CodeIgniter\HTTP
 
 .. php:class:: Request
 
     .. php:method:: getIPAddress()
 
-        :returns: The user's IP Address, if it can be detected, or null. If the IP address
-                    is not a valid IP address, then will return 0.0.0.0
+        :returns: The user's IP Address, if it can be detected. If the IP address
+                    is not a valid IP address, then will return 0.0.0.0.
         :rtype:   string
 
         Returns the IP address for the current user. If the IP address is not valid, the method
@@ -33,6 +36,9 @@ Class Reference
 
     .. php:method:: isValidIP($ip[, $which = ''])
 
+        .. deprecated:: 4.0.5
+           Use :doc:`../libraries/validation` instead.
+
         .. important:: This method is deprecated. It will be removed in future releases.
 
         :param    string $ip: IP address
@@ -65,19 +71,30 @@ Class Reference
 
     .. php:method:: setMethod($method)
 
-        :param string $upper: Sets the request method. Used when spoofing the request.
-        :returns: HTTP request method
+        .. deprecated:: 4.0.5
+           Use :php:meth:`CodeIgniter\\HTTP\\Request::withMethod()` instead.
+
+        :param string $method: Sets the request method. Used when spoofing the request.
+        :returns: This request
+        :rtype: Request
+
+    .. php:method:: withMethod($method)
+
+        .. versionadded:: 4.0.5
+
+        :param string $method: Sets the request method.
+        :returns: New request instance
         :rtype: Request
 
     .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]])
 
         :param    mixed     $index: Value name
-        :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_SERVER item value if found, null if not
+        :param    int       $filter: The type of filter to apply. A list of filters can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param    int|array $flags: Flags to apply. A list of flags can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :returns: ``$_SERVER`` item value if found, null if not
         :rtype:   mixed
 
-        This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
+        This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()`` methods from the
         :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches server data (``$_SERVER``):
 
         .. literalinclude:: request/004.php
@@ -90,13 +107,13 @@ Class Reference
     .. php:method:: getEnv([$index = null[, $filter = null[, $flags = null]]])
 
         :param    mixed     $index: Value name
-        :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_ENV item value if found, null if not
+        :param    int       $filter: The type of filter to apply. A list of filters can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param    int|array $flags: Flags to apply. A list of flags can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :returns: ``$_ENV`` item value if found, null if not
         :rtype:   mixed
 
-        This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
-        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches getEnv data (``$_ENV``):
+        This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()`` methods from the
+        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches env data (``$_ENV``):
 
         .. literalinclude:: request/006.php
 
@@ -109,17 +126,17 @@ Class Reference
 
         :param    string $method: Method name
         :param    mixed  $value:  Data to be added
-        :returns: HTTP request method
-        :rtype:    Request
+        :returns: This request
+        :rtype:   Request
 
-        Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
+        Allows manually setting the value of PHP global, like ``$_GET``, ``$_POST``, etc.
 
     .. php:method:: fetchGlobal($method [, $index = null[, $filter = null[, $flags = null]]])
 
         :param    string    $method: Input filter constant
         :param    mixed     $index: Value name
-        :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param    int       $filter: The type of filter to apply. A list of filters can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param    int|array $flags: Flags to apply. A list of flags can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :rtype:   mixed
 
         Fetches one or more items from a global, like cookies, get, post, etc.

user_guide_src/source/incoming/request/003.php

@@ -1,5 +1,5 @@
 <?php
 
-echo $request->getMethod(true); // Outputs: POST
+echo $request->getMethod(true);  // Outputs: POST
 echo $request->getMethod(false); // Outputs: post
-echo $request->getMethod(); // Outputs: post
+echo $request->getMethod();      // Outputs: post

user_guide_src/source/installation/upgrade_4xx.rst

@@ -35,8 +35,8 @@ General Adjustments
 Downloads
 =========
 
-- CI4 is still available as a ready-to-run zip or tarball.
-- It can also be installed using Composer.
+- CI4 is still available as a :doc:`ready-to-run zip or tarball <../installation/installing_manual>`.
+- It can also be installed using :doc:`Composer <../installation/installing_composer>`.
 
 Namespaces
 ==========
@@ -90,10 +90,10 @@ Class Loading
 
 - There is no longer a CodeIgniter "superobject", with framework component
   references magically injected as properties of your controller.
-- Classes are instantiated where needed, and components are managed
-  by ``Services``.
-- The class loader automatically handles PSR-4 style class locating,
-  within the ``App`` (**app**) and ``CodeIgniter`` (i.e., **system**) top level
+- Classes are instantiated where needed, and framework components are managed
+  by :doc:`../concepts/services`.
+- The :doc:`Autoloader <../concepts/autoloader>` automatically handles PSR-4 style class locating,
+  within the ``App`` (**app** folder) and ``CodeIgniter`` (i.e., **system** folder) top level
   namespaces; with Composer autoloading support.
 - You can configure the class loading to support whatever application structure
   you are most comfortable with, including the "HMVC" style.
@@ -102,22 +102,41 @@ Libraries
 =========
 
 - Your app classes can still go inside **app/Libraries**, but they don't have to.
-- Instead of CI3's ``$this->load->library(x);`` you can now use
+- Instead of CI3's ``$this->load->library('x');`` you can now use
   ``$this->x = new X();``, following namespaced conventions for your component.
 
 Helpers
 =======
 
-- Helpers are pretty much the same as before, though some have been simplified.
+- :doc:`Helpers <../general/helpers>` are pretty much the same as before, though some have been simplified.
 - Since v4.3.0, you can autoload helpers by **app/Config/Autoload.php** as well as CI3.
+- Some helpers from CodeIgniter 3 no longer exists in Version 4. For all these
+  helpers, you have to find a new way to implement your functions. These
+  helpers are `CAPTCHA Helper <https://www.codeigniter.com/userguide3/helpers/captcha_helper.html>`_,
+  `Email Helper <https://www.codeigniter.com/userguide3/helpers/email_helper.html>`_.
+  `Path Helper <https://www.codeigniter.com/userguide3/helpers/path_helper.html>`_.
+  and `Smiley Helper <https://www.codeigniter.com/userguide3/helpers/smiley_helper.html>`_.
+- `Download Helper <https://www.codeigniter.com/userguide3/helpers/download_helper.html>`_
+  in CI3 was removed. You need to use Response object where you are using ``force_download()``.
+  See :ref:`force-file-download`.
+- `Language Helper <https://www.codeigniter.com/userguide3/helpers/language_helper.html>`_
+  in CI3 was removed. But ``lang()`` is always available in CI4. See :php:func:`lang()`.
+- `Typography Helper <https://www.codeigniter.com/userguide3/helpers/typography_helper.html>`_
+  in CI3 wll be :doc:`Typography Library <../libraries/typography>` in CI4.
+- `Directory Helper <https://www.codeigniter.com/userguide3/helpers/directory_helper.html>`_
+  and `File Helper <https://www.codeigniter.com/userguide3/helpers/file_helper.html>`_ in CI3
+  will be :doc:`../helpers/filesystem_helper` in CI4.
+- `String Helper <https://www.codeigniter.com/userguide3/helpers/string_helper.html>`_ functions
+  in CI3 are included in :doc:`../helpers/text_helper` in CI4.
 - In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it.
     - `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
     - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
 
 Events
 ======
 
-- Hooks have been replaced by Events.
+- `Hooks <https://www.codeigniter.com/userguide3/general/hooks.html>`_ have been
+  replaced by :doc:`../extending/events`.
 - Instead of CI3's ``$hook['post_controller_constructor']`` you now use
   ``Events::on('post_controller_constructor', ['MyClass', 'MyFunction']);``, with the namespace ``CodeIgniter\Events\Events;``.
 - Events are always enabled, and are available globally.
@@ -127,17 +146,18 @@ Extending the Framework
 
 - You don't need a **core** folder to hold ``MY_...`` framework
   component extensions or replacements.
-- You don't need ``MY_x`` classes inside your libraries folder
+- You don't need ``MY_X`` classes inside your libraries folder
   to extend or replace CI4 pieces.
 - Make any such classes where you like, and add appropriate
   service methods in **app/Config/Services.php** to load
   your components instead of the default ones.
+- See :doc:`../extending/core_classes` for details.
 
 Upgrading Libraries
 *******************
 
 - Your app classes can still go inside **app/Libraries**, but they don't have to.
-- Instead of CI3's ``$this->load->library(x);`` you can now use ``$this->x = new X();``,
+- Instead of CI3's ``$this->load->library('x');`` you can now use ``$this->x = new X();``,
   following namespaced conventions for your component.
 - Some libraries from CodeIgniter 3 no longer exists in Version 4. For all these
   libraries, you have to find a new way to implement your functions. These