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

Author: kenjis

.github/workflows/deploy-userguide-latest.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Create an artifact of the html output
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: HTML Documentation
           path: user_guide_src/build/html/

.github/workflows/reusable-coveralls.yml

@@ -24,7 +24,7 @@ jobs:
           coverage: xdebug
 
       - name: Download coverage files
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: build/cov
 

.github/workflows/reusable-phpunit-test.yml

@@ -206,7 +206,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

.github/workflows/reusable-serviceless-phpunit-test.yml

@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

tests/system/View/ParserFilterTest.php

@@ -111,15 +111,20 @@ public function testDefault(): void
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'value1' => null,
-            'value2' => 0,
-            'value3' => 'test',
+            'value1' => '',
+            'value2' => null,
+            'value3' => 0,
+            'value4' => 'test',
         ];
 
-        $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }';
+        $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }'
+                    . ' { value4|default(boo) } { undef|default(far) }';
 
         $parser->setData($data);
-        $this->assertSame('foo bar test', $parser->renderString($template));
+        $this->assertSame(
+            'foo bar baz test { undef|default(far) }',
+            $parser->renderString($template)
+        );
     }
 
     public function testEsc(): void

user_guide_src/source/incoming/controllers.rst

@@ -321,16 +321,17 @@ Defining a Default Controller
 
 Let's try it with the ``Helloworld`` controller.
 
-To specify a default controller open your **app/Config/Routes.php**
-file and set this variable:
+To specify a default controller open your **app/Config/Routing.php**
+file and set this property::
 
-.. literalinclude:: controllers/015.php
+    public string $defaultController = 'Helloworld';
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
+And comment out the line in **app/Config/Routes.php**:
 
 .. literalinclude:: controllers/016.php
+    :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
@@ -340,8 +341,8 @@ see the "Hello World" message.
     precedence over Auto Routing, and controllers defined in the defined routes
     are denied access by Auto Routing (Improved) for security reasons.
 
-For more information, please refer to the :ref:`routes-configuration-options` section of the
-:ref:`URI Routing <routing-auto-routing-improved-configuration-options>` documentation.
+For more information, please refer to the
+:ref:`routing-auto-routing-improved-configuration-options` documentation.
 
 .. _controller-default-method-fallback:
 
@@ -427,7 +428,7 @@ To call the above controller your URI will look something like this::
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
-your **app/Config/Routes.php** file.
+your **app/Config/Routing.php** file.
 
 CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
 
@@ -590,24 +591,25 @@ Defining a Default Controller (Legacy)
 
 Let's try it with the ``Helloworld`` controller.
 
-To specify a default controller open your **app/Config/Routes.php**
-file and set this variable:
+To specify a default controller open your **app/Config/Routing.php**
+file and set this property::
 
-.. literalinclude:: controllers/015.php
+    public string $defaultController = 'Helloworld';
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
+And comment out the line in **app/Config/Routes.php**:
 
 .. literalinclude:: controllers/016.php
+    :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
 
 .. note:: The line ``$routes->get('/', 'Home::index');`` is an optimization that you will want to use in a "real-world" app. But for demonstration purposes we don't want to use that feature. ``$routes->get()`` is explained in :doc:`URI Routing <routing>`
 
-For more information, please refer to the :ref:`routes-configuration-options` section of the
-:ref:`URI Routing <routing-auto-routing-legacy-configuration-options>` documentation.
+For more information, please refer to the the
+:ref:`routing-auto-routing-legacy-configuration-options` documentation.
 
 Organizing Your Controllers into Sub-directories (Legacy)
 =========================================================
@@ -637,7 +639,7 @@ To call the above controller your URI will look something like this::
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
-your **app/Config/Routes.php** file.
+your **app/Config/Routing.php** file.
 
 CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
 

user_guide_src/source/incoming/controllers/015.php

@@ -32,6 +32,8 @@ There are several development repositories, of interest to potential contributor
 +------------------+--------------+-----------------------------------------------------------------+
 | cache_           | developers   | PSR-6 and PSR-16 Cache Adapters for CodeIgniter 4               |
 +------------------+--------------+-----------------------------------------------------------------+
+| queue_           | developers   | Job Queue for CodeIgniter 4                                     |
++------------------+--------------+-----------------------------------------------------------------+
 
 .. _CodeIgniter4: https://github.com/codeigniter4/CodeIgniter4
 .. _translations: https://github.com/codeigniter4/translations
@@ -41,6 +43,7 @@ There are several development repositories, of interest to potential contributor
 .. _shield: https://codeigniter4.github.io/shield
 .. _tasks: https://github.com/codeigniter4/tasks
 .. _cache: https://github.com/codeigniter4/cache
+.. _queue: https://github.com/codeigniter4/queue
 
 There are also several deployment repositories, referenced in the installation directions.
 The deployment repositories are built automatically when a new version is released, and they

user_guide_src/source/installation/repositories.rst

@@ -788,9 +788,12 @@ a boolean true or false value signifying true if it passed the test or false if
 
 .. literalinclude:: validation/034.php
 
-By default, the system will look within **system/Language/en/Validation.php** for the language strings used
-within errors. In custom rules, you may provide error messages by accepting a ``&$error`` variable by reference in the
-second parameter:
+By default, the system will look within **system/Language/en/Validation.php** for the language strings used within
+errors. To provide default error messages for your custom rules, you may place them in **app/Language/en/Validation.php**
+(and/or corresponding folder of locale you use in place of ``en``). Also, in case you want to use some other language
+string file in place of the default **Validation.php**, you may provide error messages by accepting an ``&$error``
+variable by reference in the second (or, in case your rule needs to work with parameters, as described below – the
+fourth) parameter:
 
 .. literalinclude:: validation/035.php
 

user_guide_src/source/libraries/validation.rst

@@ -371,8 +371,7 @@ date              format (Y-m-d)   A PHP **date**-compatible formatting string.
 date_modify       value to add     A **strtotime** compatible string to modify the date,       { v|date_modify(+1 day) }
                   / subtract       like ``+5 day`` or ``-1 week``.
 
-default           default value    Displays the default value if the variable is empty or      { v|default(just in case) }
-                                   undefined.
+default           default value    Displays the default value if the variable is `empty()`_.   { v|default(just in case) }
 
 esc               html, attr,      Specifies the context to escape the data.                   { v|esc(attr) }
                   css, js
@@ -419,6 +418,8 @@ title                              Displays a "title case" version of the string
 upper                              Displays the string in all uppercase.                       { v|upper }
 ================ ================= =========================================================== ======================================
 
+.. _empty(): https://www.php.net/manual/en/function.empty.php
+
 See `PHP's NumberFormatter <https://www.php.net/manual/en/numberformatter.create.php>`_ for details relevant to the
 "local_number" filter.