Skip to content

Commit 32c010d

Browse files
committed
feature/glpi-11.0
1 parent 7e0798e commit 32c010d

24 files changed

+335
-328
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- "main"
7+
- "feature/glpi-11.0"
78
tags:
89
- "*"
910
pull_request:
@@ -20,7 +21,7 @@ jobs:
2021
name: "Generate CI matrix"
2122
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
2223
with:
23-
glpi-version: "10.0.x"
24+
glpi-version: "11.0.x"
2425
ci:
2526
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
2627
needs: "generate-ci-matrix"

ajax/alert_preview.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* -------------------------------------------------------------------------
2929
*/
3030

31-
include('../../../inc/includes.php');
32-
3331
Session::checkLoginUser();
3432

3533
PluginNewsAlert::displayAlert($_GET, [

ajax/display_alerts.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*/
3030

3131
$AJAX_INCLUDE = 1;
32-
include('../../../inc/includes.php');
3332
header('Content-Type: text/html; charset=UTF-8');
3433
Html::header_nocache();
3534
Session::checkLoginUser();

ajax/hide_alert.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*/
3030

3131
$AJAX_INCLUDE = 1;
32-
include('../../../inc/includes.php');
3332
header('Content-Type: text/html; charset=UTF-8');
3433
Html::header_nocache();
3534
Session::checkLoginUser();

ajax/targets.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*/
3030

3131
$AJAX_INCLUDE = 1;
32-
include('../../../inc/includes.php');
3332
header('Content-Type: text/html; charset=UTF-8');
3433
Html::header_nocache();
3534

composer.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
{
22
"require": {
3-
"php": ">=7.4"
3+
"php": ">=8.2"
44
},
55
"require-dev": {
66
"friendsofphp/php-cs-fixer": "^3.75",
77
"friendsoftwig/twigcs": "^6.1",
88
"glpi-project/tools": "^0.7.4",
99
"php-parallel-lint/php-parallel-lint": "^1.4",
10-
"phpstan/phpstan": "^2.1"
10+
"phpstan/extension-installer": "^1.4",
11+
"phpstan/phpstan": "^2.1",
12+
"phpstan/phpstan-deprecation-rules": "^2.0"
1113
},
1214
"config": {
1315
"optimize-autoloader": true,
1416
"platform": {
15-
"php": "7.4.0"
17+
"php": "8.2.99"
1618
},
17-
"sort-packages": true
19+
"sort-packages": true,
20+
"allow-plugins": {
21+
"phpstan/extension-installer": true
22+
}
1823
},
1924
"autoload-dev": {
2025
"psr-4": {

0 commit comments

Comments
 (0)