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

kenjis · kenjis · commit 1bfca2bd9653 · 2022-10-16T08:22:04.000+09:00
diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
@@ -25,7 +25,6 @@
         __DIR__ . '/public',
     ])
     ->exclude(['Views/errors/html'])
-    ->notName('#Logger\.php$#')
     ->append([
         __DIR__ . '/admin/starter/builds',
     ]);
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
@@ -2,8 +2,8 @@
 
 namespace Config;
 
-use CodeIgniter\Log\Handlers\FileHandler;
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Log\Handlers\FileHandler;
 
 class Logger extends BaseConfig
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Config;`
`4`	`4`
`5`		`-use CodeIgniter\Log\Handlers\FileHandler;`
`6`	`5`	`use CodeIgniter\Config\BaseConfig;`
	`6`	`+use CodeIgniter\Log\Handlers\FileHandler;`
`7`	`7`
`8`	`8`	`class Logger extends BaseConfig`
`9`	`9`	`{`