Replace Kernel loadCommonGlobalConfig() call with a simple boot()

glpi-project · Dec 18, 2024 · 6975a17 · 6975a17
1 parent 5449e41
commit 6975a17
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 17 deletions.
diff --git a/.phpstan-baseline.php b/.phpstan-baseline.php
@@ -2437,12 +2437,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Glpi/Console/Application.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property Glpi\\\\Console\\\\Application\\:\\:\\$error_handler is unused\\.$#',
-	'identifier' => 'property.unused',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Glpi/Console/Application.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Strict comparison using \\!\\=\\= between null and \'development\' will always evaluate to true\\.$#',
 	'identifier' => 'notIdentical.alwaysTrue',

diff --git a/front/cron.php b/front/cron.php
@@ -43,7 +43,7 @@
     require_once dirname(__DIR__) . '/vendor/autoload.php';
 
     $kernel = new \Glpi\Kernel\Kernel();
-    $kernel->loadCommonGlobalConfig();
+    $kernel->boot();
 }
 
 /**

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -55,7 +55,7 @@
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new Kernel('testing');
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 if (!file_exists(GLPI_CONFIG_DIR . '/config_db.php')) {
     echo("\nConfiguration file for tests not found\n\nrun: php bin/console database:install --env=testing ...\n\n");

diff --git a/tests/bin/test-updated-data b/tests/bin/test-updated-data
@@ -37,7 +37,7 @@
 require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel('testing');
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 $command = new \Glpi\Tests\Command\TestUpdatedDataCommand();
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -53,7 +53,7 @@
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new Kernel('testing');
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 if (!file_exists(GLPI_CONFIG_DIR . '/config_db.php')) {
     echo("\nConfiguration file for tests not found\n\nrun: php bin/console database:install --env=testing ...\n\n");

diff --git a/tools/cachebench.php b/tools/cachebench.php
@@ -41,7 +41,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 define('PER_LEVEL', 8);
 define('COUNT', 1024);

diff --git a/tools/fake_metrics.php b/tools/fake_metrics.php
@@ -41,7 +41,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 $printers_id = false;
 $networkports_id = false;

diff --git a/tools/fk_generate.php b/tools/fk_generate.php
@@ -41,7 +41,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 $DB->query("SET FOREIGN_KEY_CHECKS = '0';");
 $result = $DB->list_tables();

diff --git a/tools/getsearchoptions.php b/tools/getsearchoptions.php
@@ -43,7 +43,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 if (isset($_SERVER['argv'])) {
     for ($i = 1; $i < $_SERVER['argc']; $i++) {

diff --git a/tools/inventory.php b/tools/inventory.php
@@ -39,7 +39,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new Kernel('testing');
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 $conf = new Conf();
 if ($conf->enabled_inventory != 1) {

diff --git a/tools/testmail.php b/tools/testmail.php
@@ -41,7 +41,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 if (isset($_SERVER['argc'])) {
     for ($i = 1; $i < $_SERVER['argc']; $i++) {

diff --git a/tools/update_registered_ids.php b/tools/update_registered_ids.php
@@ -41,7 +41,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $kernel = new \Glpi\Kernel\Kernel();
-$kernel->loadCommonGlobalConfig();
+$kernel->boot();
 
 $registeredid = new RegisteredID();
 $manufacturer = new Manufacturer();