GLPI 11 compatibility

.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"

ajax/container.php

@@ -31,14 +31,13 @@
 include('../../../inc/includes.php');
 Session::checkLoginUser();
 
-use Glpi\Http\Response;
+use Glpi\Exception\Http\HttpException;
 
 if (isset($_GET['action']) && $_GET['action'] === 'get_fields_html') {
 
     $right = PluginFieldsProfile::getRightOnContainer($_SESSION['glpiactiveprofile']['id'], $_GET['id']);
     if ($right < READ) {
-        Response::sendError(403, 'Forbidden');
-        return;
+        throw new HttpException(403, 'Forbidden');
     }
 
     $containers_id = $_GET['id'];
@@ -48,9 +47,10 @@
     $subtype       = $_GET['subtype'];
     $input         = $_GET['input'];
 
-    $item = new $itemtype();
+    $dbu = new DbUtils();
+    $item = $dbu->getItemForItemtype($itemtype);
     if ($items_id > 0 && !$item->getFromDB($items_id)) {
-        Response::sendError(404, 'Not Found');
+        throw new HttpException(404, 'Not Found');
     }
     $item->input = $input;
 
@@ -66,5 +66,5 @@
         echo '';
     }
 } else {
-    Response::sendError(404, 'Not Found');
+    throw new HttpException(404, 'Not Found');
 }

ajax/container_display_condition.php

@@ -55,6 +55,5 @@
         }
     }
 } else {
-    http_response_code(400);
-    die();
+    throw new \RuntimeException('Invalid request', 400);
 }

ajax/reorder.php

@@ -37,7 +37,7 @@
     || !array_key_exists('new_order', $_POST)
 ) {
     // Missing input
-    exit();
+    throw new \RuntimeException('Missing input', 400);
 }
 
 $table        = PluginFieldsField::getTable();
@@ -62,7 +62,7 @@
 
 if (0 === $field_iterator->count()) {
     // Unknown field
-    exit();
+    throw new \RuntimeException('Unknown field', 404);
 }
 
 $field_id = $field_iterator->current()['id'];
@@ -72,7 +72,7 @@
     $DB->update(
         $table,
         [
-            'ranking' => new \QueryExpression($DB->quoteName('ranking') . ' - 1'),
+            'ranking' => new \Glpi\DBAL\QueryExpression($DB->quoteName('ranking') . ' - 1'),
         ],
         [
             'plugin_fields_containers_id' => $container_id,
@@ -84,7 +84,7 @@
     $DB->update(
         $table,
         [
-            'ranking' => new \QueryExpression($DB->quoteName('ranking') . ' + 1'),
+            'ranking' => new \Glpi\DBAL\QueryExpression($DB->quoteName('ranking') . ' + 1'),
         ],
         [
             'plugin_fields_containers_id' => $container_id,

ajax/status_override.php

@@ -43,6 +43,5 @@
         $status_override->showForm($_GET['id'], $_GET);
     }
 } else {
-    http_response_code(400);
-    die();
+    throw new \RuntimeException('Invalid request', 400);
 }

ajax/viewtranslations.php

@@ -39,7 +39,7 @@
 Session::checkLoginUser();
 
 if (!isset($_POST['itemtype']) || !isset($_POST['items_id']) || !isset($_POST['id'])) {
-    exit();
+    throw new \RuntimeException('Missing required parameters', 400);
 }
 
 $translation = new PluginFieldsLabelTranslation();
@@ -53,5 +53,3 @@
 } else {
     echo __('Access denied');
 }
-
-Html::ajaxFooter();

composer.json

@@ -1,11 +1,12 @@
 {
     "require": {
-        "php": ">=7.4",
-        "symfony/yaml": "^5.4"
+        "php": ">=8.2",
+        "symfony/yaml": "^7.3"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.75",
         "friendsoftwig/twigcs": "^6.1",
+        "glpi-project/phpstan-glpi": "^1.0",
         "glpi-project/tools": "^0.7.5",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",
@@ -15,7 +16,7 @@
     "config": {
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.4.0"
+            "php": "8.2.99"
         },
         "sort-packages": true,
         "allow-plugins": {