Skip to content

Commit 7d3b36a

Browse files
authored
Merge pull request #7619 from kenjis/refactor-config-classname-4.4
[4.4] refactor: use ::class to config() param
2 parents 37b5c21 + e8be829 commit 7d3b36a

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

system/Config/Services.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
use Config\Modules;
7777
use Config\Pager as PagerConfig;
7878
use Config\Paths;
79+
use Config\Routing;
7980
use Config\Services as AppServices;
8081
use Config\Session as SessionConfig;
8182
use Config\Toolbar as ToolbarConfig;
@@ -599,7 +600,7 @@ public static function routes(bool $getShared = true)
599600
return static::getSharedInstance('routes');
600601
}
601602

602-
return new RouteCollection(AppServices::locator(), config(Modules::class), config('Routing'));
603+
return new RouteCollection(AppServices::locator(), config(Modules::class), config(Routing::class));
603604
}
604605

605606
/**

system/HotReloader/DirectoryHasher.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\HotReloader;
1313

1414
use CodeIgniter\Exceptions\FrameworkException;
15+
use Config\Toolbar;
1516
use FilesystemIterator;
1617
use RecursiveDirectoryIterator;
1718
use RecursiveIteratorIterator;
@@ -40,7 +41,7 @@ public function hashApp(): array
4041
{
4142
$hashes = [];
4243

43-
$watchedDirectories = config('Toolbar')->watchedDirectories;
44+
$watchedDirectories = config(Toolbar::class)->watchedDirectories;
4445

4546
foreach ($watchedDirectories as $directory) {
4647
if (is_dir(ROOTPATH . $directory)) {

system/HotReloader/IteratorFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\HotReloader;
1313

14+
use Config\Toolbar;
1415
use RecursiveFilterIterator;
1516
use RecursiveIterator;
1617

@@ -27,7 +28,7 @@ public function __construct(RecursiveIterator $iterator)
2728
{
2829
parent::__construct($iterator);
2930

30-
$this->watchedExtensions = config('Toolbar')->watchedExtensions;
31+
$this->watchedExtensions = config(Toolbar::class)->watchedExtensions;
3132
}
3233

3334
/**

system/Security/Security.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ public function __construct(App $config)
194194
}
195195

196196
if ($this->isCSRFCookie()) {
197-
/** @var CookieConfig $cookie */
198-
$cookie = config('Cookie');
197+
$cookie = config(CookieConfig::class);
199198

200199
$this->configureCookie($cookie);
201200
} else {

0 commit comments

Comments
 (0)