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

Author: kenjis

composer.json

@@ -71,7 +71,11 @@
             "CodeIgniter\\ComposerScripts::postUpdate",
             "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
         ],
-        "analyze": "phpstan analyse",
+        "analyze": [
+            "phpstan analyze",
+            "rector process --dry-run"
+        ],
+        "sa": "@analyze",
         "test": "phpunit",
         "cs": [
             "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php",
@@ -82,7 +86,8 @@
             "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.user-guide.php",
             "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php",
             "php-cs-fixer fix --ansi --verbose --diff"
-        ]
+        ],
+        "style": "@cs-fix"
     },
     "scripts-descriptions": {
         "analyze": "Run static analysis",

contributing/pull_request.md

@@ -252,7 +252,6 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
    - Commit messages are expected to be descriptive of why and what you changed specifically. Commit messages like "Fixes #1234" would be asked by the reviewer to be revised. [Atomic commit](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention) is recommended. See [Contribution Workflow](./workflow.md#commit-messages) for details.
 9. If you have touched PHP code, run static analysis.
    - `> composer analyze`
-   - `> vendor/bin/rector process`
 10. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
    - `> vendor/bin/phpunit tests/system/path/to/file/you/modified`
    - Make sure the tests pass to have a higher chance of merging.

contributing/workflow.md

@@ -66,7 +66,7 @@ Clone your repository, leaving a local folder for you to work with:
 > git clone ORIGIN_URL
 ```
 
-## Syncing your repository
+## Syncing Your Repository
 
 Within your local repository, Git will have created an alias,
 **origin**, for the GitHub repository it is bound to. You want to create
@@ -179,7 +179,11 @@ For instance, to commit your work from a debugging session:
 
 Just make sure that your commits in a feature branch are all related.
 
-### When you work on two features
+### Changing a Commit Message
+
+See <https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message>.
+
+### When You Work on Two Features
 
 If you are working on two features at a time, then you will want to
 switch between them to keep the contributions separate. For instance:
@@ -314,7 +318,7 @@ And finally push your local branch to your GitHub repository:
 > git push --force-with-lease origin fix/problem123
 ```
 
-## If you sent to the wrong branch
+## If You Sent to the Wrong Branch
 
 If you have sent a PR to the wrong branch, you need to create a new PR branch.
 

system/Entity/Entity.php

@@ -26,6 +26,7 @@
 use CodeIgniter\Entity\Cast\URICast;
 use CodeIgniter\Entity\Exceptions\CastException;
 use CodeIgniter\I18n\Time;
+use DateTime;
 use Exception;
 use JsonSerializable;
 use ReturnTypeWillChange;
@@ -149,7 +150,7 @@ public function fill(?array $data = null)
      *
      * @param bool $onlyChanged If true, only return values that have changed since object creation
      * @param bool $cast        If true, properties will be cast.
-     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     * @param bool $recursive   If true, inner entities will be cast as array as well.
      */
     public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
     {
@@ -191,7 +192,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
      * Returns the raw values of the current attributes.
      *
      * @param bool $onlyChanged If true, only return values that have changed since object creation
-     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     * @param bool $recursive   If true, inner entities will be cast as array as well.
      */
     public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
     {
@@ -249,7 +250,7 @@ public function syncOriginal()
      * was created. Or, without a parameter, checks if any
      * properties have changed.
      *
-     * @param string $key
+     * @param string|null $key class property
      */
     public function hasChanged(?string $key = null): bool
     {
@@ -310,11 +311,11 @@ protected function mapProperty(string $key)
      * Converts the given string|timestamp|DateTime|Time instance
      * into the "CodeIgniter\I18n\Time" object.
      *
-     * @param mixed $value
+     * @param DateTime|float|int|string|Time $value
      *
      * @throws Exception
      *
-     * @return mixed|Time
+     * @return Time
      */
     protected function mutateDate($value)
     {
@@ -326,13 +327,13 @@ protected function mutateDate($value)
      * Add ? at the beginning of $type  (i.e. ?string) to get NULL
      * instead of casting $value if $value === null
      *
-     * @param mixed  $value     Attribute value
-     * @param string $attribute Attribute name
-     * @param string $method    Allowed to "get" and "set"
+     * @param bool|float|int|string|null $value     Attribute value
+     * @param string                     $attribute Attribute name
+     * @param string                     $method    Allowed to "get" and "set"
      *
      * @throws CastException
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     protected function castAs($value, string $attribute, string $method = 'get')
     {
@@ -426,7 +427,7 @@ public function cast(?bool $cast = null)
      *  $this->my_property = $p;
      *  $this->setMyProperty() = $p;
      *
-     * @param mixed|null $value
+     * @param array|bool|float|int|object|string|null $value
      *
      * @throws Exception
      *
@@ -472,8 +473,9 @@ public function __set(string $key, $value = null)
      *  $p = $this->getMyProperty()
      *
      * @throws Exception
+     * @params string $key class property
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     public function __get(string $key)
     {

system/Validation/FileRules.php

@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Validation;
 
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\RequestInterface;
@@ -39,7 +40,7 @@ public function __construct(?RequestInterface $request = null)
             $request = Services::request();
         }
 
-        assert($request instanceof IncomingRequest);
+        assert($request instanceof IncomingRequest || $request instanceof CLIRequest);
 
         $this->request = $request;
     }

tests/system/I18n/TimeDifferenceTest.php

@@ -19,12 +19,23 @@
  */
 final class TimeDifferenceTest extends CIUnitTestCase
 {
+    private string $currentLocale;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         helper('date');
-        Locale::setDefault('America/Chicago');
+
+        $this->currentLocale = Locale::getDefault();
+        Locale::setDefault('en-US');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        Locale::setDefault($this->currentLocale);
     }
 
     public function testDifferenceBasics()

tests/system/I18n/TimeTest.php

@@ -25,14 +25,25 @@
  */
 final class TimeTest extends CIUnitTestCase
 {
+    private string $currentLocale;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         helper('date');
+
+        $this->currentLocale = Locale::getDefault();
         Locale::setDefault('en_US');
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        Locale::setDefault($this->currentLocale);
+    }
+
     public function testNewTimeNow()
     {
         $formatter = new IntlDateFormatter(

user_guide_src/source/database/metadata.rst

@@ -103,8 +103,8 @@ database:
 -  name - column name
 -  type - the type of the column
 -  max_length - maximum length of the column
--  primary_key - integer ``1`` if the column is a primary key (all integer ``1``, even if there are multiple primary keys), otherwise integer ``0``
--  nullable - boolean ``true`` if the column is nullable, otherwise boolean ``false``
+-  primary_key - integer ``1`` if the column is a primary key (all integer ``1``, even if there are multiple primary keys), otherwise integer ``0`` (This field is currently only available for MySQL and SQLite3)
+-  nullable - boolean ``true`` if the column is nullable, otherwise boolean ``false`` (This field is currently not available in SQL Server)
 -  default - the default value
 
 List the Indexes in a Table

user_guide_src/source/incoming/routing.rst

@@ -47,6 +47,23 @@ You can supply multiple verbs that a route should match by passing them in as an
 
 .. literalinclude:: routing/004.php
 
+Controller's Namespace
+======================
+
+If a controller name is stated without beginning with ``\``, the :ref:`routing-default-namespace` will be prepended:
+
+.. literalinclude:: routing/063.php
+
+If you put ``\`` at the beginning, it is treated as a fully qualified class name:
+
+.. literalinclude:: routing/064.php
+
+You can also specify the namespace with the ``namespace`` option:
+
+.. literalinclude:: routing/038.php
+
+See :ref:`assigning-namespace` for details.
+
 Placeholders
 ============
 
@@ -397,7 +414,7 @@ You specify an array for the filter value:
 Assigning Namespace
 -------------------
 
-While a default namespace will be prepended to the generated controllers (see below), you can also specify
+While a :ref:`routing-default-namespace` will be prepended to the generated controllers, you can also specify
 a different namespace to be used in any options array, with the ``namespace`` option. The value should be the
 namespace you want modified:
 
@@ -483,6 +500,8 @@ Routes Configuration Options
 The RoutesCollection class provides several options that affect all routes, and can be modified to meet your
 application's needs. These options are available at the top of **app/Config/Routes.php**.
 
+.. _routing-default-namespace:
+
 Default Namespace
 =================
 

user_guide_src/source/incoming/routing/063.php

@@ -0,0 +1,4 @@
+<?php
+
+// Routes to \App\Controllers\Api\Users::update()
+$routes->post('api/users', 'Api\Users::update');

user_guide_src/source/incoming/routing/064.php

@@ -0,0 +1,4 @@
+<?php
+
+// Routes to \Acme\Blog\Controllers\Home::list()
+$routes->get('blog', '\Acme\Blog\Controllers\Home::list');