Skip to content

Fix PHP 8.5 deprecations #21192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

Fix PHP 8.5 deprecations #21192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8aca6
Fix PHP 8.5 deprecations
cedric-anne Sep 30, 2025
8af2dd0
Update src/Session.php
cedric-anne Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion phpunit/functional/HtmlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,8 @@ public function testGetScssFileHash()

public function testCompileScssForPlugin()
{
$compiled_scss = \Html::compileScss(['file' => '/plugins/tester/css/styles.scss']);
// FIXME remove the `@` operator once `scssphp/scssphp` and `league/uri` PHP 8.5 deprecation fixes will be released
$compiled_scss = @\Html::compileScss(['file' => '/plugins/tester/css/styles.scss']);

// Strip comments to ease comparison.
$compiled_scss = \preg_replace('~/\*.*\*/~s', '', $compiled_scss);
Expand Down
2 changes: 1 addition & 1 deletion src/Glpi/CustomObject/AbstractDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ public function getTranslatedName(int $count = 1): string

$translations = $this->getDecodedTranslationsField();
$language = Session::getLanguage();
$current_translation = $translations[$language] ?? null;
$current_translation = $language !== null ? ($translations[$language] ?? null) : null;
if ($current_translation === null) {
return $this->fields['label'];
}
Expand Down
3 changes: 3 additions & 0 deletions src/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,6 +1921,9 @@ public static function cleanIDORTokens()
**/
public static function haveTranslations($itemtype, $field)
{
if (!is_a($itemtype, CommonDropdown::class, true)) {
return false;
}

return (isset($_SESSION['glpi_dropdowntranslations'][$itemtype])
&& isset($_SESSION['glpi_dropdowntranslations'][$itemtype][$field]));
Expand Down
Loading