From aa5c6482c0ea06a1b5a7f0af697f734be6a71f64 Mon Sep 17 00:00:00 2001 From: Rom1-B <8530352+Rom1-B@users.noreply.github.com> Date: Tue, 18 Aug 2026 14:24:04 +0200 Subject: [PATCH 1/7] feature/glpi-12.0 --- .github/workflows/continuous-integration.yml | 2 +- CHANGELOG.md | 4 ++++ inc/config.class.php | 2 +- inc/group_group.class.php | 8 ++++---- inc/taskmanager.class.php | 2 +- inc/ticket.class.php | 2 +- setup.php | 4 ++-- templates/config.html.twig | 1 - templates/escalade_form.html.twig | 1 - templates/group_group.html.twig | 1 - templates/user.html.twig | 1 - 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d6c1105d..f5ad37b5 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,7 +20,7 @@ jobs: name: "Generate CI matrix" uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1" with: - glpi-version: "11.0.x" + glpi-version: "12.0.x" ci: name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}" needs: "generate-ci-matrix" diff --git a/CHANGELOG.md b/CHANGELOG.md index c579fcf3..820e1765 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Added + +- GLPI 12 compatibility + ### Fixed - Fix flaky escalation test on solve/reject-solution data sets diff --git a/inc/config.class.php b/inc/config.class.php index e0b84cdb..01f7d34d 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -32,7 +32,7 @@ class PluginEscaladeConfig extends CommonDBTM { - public static $rightname = 'config'; + public static string $rightname = 'config'; public static function getMenuName() { diff --git a/inc/group_group.class.php b/inc/group_group.class.php index 0228c363..0d3c98e2 100644 --- a/inc/group_group.class.php +++ b/inc/group_group.class.php @@ -38,13 +38,13 @@ class PluginEscaladeGroup_Group extends CommonDBRelation { // From CommonDBRelation - public static $itemtype_1 = 'Group'; + public static ?string $itemtype_1 = 'Group'; - public static $items_id_1 = 'groups_id_source'; + public static ?string $items_id_1 = 'groups_id_source'; - public static $itemtype_2 = 'Group'; + public static ?string $itemtype_2 = 'Group'; - public static $items_id_2 = 'groups_id_destination'; + public static ?string $items_id_2 = 'groups_id_destination'; public function getForbiddenStandardMassiveAction() { diff --git a/inc/taskmanager.class.php b/inc/taskmanager.class.php index aba8ce0e..70d7e818 100644 --- a/inc/taskmanager.class.php +++ b/inc/taskmanager.class.php @@ -42,7 +42,7 @@ public static function setTicketTask(array $input): void return; } - if (!empty(self::$ticket_task->input)) { + if (self::$ticket_task->input !== [] && self::$ticket_task->input !== false) { return; } diff --git a/inc/ticket.class.php b/inc/ticket.class.php index 31ab26a8..7ac16fdd 100644 --- a/inc/ticket.class.php +++ b/inc/ticket.class.php @@ -484,7 +484,7 @@ public static function addHistoryOnAddGroup(CommonDBTM $item) $previous_groups_id = 0; $counter = 0; - if (count($group_ticket->fields) > 0) { + if ($group_ticket->fields !== []) { $previous_groups_id = $group_ticket->fields['groups_id']; $last_history_groups = PluginEscaladeHistory::getLastHistoryForTicketAndGroup($tickets_id, $groups_id, $previous_groups_id); diff --git a/setup.php b/setup.php index 80313473..09a1eda5 100644 --- a/setup.php +++ b/setup.php @@ -32,9 +32,9 @@ define('PLUGIN_ESCALADE_VERSION', '2.10.8'); // Minimal GLPI version, inclusive -define("PLUGIN_ESCALADE_MIN_GLPI", "11.0.0"); +define("PLUGIN_ESCALADE_MIN_GLPI", "12.0.0"); // Maximum GLPI version, exclusive -define("PLUGIN_ESCALADE_MAX_GLPI", "11.0.99"); +define("PLUGIN_ESCALADE_MAX_GLPI", "12.0.99"); if (!defined("PLUGIN_ESCALADE_DIR")) { define("PLUGIN_ESCALADE_DIR", Plugin::getPhpDir("escalade")); diff --git a/templates/config.html.twig b/templates/config.html.twig index 52f8b921..1d1ca481 100644 --- a/templates/config.html.twig +++ b/templates/config.html.twig @@ -34,7 +34,6 @@
-
diff --git a/templates/escalade_form.html.twig b/templates/escalade_form.html.twig index b22e62a7..2f88130e 100644 --- a/templates/escalade_form.html.twig +++ b/templates/escalade_form.html.twig @@ -37,7 +37,6 @@ data-track-changes="true" data-submit-once> -

{{ __('Escalate ticket', 'escalade') }}

diff --git a/templates/group_group.html.twig b/templates/group_group.html.twig index 9768cb34..2d3db6f4 100644 --- a/templates/group_group.html.twig +++ b/templates/group_group.html.twig @@ -41,7 +41,6 @@ } ) }} -