From 6912322930999539e45fdb880cb180bad129880d Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sun, 13 Apr 2025 23:57:00 +0800 Subject: [PATCH] refactor: import FQCNs --- .../tests/_support/Libraries/ConfigReader.php | 4 ++- preload.php | 7 ++-- public/index.php | 7 ++-- spark | 7 ++-- system/Debug/Toolbar/Views/toolbar.tpl.php | 35 ++++++++++--------- .../Config/fixtures/RegistrarConfig.php | 4 ++- tests/system/Config/fixtures/SimpleConfig.php | 4 ++- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/admin/starter/tests/_support/Libraries/ConfigReader.php b/admin/starter/tests/_support/Libraries/ConfigReader.php index 40d057acbe22..0bb4a8fcf598 100644 --- a/admin/starter/tests/_support/Libraries/ConfigReader.php +++ b/admin/starter/tests/_support/Libraries/ConfigReader.php @@ -2,6 +2,8 @@ namespace Tests\Support\Libraries; +use Config\App; + /** * Class ConfigReader * @@ -9,7 +11,7 @@ * loading external values. Used to read actual local values from * a config file. */ -class ConfigReader extends \Config\App +class ConfigReader extends App { public function __construct() { diff --git a/preload.php b/preload.php index 0b453122345e..86322d5e7137 100644 --- a/preload.php +++ b/preload.php @@ -9,6 +9,9 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Boot; +use Config\Paths; + /* *--------------------------------------------------------------- * Sample file for Preloading @@ -69,10 +72,10 @@ public function __construct() private function loadAutoloader(): void { - $paths = new Config\Paths(); + $paths = new Paths(); require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; - CodeIgniter\Boot::preload($paths); + Boot::preload($paths); } /** diff --git a/public/index.php b/public/index.php index eb7f5c988838..a0a20db43dbf 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,8 @@ systemDirectory . '/Boot.php'; -exit(CodeIgniter\Boot::bootWeb($paths)); +exit(Boot::bootWeb($paths)); diff --git a/spark b/spark index 856dc3f8a227..e7871ea8e682 100755 --- a/spark +++ b/spark @@ -10,6 +10,9 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Boot; +use Config\Paths; + /* * -------------------------------------------------------------------- * CODEIGNITER COMMAND-LINE TOOLS @@ -76,9 +79,9 @@ chdir(FCPATH); require FCPATH . '../app/Config/Paths.php'; // ^^^ Change this line if you move your application folder -$paths = new Config\Paths(); +$paths = new Paths(); // LOAD THE FRAMEWORK BOOTSTRAP FILE require $paths->systemDirectory . '/Boot.php'; -exit(CodeIgniter\Boot::bootSpark($paths)); +exit(Boot::bootSpark($paths)); diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 8179c1a8e631..0768f62915bb 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -1,21 +1,24 @@