Skip to content

Commit e8ea61e

Browse files
LainowstonebuzzRom1-B
authored
Feature/glpi 11.0 (#477)
* Replace echo by twig * Pass log_result to twig * update composer * Fix header * Fix phpstan.neon * Fix phstan * Fix phstan * Fix phpStan * Fix injection error * Fix computer item error * minor fix (ui / icon) * Fix route error * minor fix (icon / field/ * drop old debug config * add config page * Fix twig * Fix injecion result and duplicate entry * Fix code sniffer * bump setup * Add suggestions * beta2 * fix path * up composer * fix * release GLPI 11.0 --------- Co-authored-by: Stanislas <[email protected]> Co-authored-by: Rom1-B <[email protected]>
1 parent 0be75cb commit e8ea61e

File tree

152 files changed

+3086
-3401
lines changed

Some content is hidden

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

152 files changed

+3086
-3401
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"

.php-cs-fixer.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
use PhpCsFixer\Config;
4+
use PhpCsFixer\Finder;
5+
6+
$finder = Finder::create()
7+
->in(__DIR__)
8+
->name('*.php')
9+
->ignoreVCSIgnored(true);
10+
11+
$config = new Config();
12+
13+
$rules = [
14+
'@PER-CS2.0' => true,
15+
'trailing_comma_in_multiline' => ['elements' => ['arguments', 'array_destructuring', 'arrays']], // For PHP 7.4 compatibility
16+
];
17+
18+
return $config
19+
->setRules($rules)
20+
->setFinder($finder)
21+
->setUsingCache(false);

.phpcs.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.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: 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+
## [2.15.0] - 2025-09-30
9+
10+
### Added
11+
12+
- GLPI 11 compatibility
913

1014
### Fixed
1115

ajax/dropdownChooseField.php

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

3131
// Direct access to file
3232
if (strpos($_SERVER['PHP_SELF'], "dropdownChooseField.php")) {
33-
include '../../../inc/includes.php';
3433
header("Content-Type: text/html; charset=UTF-8");
3534
Html::header_nocache();
3635
}

ajax/dropdownMandatory.php

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

3131
// Direct access to file
3232
if (strpos($_SERVER['PHP_SELF'], "dropdownMandatory.php")) {
33-
include '../../../inc/includes.php';
3433
header("Content-Type: text/html; charset=UTF-8");
3534
Html::header_nocache();
3635
}

ajax/dropdownSelectModel.php

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

3131
// Direct access to file
3232
if (strpos($_SERVER['PHP_SELF'], "dropdownSelectModel.php")) {
33-
include '../../../inc/includes.php';
3433
header("Content-Type: text/html; charset=UTF-8");
3534
Html::header_nocache();
3635
}

ajax/injection.php

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

3131
// Direct access to file
3232
if (strpos($_SERVER['PHP_SELF'], "injection.php")) {
33-
include '../../../inc/includes.php';
3433
header("Content-Type: text/html; charset=UTF-8");
3534
Html::header_nocache();
3635
}

ajax/results.php

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

3131
// Direct access to file
3232
if (strpos($_SERVER['PHP_SELF'], "results.php")) {
33-
include '../../../inc/includes.php';
3433
header("Content-Type: text/html; charset=UTF-8");
3534
Html::header_nocache();
3635
}

0 commit comments

Comments
 (0)