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

kenjis · kenjis · commit a6374deda4e9 · 2024-09-17T09:51:27.000+09:00
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

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public function debug(string\|\Stringable $message, array $context = []): void;`
`89`	`89`	`/**`
`90`	`90`	`* Logs with an arbitrary level.`
`91`	`91`	`*`
	`92`	`+ * @param mixed $level`
`92`	`93`	`* @param mixed[] $context`
`93`	`94`	`*`
`94`	`95`	`* @throws \Psr\Log\InvalidArgumentException`