Skip to content

Commit 02c9efe

Browse files
RomainLvrstonebuzzRom1-B
authored
GLPI 11 compatibility (#32)
* GLPI 11 compatibility * GLPI 11 compatibility * Fix file headers * Fix php-cs-fixer * GLPI 11 compatibility * minor fix * drop webservice support * clean phpstan neon * Update inc/item_device.class.php Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Update inc/item_softwarelicense.class.php Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Update phpstan.neon Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Update inc/item_ticket.class.php Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Update inc/item_ticket.class.php Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Update inc/item_ticket.class.php Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> * Apply suggestions from code review * Apply suggestions from code review * beta2 * Fix path * fix path * remove useless global * revert * rector psalm * fix CS * fix CS * fix * release GLPI 11.0 --------- Co-authored-by: Stanislas <skita@teclib.com> Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com> Co-authored-by: Rom1-B <rom1.biot@gmail.com>
1 parent 8ce9f08 commit 02c9efe

91 files changed

Lines changed: 4198 additions & 3380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
name: "Generate CI matrix"
5454
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
5555
with:
56-
glpi-version: "10.0.x"
56+
glpi-version: "11.0.x"
5757
ci:
5858
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
5959
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')
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-
## [UNRELEASE]
8+
## [4.1.0] - 2025-10-01
9+
10+
### Added
11+
12+
- GLPI 11 compatibility
913

1014
## [4.0.2] - 2025-09-30
1115

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"require": {
3-
"php": ">=7.4",
4-
"symfony/yaml": "^5.4",
3+
"php": ">=8.2",
4+
"symfony/yaml": "^7.3",
55
"tecnickcom/tcpdf": "^6.4"
66
},
77
"require-dev": {
88
"friendsofphp/php-cs-fixer": "^3.73",
99
"friendsoftwig/twigcs": "^6.1",
10+
"glpi-project/phpstan-glpi": "^1.0",
1011
"glpi-project/tools": "^0.7.4",
1112
"php-parallel-lint/php-parallel-lint": "^1.4",
1213
"phpstan/extension-installer": "^1.4",
@@ -16,7 +17,7 @@
1617
"config": {
1718
"optimize-autoloader": true,
1819
"platform": {
19-
"php": "7.4.0"
20+
"php": "8.2.99"
2021
},
2122
"sort-packages": true,
2223
"allow-plugins": {

0 commit comments

Comments
 (0)