Small cs fix

glpi-project · Nov 25, 2024 · e128473 · e128473
1 parent d3e30d8
commit e128473
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/js/glpi_install.js b/js/glpi_install.js
@@ -48,6 +48,12 @@
 
         success_element.querySelector('button').setAttribute('disabled', 'disabled');
 
+        const create_progress_bar = window.create_progress_bar;
+
+        if (typeof create_progress_bar === 'undefined') {
+            throw new Error('Function "create_progress_bar" is not defined. Did you load the associated JS file correctly?');
+        }
+
         const progress = create_progress_bar({
             key: progress_key,
             container: messages_container,

diff --git a/src/Glpi/Config/LegacyConfigurators/StandardIncludes.php b/src/Glpi/Config/LegacyConfigurators/StandardIncludes.php
@@ -119,8 +119,7 @@ public function execute(): void
 
             //Options from DB, do not touch this part.
             if (
-                !$is_installing
-                && !Config::loadLegacyConfiguration()
+                !Config::loadLegacyConfiguration()
                 && !$skip_db_checks
             ) {
                 echo "Error accessing config table";

diff --git a/src/Toolbox.php b/src/Toolbox.php
@@ -2064,7 +2064,7 @@ public static function cleanNewLines($string)
      *
      * @param string   $lang     Language to install
      * @param ?DBmysql $database Database instance to use, will fallback to a new instance of DB if null
-     * @param ?\Closure<?int, ?int, ?string> $progressCallback
+     * @param ?\Closure $progressCallback
      *
      * @return void
      *
@@ -2079,8 +2079,7 @@ public static function createSchema($lang = 'en_GB', ?DBmysql $database = null,
         global $DB;
 
         if (!$progressCallback) {
-            $progressCallback = function ($a = null, $b = null, $c = null)
-            {
+            $progressCallback = function (?int $a = null, ?int $b = null, ?string $c = null) {
             };
         }
 
@@ -2108,7 +2107,9 @@ public static function createSchema($lang = 'en_GB', ?DBmysql $database = null,
             $number_of_queries += \count($data);
         }
         $number_of_queries += 8; // For other calls
-        if (defined('GLPI_SYSTEM_CRON')) { $number_of_queries++; }
+        if (defined('GLPI_SYSTEM_CRON')) {
+            $number_of_queries++;
+        }
 
         $progressCallback(null, $number_of_queries, __('Creating database structure…'));