GLPI11 Compatibility (#286)

* GLPI11 Compatibility

* phpstan

* fix lint

* fix PHP Parallel Lint

* fix composer.lock

* beta1

* fix version in setup.php

* beta2

* fix cs + rector + psalm

* release GLPI 11.0

* fix

* fix CS

* fix CS

* fix CS

* fix

---------

Co-authored-by: Rom1-B <[email protected]>
Co-authored-by: Stanislas Kita <[email protected]>

Author: 3 people

.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: "10.0.x"
+      glpi-version: "11.0.x"
   ci:
     name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
     needs: "generate-ci-matrix"

CHANGELOG.md

@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [UNRELEASED]
+## [1.9.0] - 2025-10-01
+
+### Added
+
+- GLPI 11 compatibility
 
 ## [1.8.9] - 2025-09-30
 

ajax/common.tabs.php

@@ -28,13 +28,10 @@
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
 header('Content-Type: text/html; charset=UTF-8');
 Html::header_nocache();
 
 Session::checkLoginUser();
 
 $common = new PluginMreportingCommon();
 $common->showCentral($_REQUEST);
-
-Html::ajaxFooter();

ajax/dashboard.php

@@ -28,7 +28,6 @@
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
 Html::header_nocache();
 
 Session::checkLoginUser();

ajax/dropdownExport.php

@@ -28,7 +28,6 @@
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
 header('Content-Type: text/html; charset=UTF-8');
 Html::header_nocache();
 
@@ -41,8 +40,8 @@
     if ($_POST['ext'] == 'odt') {
         echo ' ';
         $option    = [];
-        $option[1] = __('With data', 'mreporting');
-        $option[0] = __('Without data', 'mreporting');
+        $option[1] = __s('With data', 'mreporting');
+        $option[0] = __s('Without data', 'mreporting');
         Dropdown::showFromArray('withdata', $option, []);
     }
 
@@ -59,7 +58,7 @@
         Html::Closeform();
         echo "<script type='text/javascript'>
             $('#export_svg_link').on('click', function () {
-               var svg_content = vis{$randname}.scene[0].canvas.innerHTML;
+               var svg_content = vis{" . htmlspecialchars($randname) . "}.scene[0].canvas.innerHTML;
 
                var form = document.getElementById('export_svg_form');
                form.svg_content.value = svg_content;

ajax/dropdownGraphs.php

@@ -29,7 +29,6 @@
  */
 
 if (strpos($_SERVER['PHP_SELF'], 'dropdownGraphs.php')) {
-    include('../../../inc/includes.php');
     header('Content-Type: text/html; charset=UTF-8');
     Html::header_nocache();
 }
@@ -42,5 +41,5 @@
     $_POST['name']      = $test[1];
 
     $config = new PluginMreportingConfig();
-    echo "&nbsp;<a href='" . $config->getFormURL() . '?name=' . $_POST['name'] . '&classname=' . $_POST['classname'] . "'>" . __('Send') . '</a>';
+    echo "&nbsp;<a href='" . htmlspecialchars($config->getFormURL()) . '?name=' . htmlspecialchars($_POST['name']) . '&classname=' . htmlspecialchars($_POST['classname']) . "'>" . __s('Send') . '</a>';
 }

ajax/get_new_crsf_token.php

@@ -29,7 +29,6 @@
  */
 
 $AJAX_INCLUDE = 1;
-include('../../../inc/includes.php');
 
 header('Content-Type: text/html; charset=UTF-8');
 Html::header_nocache();

ajax/homepage_link.php

@@ -28,10 +28,11 @@
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+/** @var array $CFG_GLPI */
+global $CFG_GLPI;
 
 Session::checkLoginUser();
 
-echo '<li id="menu99"><a href="' . Plugin::getWebDir('mreporting') .
+echo '<li id="menu99"><a href="' . $CFG_GLPI['root_doc'] . '/plugins/mreporting' .
      '/front/dashboard.form.php" class="itemP">&nbsp;&nbsp;' .
-     __('Dashboard', 'mreporting') . '&nbsp;&nbsp;</a></li>';
+     __s('Dashboard', 'mreporting') . '&nbsp;&nbsp;</a></li>';

composer.json

@@ -1,10 +1,11 @@
 {
     "require": {
-        "php": ">=7.4",
-        "masnathan/odtphp": "dev-teclib"
+        "php": ">=8.2",
+        "sboden/odtphp": "^3.2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.85",
+        "glpi-project/phpstan-glpi": "^1.0",
         "glpi-project/tools": "^0.7",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",
@@ -14,7 +15,7 @@
     "config": {
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.4.0"
+            "php": "8.2.99"
         },
         "sort-packages": true,
         "allow-plugins": {