feature/glpi-11.0

ci
pluginsGLPI · Jan 13, 2025 · 9bc430b · 9bc430b
1 parent fdee93c
commit 9bc430b
Show file tree

Hide file tree

Showing 20 changed files with 403 additions and 400 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "feature/glpi-11.0"
     tags:
        - "*"
   pull_request:
@@ -20,7 +21,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"

diff --git a/ajax/alert_preview.php b/ajax/alert_preview.php
@@ -28,8 +28,6 @@
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
-
 Session::checkLoginUser();
 
 PluginNewsAlert::displayAlert($_GET, [

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

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

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

diff --git a/composer.json b/composer.json
@@ -1,18 +1,23 @@
 {
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.64",
-        "glpi-project/tools": "^0.7.4",
+        "friendsofphp/php-cs-fixer": "^3.67",
+        "glpi-project/tools": "^0.7",
         "php-parallel-lint/php-parallel-lint": "^1.4",
-        "phpstan/phpstan": "^1.12"
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-deprecation-rules": "^2.0"
     },
     "config": {
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.4.0"
+            "php": "8.2.99"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }