Skip to content

Commit c4f9cbd

Browse files
Rom1-Bstonebuzz
andauthored
feature/glpi-11.0 (#174)
* feature/glpi-11.0 * phpstan * checkLoginUser * fix CI * version * target icon * fix error when trying to create a new alert * fix phpstan * beta2 * release GLPI 11.0 * Clean composer.json * Fix default value for icon * rector psalm --------- Co-authored-by: Stanislas Kita <[email protected]>
1 parent 406b544 commit c4f9cbd

30 files changed

+496
-2473
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
declare(strict_types=1);
44

5-
use FriendsOfTwig\Twigcs;
5+
use FriendsOfTwig\Twigcs\Finder\TemplateFinder;
6+
use FriendsOfTwig\Twigcs\Config\Config;
7+
use Glpi\Tools\GlpiTwigRuleset;
68

7-
$finder = Twigcs\Finder\TemplateFinder::create()
9+
$finder = TemplateFinder::create()
810
->in(__DIR__ . '/templates')->in(__DIR__ . '/templates/components')
911
->name('*.html.twig')
1012
->ignoreVCSIgnored(true);
1113

12-
return Twigcs\Config\Config::create()
14+
return Config::create()
1315
->setFinder($finder)
14-
->setRuleSet(\Glpi\Tools\GlpiTwigRuleset::class)
16+
->setRuleSet(GlpiTwigRuleset::class)
1517
;

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8-
## [unreleased]
8+
## [1.13.0] - 2025-09-22
9+
10+
### Added
11+
12+
- GLPI 11 compatibility
913

1014
## [1.12.5] - 2025-09-19
1115

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: 1 addition & 2 deletions
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

@@ -54,7 +53,7 @@
5453

5554
case 'Profile':
5655
Profile::dropdown(['name' => 'items_id',
57-
'toadd' => [-1 => __('All', 'news')],
56+
'toadd' => [-1 => __s('All', 'news')],
5857
]);
5958
break;
6059
}

composer.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
{
22
"require": {
3-
"php": ">=7.4"
3+
"php": ">=8.2"
44
},
55
"require-dev": {
6-
"friendsofphp/php-cs-fixer": "^3.86",
7-
"friendsoftwig/twigcs": "^6.1",
8-
"glpi-project/tools": "^0.8.0",
9-
"php-parallel-lint/php-parallel-lint": "^1.4",
10-
"phpstan/phpstan": "^2.1"
6+
"glpi-project/tools": "^0.8.0"
117
},
128
"config": {
139
"optimize-autoloader": true,
1410
"platform": {
15-
"php": "7.4.0"
11+
"php": "8.2.99"
1612
},
1713
"sort-packages": true
1814
},

0 commit comments

Comments
 (0)