Compatibility with GLPI 12

.github/workflows/continuous-integration.yml

@@ -22,7 +22,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"

Makefile

@@ -0,0 +1,2 @@
+include ../../PluginsMakefile.mk
+

SECURITY.md

@@ -19,6 +19,8 @@ Thank you for improving the security of glpi-agent.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.0.x   | :heavy_check_mark: |
+| 1.0.x   | :x:                |
 | 1.2.x   | :x:                |
 | 1.3.x   | :heavy_check_mark: |
+| 1.3.x   | :heavy_check_mark: |
+| 1.4.x   | :heavy_check_mark: |

ajax/dropdownZone.php

@@ -29,21 +29,18 @@
  *
  * -------------------------------------------------------------------------
  */
-
+use Glpi\Exception\Http\AccessDeniedHttpException;
+use Glpi\Exception\Http\NotFoundHttpException;
 use GlpiPlugin\Carbon\Source_Zone;
 use GlpiPlugin\Carbon\Zone;
 
 include(__DIR__ . '/../../../inc/includes.php');
 
 // Check if plugin is activated...
 if (!Plugin::isPluginActive('carbon')) {
-    http_response_code(404);
-    die();
-}
-
-if (!Zone::canView()) {
-    http_response_code(403);
-    die();
+    throw new NotFoundHttpException();
+} elseif (!Zone::canView()) {
+    throw new AccessDeniedHttpException();
 }
 
 $source_zone_table = Source_Zone::getTable();

composer.json

@@ -8,7 +8,6 @@
         "php-http/message-factory": "^1.1"
     },
     "require-dev": {
-        "glpi-project/tools": "^0.8.1",
         "marcocesarato/php-conventional-changelog": "^1.17"
     },
     "config": {
@@ -35,5 +34,5 @@
         "license-headers": "vendor/bin/licence-headers-check --ansi --no-interaction",
         "build-schema": "tools/build-db-schema.php carbon | plantuml -p -tpng > docs/db-schema.png"
     },
-    "version": "1.3.0-dev"
+    "version": "1.4.0-dev"
 }