Merge pull request #7619 from kenjis/refactor-config-classname-4.4

[4.4] refactor: use ::class to config() param
codeigniter4 · Jun 26, 2023 · 7d3b36a · 7d3b36a
2 parents 37b5c21 + e8be829
commit 7d3b36a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 {