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

codeigniter4 · Sep 17, 2024 · a6374de · a6374de
2 parents 0735e19 + caf314b
commit a6374de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php
@@ -89,6 +89,7 @@ public function debug(string|\Stringable $message, array $context = []): void;
     /**
      * Logs with an arbitrary level.
      *
+     * @param mixed $level
      * @param mixed[] $context
      *
      * @throws \Psr\Log\InvalidArgumentException

diff --git a/user_guide_src/source/installation/upgrade_455.rst b/user_guide_src/source/installation/upgrade_455.rst
@@ -32,12 +32,12 @@ and it is recommended that you merge the updated versions with your application:
 Config
 ------
 
-- composer.json
+- preload.php
 
 All Changes
 ===========
 
 This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
-- composer.json
+- preload.php