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

kenjis · kenjis · commit eafb769b00f2 · 2024-02-02T15:40:31.000+09:00
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
@@ -40,7 +40,7 @@ class Logger implements LoggerInterface
      * Used by the logThreshold Config setting to define
      * which errors to show.
      *
-     * @var array<string, integer>
+     * @var array<string, int>
      */
     protected $logLevels = [
         'emergency' => 1,

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Logger implements LoggerInterface`
`40`	`40`	`* Used by the logThreshold Config setting to define`
`41`	`41`	`* which errors to show.`
`42`	`42`	`*`
`43`		`- * @var array<string, integer>`
	`43`	`+ * @var array<string, int>`
`44`	`44`	`*/`
`45`	`45`	`protected $logLevels = [`
`46`	`46`	`'emergency' => 1,`