Skip to content

Commit 7f8d40c

Browse files
Rom1-Bstonebuzz
andauthored
feature/glpi-11.0 (#103)
* feature/glpi-11.0 * miinor ui fix (icon) * miinor ui fix (icon) * miinor ui fix (icon) * Fix CSS and JS files inclusion * beta1 * beta2 * Clean composer.json * psalm * rector * rector * fix issue 106 * beta3 * release GLPI 11.0 --------- Co-authored-by: Stanislas <[email protected]>
1 parent ac92921 commit 7f8d40c

23 files changed

+652
-2504
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: "Generate CI matrix"
2121
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
2222
with:
23-
glpi-version: "10.0.x"
23+
glpi-version: "11.0.x"
2424
ci:
2525
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
2626
needs: "generate-ci-matrix"

.twig_cs.dist.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use FriendsOfTwig\Twigcs\Finder\TemplateFinder;
6+
use FriendsOfTwig\Twigcs\Config\Config;
7+
use Glpi\Tools\GlpiTwigRuleset;
8+
9+
$finder = TemplateFinder::create()
10+
->in(__DIR__ . '/templates')
11+
->name('*.html.twig')
12+
->ignoreVCSIgnored(true);
13+
14+
return Config::create()
15+
->setFinder($finder)
16+
->setRuleSet(GlpiTwigRuleset::class)
17+
;

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Change Log
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
6+
and this project adheres to [Semantic Versioning](http://semver.org/).
7+
8+
## [1.4.0] - 2025-09-26
9+
10+
### Added
11+
12+
- GLPI 11 compatibility

ajax/extract_json.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* -------------------------------------------------------------------------
2929
*/
3030

31-
include('../../../inc/includes.php');
32-
3331
header('Content-Type: text/html; charset=UTF-8');
3432
Html::header_nocache();
3533
Session::checkLoginUser();
@@ -38,7 +36,7 @@
3836
!isset($_REQUEST['id'])
3937
|| !isset($_REQUEST['type'])
4038
) {
41-
exit;
39+
return;
4240
}
4341

4442
switch ($_REQUEST['type']) {

composer.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
{
22
"require": {
3-
"php": ">=7.4",
3+
"php": ">=8.2",
44
"lcobucci/jwt": "^4.2"
55
},
66
"require-dev": {
7-
"friendsofphp/php-cs-fixer": "^3.85",
8-
"glpi-project/tools": "^0.7.6",
9-
"php-parallel-lint/php-parallel-lint": "^1.4",
10-
"phpstan/extension-installer": "^1.4",
11-
"phpstan/phpstan": "^2.1",
12-
"phpstan/phpstan-deprecation-rules": "^2.0"
7+
"glpi-project/tools": "^0.8"
138
},
149
"provide": {
1510
"guzzlehttp/guzzle": "*",
@@ -18,11 +13,13 @@
1813
"config": {
1914
"optimize-autoloader": true,
2015
"platform": {
21-
"php": "7.4.0"
16+
"php": "8.2.99"
2217
},
23-
"sort-packages": true,
24-
"allow-plugins": {
25-
"phpstan/extension-installer": true
18+
"sort-packages": true
19+
},
20+
"autoload-dev": {
21+
"psr-4": {
22+
"Glpi\\Tools\\": "../../tools/src/"
2623
}
2724
}
2825
}

0 commit comments

Comments
 (0)