diff --git a/composer.json b/composer.json index a6480e6a6..0f330a9fa 100644 --- a/composer.json +++ b/composer.json @@ -8,11 +8,10 @@ "prefer-stable": true, "config": { "platform": { - "php": "8.2" + "php": "8.2" }, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "phpstan/extension-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true }, "optimize-autoloader": true, "apcu-autoloader": true @@ -21,12 +20,8 @@ "php": ">= 8.2" }, "require-dev": { - "phpstan/phpstan": "^2.1", - "phpstan/phpstan-deprecation-rules": "^2.0", - "phpstan/extension-installer": "^1.4", "glpi-project/tools": "^0.8", "glpi-project/coding-standard": "^0.7.1", - "php-parallel-lint/php-parallel-lint": "^1.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "consolidation/robo": "^5.1" }, diff --git a/composer.lock b/composer.lock index 33ad62052..3269271ad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b11c554a6ff9cf94ebc33e22d81a4e80", + "content-hash": "25f46817722de313806a5c99586b6c0b", "packages": [], "packages-dev": [ { @@ -788,67 +788,6 @@ }, "time": "2024-10-03T13:43:19+00:00" }, - { - "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6db563514f27e19595a19f45a4bf757b6401194e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", - "reference": "6db563514f27e19595a19f45a4bf757b6401194e", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": ">=5.3.0" - }, - "replace": { - "grogy/php-parallel-lint": "*", - "jakub-onderka/php-parallel-lint": "*" - }, - "require-dev": { - "nette/tester": "^1.3 || ^2.0", - "php-parallel-lint/php-console-highlighter": "0.* || ^1.0", - "squizlabs/php_codesniffer": "^3.6" - }, - "suggest": { - "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet" - }, - "bin": [ - "parallel-lint" - ], - "type": "library", - "autoload": { - "classmap": [ - "./src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "ahoj@jakubonderka.cz" - } - ], - "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", - "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", - "keywords": [ - "lint", - "static analysis" - ], - "support": { - "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" - }, - "time": "2024-03-27T12:14:49+00:00" - }, { "name": "phpowermove/docblock", "version": "v4.0", @@ -901,159 +840,6 @@ }, "time": "2021-09-22T16:57:06+00:00" }, - { - "name": "phpstan/extension-installer", - "version": "1.4.3", - "source": { - "type": "git", - "url": "https://github.com/phpstan/extension-installer.git", - "reference": "85e90b3942d06b2326fba0403ec24fe912372936" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/85e90b3942d06b2326fba0403ec24fe912372936", - "reference": "85e90b3942d06b2326fba0403ec24fe912372936", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0", - "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.9.0 || ^2.0" - }, - "require-dev": { - "composer/composer": "^2.0", - "php-parallel-lint/php-parallel-lint": "^1.2.0", - "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0" - }, - "type": "composer-plugin", - "extra": { - "class": "PHPStan\\ExtensionInstaller\\Plugin" - }, - "autoload": { - "psr-4": { - "PHPStan\\ExtensionInstaller\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Composer plugin for automatic installation of PHPStan extensions", - "keywords": [ - "dev", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.4.3" - }, - "time": "2024-09-04T20:21:43+00:00" - }, - { - "name": "phpstan/phpstan", - "version": "2.1.29", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan-phar-composer-source.git", - "reference": "git" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d618573eed4a1b6b75e37b2e0b65ac65c885d88e", - "reference": "d618573eed4a1b6b75e37b2e0b65ac65c885d88e", - "shasum": "" - }, - "require": { - "php": "^7.4|^8.0" - }, - "conflict": { - "phpstan/phpstan-shim": "*" - }, - "bin": [ - "phpstan", - "phpstan.phar" - ], - "type": "library", - "autoload": { - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPStan - PHP Static Analysis Tool", - "keywords": [ - "dev", - "static analysis" - ], - "support": { - "docs": "https://phpstan.org/user-guide/getting-started", - "forum": "https://github.com/phpstan/phpstan/discussions", - "issues": "https://github.com/phpstan/phpstan/issues", - "security": "https://github.com/phpstan/phpstan/security/policy", - "source": "https://github.com/phpstan/phpstan-src" - }, - "funding": [ - { - "url": "https://github.com/ondrejmirtes", - "type": "github" - }, - { - "url": "https://github.com/phpstan", - "type": "github" - } - ], - "time": "2025-09-25T06:58:18+00:00" - }, - { - "name": "phpstan/phpstan-deprecation-rules", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", - "reference": "468e02c9176891cc901143da118f09dc9505fc2f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/468e02c9176891cc901143da118f09dc9505fc2f", - "reference": "468e02c9176891cc901143da118f09dc9505fc2f", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^2.1.15" - }, - "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^9.6" - }, - "type": "phpstan-extension", - "extra": { - "phpstan": { - "includes": [ - "rules.neon" - ] - } - }, - "autoload": { - "psr-4": { - "PHPStan\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", - "support": { - "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", - "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.3" - }, - "time": "2025-05-14T10:56:57+00:00" - }, { "name": "psr/container", "version": "2.0.2", @@ -2565,15 +2351,15 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">= 8.2" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.2" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/hook.php b/hook.php index c745a3bb4..dd4d43cfc 100644 --- a/hook.php +++ b/hook.php @@ -54,6 +54,8 @@ function plugin_formcreator_install() { return false; } + $install->upgrade($migration); + // Check if migration to GLPI 11 native forms is needed $migration->displayMessage("Migration to GLPI 11 native forms may be available. Check Administration > Plugins > Formcreator for migration status."); diff --git a/install/upgrade_to_2.11.php b/install/upgrade_to_2.11.php index 3afae26fa..94292b099 100644 --- a/install/upgrade_to_2.11.php +++ b/install/upgrade_to_2.11.php @@ -51,7 +51,7 @@ public function upgrade(Migration $migration) { $migration->addPostQuery("UPDATE `$table` SET `width`='4' WHERE `width` < '1'"); // Reorder questions from 0 instead of 1 $migration->migrationOneTable($table); - $result = $DB->query("SELECT glpi_plugin_formcreator_sections.id FROM glpi_plugin_formcreator_sections + $result = $DB->doQuery("SELECT glpi_plugin_formcreator_sections.id FROM glpi_plugin_formcreator_sections INNER JOIN glpi_plugin_formcreator_questions ON (glpi_plugin_formcreator_sections.id = glpi_plugin_formcreator_questions.plugin_formcreator_sections_id) GROUP BY glpi_plugin_formcreator_sections.id HAVING MIN(glpi_plugin_formcreator_questions.`row`) > 0"); @@ -76,7 +76,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $id = $row['id']; $uuid = plugin_formcreator_getUuid(); - $DB->query("UPDATE `$table` + $DB->doQuery("UPDATE `$table` SET `uuid`='$uuid' WHERE `id`='$id'" ) or plugin_formcreator_upgrade_error($migration); @@ -159,7 +159,7 @@ public function upgrade(Migration $migration) { // Merge targettickets_actors and targetchanges_actors // Need a new table now - $DB->query("CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targets_actors` ( + $DB->doQuery("CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targets_actors` ( `id` int(11) NOT NULL AUTO_INCREMENT, `itemtype` varchar(255) DEFAULT NULL, `items_id` int(11) NOT NULL, @@ -264,7 +264,7 @@ public function migrateTargetTicket_Actor() { if (!$DB->tableExists($table)) { return; } - $DB->query( + $DB->doQuery( "INSERT INTO `glpi_plugin_formcreator_targets_actors` (`itemtype`, `items_id`, `actor_role`, `actor_type`, `actor_value`, `use_notification`, `uuid`) SELECT 'PluginFormcreatorTargetTicket', `plugin_formcreator_targettickets_id`, `actor_role`, `actor_type`, `actor_value`, `use_notification`, `uuid` @@ -281,7 +281,7 @@ public function migrateTargetChange_Actor() { return; } - $DB->query( + $DB->doQuery( "INSERT INTO `glpi_plugin_formcreator_targets_actors` (`itemtype`, `items_id`, `actor_role`, `actor_type`, `actor_value`, `use_notification`, `uuid`) SELECT 'PluginFormcreatorTargetChange', `plugin_formcreator_targetchanges_id`, `actor_role`, `actor_type`, `actor_value`, `use_notification`, `uuid` diff --git a/install/upgrade_to_2.12.php b/install/upgrade_to_2.12.php index f80b552e8..d2e2adf1e 100644 --- a/install/upgrade_to_2.12.php +++ b/install/upgrade_to_2.12.php @@ -69,7 +69,7 @@ public function upgrade(Migration $migration) { $this->migration->addField($table, 'changetemplates_id', 'integer', ['value' => '0', 'after' => 'target_name']); $table = 'glpi_plugin_formcreator_targettickets'; - $DB->query("UPDATE `$table` SET `tickettemplates_id`='0' WHERE `tickettemplates_id` IS NULL"); + $DB->doQuery("UPDATE `$table` SET `tickettemplates_id`='0' WHERE `tickettemplates_id` IS NULL"); $this->migration->changeField($table, 'tickettemplates_id', 'tickettemplates_id', 'integer', ['value' => '0', 'after' => 'type_question']); } diff --git a/install/upgrade_to_2.13.php b/install/upgrade_to_2.13.php index 9d40cbfa8..357a9e6e3 100644 --- a/install/upgrade_to_2.13.php +++ b/install/upgrade_to_2.13.php @@ -487,7 +487,7 @@ protected function migrateFkToUnsignedInt() { 'FROM' => $table, ]); $newId = (int) ($rows->current()['max_id'] + 1); - $DB->query("UPDATE `$table` SET `id`='$newId' WHERE `id` = 0"); + $DB->doQuery("UPDATE `$table` SET `id`='$newId' WHERE `id` = 0"); } } $this->migration->changeField($table, 'id', 'id', 'int ' . DBConnection::getDefaultPrimaryKeySignOption() . ' not null auto_increment'); @@ -557,7 +557,7 @@ public function migrateTablesToDynamic() { if (!$DB->tableExists($table)) { continue; } - $DB->query("ALTER TABLE `$table` ROW_FORMAT = DYNAMIC"); + $DB->doQuery("ALTER TABLE `$table` ROW_FORMAT = DYNAMIC"); } } } diff --git a/install/upgrade_to_2.6.1.php b/install/upgrade_to_2.6.1.php index cc242a4b0..48f681e48 100644 --- a/install/upgrade_to_2.6.1.php +++ b/install/upgrade_to_2.6.1.php @@ -53,7 +53,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $answer = Toolbox::addslashes_deep(html_entity_decode($row['answer'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_answers` SET `answer`='$answer' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_answers` SET `answer`='$answer' WHERE `id` = '$id'"); } $request = [ @@ -63,7 +63,7 @@ public function upgrade(Migration $migration) { $id = $row['id']; $name = Toolbox::addslashes_deep(html_entity_decode($row['name'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_questions` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_questions` SET `name`='$name' WHERE `id` = '$id'"); } } diff --git a/install/upgrade_to_2.6.3.php b/install/upgrade_to_2.6.3.php index 179beb646..ffc4f2ee4 100644 --- a/install/upgrade_to_2.6.3.php +++ b/install/upgrade_to_2.6.3.php @@ -41,7 +41,7 @@ public function upgrade(Migration $migration) { // Change id of search option for status of form_answer $table = 'glpi_displaypreferences'; $query = "UPDATE `$table` SET `num`='8' WHERE `itemtype`='PluginFormcreatorForm_Answer' AND `num`='1'"; - $DB->query($query); + $DB->doQuery($query); // Remove abusive encding in sections $table = 'glpi_plugin_formcreator_sections'; @@ -51,7 +51,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $name = Toolbox::addslashes_deep(html_entity_decode($row['name'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); } // Remove abusive encoding in targets @@ -62,7 +62,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $name = Toolbox::addslashes_deep(html_entity_decode($row['name'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); } // Remove abusive encoding in target tickets @@ -73,7 +73,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $name = Toolbox::addslashes_deep(html_entity_decode($row['name'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); } // Remove abusive encoding in target changes @@ -84,7 +84,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $name = Toolbox::addslashes_deep(html_entity_decode($row['name'], ENT_QUOTES|ENT_HTML5)); $id = $row['id']; - $DB->query("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `$table` SET `name`='$name' WHERE `id` = '$id'"); } } diff --git a/install/upgrade_to_2.6.php b/install/upgrade_to_2.6.php index ca6c6bc13..646d8c2bc 100644 --- a/install/upgrade_to_2.6.php +++ b/install/upgrade_to_2.6.php @@ -81,12 +81,12 @@ public function upgrade(Migration $migration) { INNER JOIN `$formTable` ON (`$table`.`plugin_formcreator_forms_id` = `$formTable`.`id`) SET `users_id_validator` = `validator_id` WHERE `$formTable`.`validation_required` = '1'"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); $query = "UPDATE `$table` INNER JOIN `$formTable` ON (`$table`.`plugin_formcreator_forms_id` = `$formTable`.`id`) SET `groups_id_validator` = `validator_id` WHERE `$formTable`.`validation_required` = '2'"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); $migration->dropKey($table, 'validator_id'); $migration->dropField($table, 'validator_id'); @@ -137,7 +137,7 @@ public function upgrade(Migration $migration) { INDEX `plugin_formcreator_targettickets_id` (`plugin_formcreator_targettickets_id`), INDEX `item` (`itemtype`,`items_id`) ) ENGINE=InnoDB DEFAULT CHARSET=$defaultCharset COLLATE=$defaultCollation ROW_FORMAT=DYNAMIC;"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } // add uuid and generate for existing rows @@ -155,7 +155,7 @@ public function upgrade(Migration $migration) { $query = "UPDATE $table SET `uuid` = '" . plugin_formcreator_getUuid() . "' WHERE `id` = " . $targetTicket['id']; - $DB->query($query); + $DB->doQuery($query); } $enum_category_rule = "'".implode("', '", ['none', 'specific', 'answer'])."'"; @@ -163,7 +163,7 @@ public function upgrade(Migration $migration) { if (!$DB->fieldExists($table, 'category_rule', false)) { $query = "ALTER TABLE `$table` ADD `category_rule` ENUM($enum_category_rule) NOT NULL DEFAULT 'none' AFTER `tag_specifics`;"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } else { $current_enum_category_rule = PluginFormcreatorCommon::getEnumValues($table, 'category_rule'); if (count($current_enum_category_rule) != count(['none', 'specific', 'answer'])) { @@ -171,7 +171,7 @@ public function upgrade(Migration $migration) { CHANGE COLUMN `category_rule` `category_rule` ENUM($enum_category_rule) NOT NULL DEFAULT 'none'"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } } @@ -180,7 +180,7 @@ public function upgrade(Migration $migration) { if (!$DB->fieldExists('glpi_plugin_formcreator_targetchanges', 'urgency_rule', false)) { $query = "ALTER TABLE `glpi_plugin_formcreator_targetchanges` ADD `urgency_rule` ENUM($enum_urgency_rule) NOT NULL DEFAULT 'none' AFTER `due_date_period`;"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } else { $current_enum_urgency_rule = PluginFormcreatorCommon::getEnumValues('glpi_plugin_formcreator_targetchanges', 'urgency_rule'); if (count($current_enum_urgency_rule) != count(['none', 'specific', 'answer'])) { @@ -188,7 +188,7 @@ public function upgrade(Migration $migration) { CHANGE COLUMN `urgency_rule` `urgency_rule` ENUM($enum_urgency_rule) NOT NULL DEFAULT 'none'"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } } $migration->addField('glpi_plugin_formcreator_targetchanges', 'urgency_question', 'integer', ['after' => 'urgency_rule']); @@ -197,7 +197,7 @@ public function upgrade(Migration $migration) { if (!$DB->fieldExists('glpi_plugin_formcreator_targetchanges', 'category_rule', false)) { $query = "ALTER TABLE `glpi_plugin_formcreator_targetchanges` ADD `category_rule` ENUM($enum_category_rule) NOT NULL DEFAULT 'none' AFTER `tag_specifics`;"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } else { $current_enum_category_rule = PluginFormcreatorCommon::getEnumValues('glpi_plugin_formcreator_targetchanges', 'category_rule'); if (count($current_enum_category_rule) != count(['none', 'specific', 'answer'])) { @@ -205,7 +205,7 @@ public function upgrade(Migration $migration) { CHANGE COLUMN `category_rule` `category_rule` ENUM($enum_category_rule) NOT NULL DEFAULT 'none'"; - $DB->query($query) or plugin_formcreator_upgrade_error($migration); + $DB->doQuery($query) or plugin_formcreator_upgrade_error($migration); } } $migration->addField('glpi_plugin_formcreator_targetchanges', 'category_question', 'integer', ['after' => 'category_rule']); diff --git a/install/upgrade_to_2.7.php b/install/upgrade_to_2.7.php index d0c77293e..ecddb2763 100644 --- a/install/upgrade_to_2.7.php +++ b/install/upgrade_to_2.7.php @@ -131,7 +131,7 @@ public function upgrade(Migration $migration) { $defaultKeySign = DBConnection::getDefaultPrimaryKeySignOption(); $table = 'glpi_plugin_formcreator_questions'; if ($DB->fieldExists($table, 'regex')) { - $DB->query( + $DB->doQuery( "CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionregexes` ( `id` int(11) $defaultKeySign NOT NULL AUTO_INCREMENT, `plugin_formcreator_questions_id` int(11) NOT NULL, @@ -150,7 +150,7 @@ public function upgrade(Migration $migration) { $id = $row['id']; $regex = $DB->escape($row['regex']); $uuid = plugin_formcreator_getUuid(); - $DB->query("INSERT INTO `glpi_plugin_formcreator_questionregexes` + $DB->doQuery("INSERT INTO `glpi_plugin_formcreator_questionregexes` SET `plugin_formcreator_questions_id`='$id', `fieldname`='regex', `regex`='$regex', `uuid`='$uuid'" ) or plugin_formcreator_upgrade_error($migration); } @@ -160,7 +160,7 @@ public function upgrade(Migration $migration) { // Migrate range question parameters $table = 'glpi_plugin_formcreator_questions'; if ($DB->fieldExists($table, 'range_min')) { - $DB->query( + $DB->doQuery( "CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionranges` ( `id` int(11) $defaultKeySign NOT NULL AUTO_INCREMENT, `plugin_formcreator_questions_id` int(11) NOT NULL, @@ -181,7 +181,7 @@ public function upgrade(Migration $migration) { $rangeMin = $DB->escape($row['range_min']); $rangeMax = $DB->escape($row['range_max']); $uuid = plugin_formcreator_getUuid(); - $DB->query("INSERT INTO `glpi_plugin_formcreator_questionranges` + $DB->doQuery("INSERT INTO `glpi_plugin_formcreator_questionranges` SET `plugin_formcreator_questions_id`='$id', `fieldname`='range', `range_min`='$rangeMin', `range_max`='$rangeMax', `uuid`='$uuid'" ) or plugin_formcreator_upgrade_error($migration); } @@ -207,7 +207,7 @@ public function upgrade(Migration $migration) { foreach ($DB->request($request) as $row) { $answer = Toolbox::addslashes_deep(html_entity_decode($row['answer'])); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_answers` SET `answer`='$answer' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_answers` SET `answer`='$answer' WHERE `id` = '$id'"); } } @@ -222,14 +222,14 @@ public function upgrade(Migration $migration) { $values = Toolbox::addslashes_deep(html_entity_decode($row['values'])); $defaultValues = Toolbox::addslashes_deep(html_entity_decode($row['default_values'])); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_questions` SET `values` = '$values', `default_values` = '$defaultValues' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_questions` SET `values` = '$values', `default_values` = '$defaultValues' WHERE `id` = '$id'"); } // decode html entities in name of questions foreach ($DB->request(['FROM' => 'glpi_plugin_formcreator_questions']) as $row) { $name = Toolbox::addslashes_deep(html_entity_decode($row['name'])); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_questions` SET `name`='$name' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_questions` SET `name`='$name' WHERE `id` = '$id'"); } // Add properties for dropdown of ticket categories @@ -250,7 +250,7 @@ public function upgrade(Migration $migration) { } $id = $row['id']; $values = json_encode($values); - $DB->query("UPDATE `glpi_plugin_formcreator_questions` SET `values`='$values' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_questions` SET `values`='$values' WHERE `id` = '$id'"); } } @@ -274,7 +274,7 @@ public function upgrade(Migration $migration) { if (!is_array(json_decode($row['answer'], true))) { $id = $row['id']; $answer = json_encode([$row['answer']]); - $DB->query("UPDATE `glpi_plugin_formcreator_answers` SET `answer` = '$answer' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_answers` SET `answer` = '$answer' WHERE `id` = '$id'"); } } @@ -299,7 +299,7 @@ public function upgrade(Migration $migration) { 'glpi_plugin_formcreator_issues', ]; foreach ($tables as $table) { - $DB->query("UPDATE `$table` SET `name`='' WHERE `name` IS NULL"); + $DB->doQuery("UPDATE `$table` SET `name`='' WHERE `name` IS NULL"); $migration->changeField($table, 'name', 'name', 'VARCHAR(255) NOT NULL DEFAULT \'\' AFTER `id`'); } @@ -312,7 +312,7 @@ public function upgrade(Migration $migration) { $description = Toolbox::addslashes_deep(html_entity_decode($row['description'])); $content = Toolbox::addslashes_deep(html_entity_decode($row['content'])); $id = $row['id']; - $DB->query("UPDATE `glpi_plugin_formcreator_forms` SET `name` = '$name', `description` = '$description', `content` = '$content' WHERE `id` = '$id'"); + $DB->doQuery("UPDATE `glpi_plugin_formcreator_forms` SET `name` = '$name', `description` = '$description', `content` = '$content' WHERE `id` = '$id'"); } } diff --git a/install/upgrade_to_2.8.1.php b/install/upgrade_to_2.8.1.php index b5cbbdddc..5f9532a14 100644 --- a/install/upgrade_to_2.8.1.php +++ b/install/upgrade_to_2.8.1.php @@ -39,7 +39,7 @@ public function upgrade(Migration $migration) { global $DB; $table = 'glpi_plugin_formcreator_issues'; - $DB->query("UPDATE `$table` SET `name`='' WHERE `name` IS NULL"); + $DB->doQuery("UPDATE `$table` SET `name`='' WHERE `name` IS NULL"); $migration->changeField($table, 'name', 'name', 'string', ['after' => 'id', 'value' => '']); } diff --git a/install/upgrade_to_2.9.php b/install/upgrade_to_2.9.php index 5524c9383..c723661d6 100644 --- a/install/upgrade_to_2.9.php +++ b/install/upgrade_to_2.9.php @@ -300,7 +300,7 @@ public function upgrade(Migration $migration) { $migration->migrationOneTable($table); // Fix possible nulls (despite those lines are definetely broken not usable; maybe a form does not behaves properly showing / hiding a question) - $DB->query("UPDATE `$table` SET `show_field` = 0 WHERE `show_field` IS NULL"); + $DB->doQuery("UPDATE `$table` SET `show_field` = 0 WHERE `show_field` IS NULL"); $migration->changeField($table, 'show_field', 'plugin_formcreator_questions_id', 'integer', ['value' => '0', 'comment' => 'question to test for the condition']); $migration->dropKey($table, 'plugin_formcreator_questions_id');