From e8be829abdd4bb01841983d54aac9aaed29a89c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 14:52:17 +0900 Subject: [PATCH] refactor: use ::class to config() param --- system/Config/Services.php | 3 ++- system/HotReloader/DirectoryHasher.php | 3 ++- system/HotReloader/IteratorFilter.php | 3 ++- system/Security/Security.php | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index e337a63b8bb5..89a49b4bf468 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -76,6 +76,7 @@ use Config\Modules; use Config\Pager as PagerConfig; use Config\Paths; +use Config\Routing; use Config\Services as AppServices; use Config\Session as SessionConfig; use Config\Toolbar as ToolbarConfig; @@ -599,7 +600,7 @@ public static function routes(bool $getShared = true) return static::getSharedInstance('routes'); } - return new RouteCollection(AppServices::locator(), config(Modules::class), config('Routing')); + return new RouteCollection(AppServices::locator(), config(Modules::class), config(Routing::class)); } /** diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php index fac072fdb24a..3d9914d8c8f8 100644 --- a/system/HotReloader/DirectoryHasher.php +++ b/system/HotReloader/DirectoryHasher.php @@ -12,6 +12,7 @@ namespace CodeIgniter\HotReloader; use CodeIgniter\Exceptions\FrameworkException; +use Config\Toolbar; use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; @@ -40,7 +41,7 @@ public function hashApp(): array { $hashes = []; - $watchedDirectories = config('Toolbar')->watchedDirectories; + $watchedDirectories = config(Toolbar::class)->watchedDirectories; foreach ($watchedDirectories as $directory) { if (is_dir(ROOTPATH . $directory)) { diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index 7f40a464d0ac..db775f90061e 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HotReloader; +use Config\Toolbar; use RecursiveFilterIterator; use RecursiveIterator; @@ -27,7 +28,7 @@ public function __construct(RecursiveIterator $iterator) { parent::__construct($iterator); - $this->watchedExtensions = config('Toolbar')->watchedExtensions; + $this->watchedExtensions = config(Toolbar::class)->watchedExtensions; } /** diff --git a/system/Security/Security.php b/system/Security/Security.php index 29a9314a2e5d..d7a5d49c6f09 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -194,8 +194,7 @@ public function __construct(App $config) } if ($this->isCSRFCookie()) { - /** @var CookieConfig $cookie */ - $cookie = config('Cookie'); + $cookie = config(CookieConfig::class); $this->configureCookie($cookie); } else {