Skip to content

Fix: upgrade function never called #3642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rom1-B wants to merge 3 commits into
base: support/3.0.0
Choose a base branch
from
Open

Fix: upgrade function never called #3642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b87402
Fix: upgrade function never called
Rom1-B Apr 9, 2026
7dbe5b8
fix
Rom1-B Apr 9, 2026
069855b
clean composer
Rom1-B Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
},
Expand Down
222 changes: 4 additions & 218 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");

Expand Down
10 changes: 5 additions & 5 deletions install/upgrade_to_2.11.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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`
Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion install/upgrade_to_2.12.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
}

Expand Down
4 changes: 2 additions & 2 deletions install/upgrade_to_2.13.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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");
}
}
}
4 changes: 2 additions & 2 deletions install/upgrade_to_2.6.1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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'");
}
}

Expand Down
Loading