github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-28 15:49:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

PHP 8.5 compatibility

Browse Source
This commit is contained in:
Bernd Bestel 2026-03-02 20:58:11 +01:00
parent a5ea20afc6
commit eb5332f0da
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
6 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -7,7 +7,7 @@
"php-di/php-di": "^7.0.3",
"berrnd/slim-blade-view": "^1.0.0",
"morris/lessql": "dev-php82",
"gettext/gettext": "^4.8.10",
"gettext/gettext": "dev-4.x-fork",
"eluceo/ical": "^2.2.0",
"erusev/parsedown": "^1.7",
"gumlet/php-image-resize": "^2.0",
@ -20,6 +20,10 @@
{
"type": "vcs",
"url": "https://github.com/berrnd/lessql"
},
{
"type": "vcs",
"url": "https://github.com/berrnd/php-gettext"
}
],
"autoload": {

46
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "728e901068c017ef990c1936652b93c6",
"content-hash": "ef8208c97da190ec7d138910f95733f2",
"packages": [
{
"name": "berrnd/slim-blade-view",
@ -517,16 +517,16 @@
},
{
"name": "gettext/gettext",
"version": "v4.8.12",
"version": "dev-4.x-fork",
"source": {
"type": "git",
"url": "https://github.com/php-gettext/Gettext.git",
"reference": "11af89ee6c087db3cf09ce2111a150bca5c46e12"
"url": "https://github.com/berrnd/php-gettext.git",
"reference": "3cafd9f9e66a8673500d767cf7e8da7762f8d00d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-gettext/Gettext/zipball/11af89ee6c087db3cf09ce2111a150bca5c46e12",
"reference": "11af89ee6c087db3cf09ce2111a150bca5c46e12",
"url": "https://api.github.com/repos/berrnd/php-gettext/zipball/3cafd9f9e66a8673500d767cf7e8da7762f8d00d",
"reference": "3cafd9f9e66a8673500d767cf7e8da7762f8d00d",
"shasum": ""
},
"require": {
@ -547,13 +547,24 @@
"twig/extensions": "Is necessary if you want to use the Twig extractor",
"twig/twig": "Is necessary if you want to use the Twig extractor"
},
"default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
"Gettext\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"autoload-dev": {
"psr-4": {
"Gettext\\Tests\\": "tests"
}
},
"scripts": {
"test": [
"phpunit",
"phpcs"
]
},
"license": [
"MIT"
],
@ -568,9 +579,9 @@
"description": "PHP gettext manager",
"homepage": "https://github.com/oscarotero/Gettext",
"keywords": [
"JS",
"gettext",
"i18n",
"js",
"mo",
"po",
"translation"
@ -578,23 +589,9 @@
"support": {
"email": "oom@oscarotero.com",
"issues": "https://github.com/oscarotero/Gettext/issues",
"source": "https://github.com/php-gettext/Gettext/tree/v4.8.12"
"source": "https://github.com/berrnd/php-gettext/tree/4.x-fork"
},
"funding": [
{
"url": "https://paypal.me/oscarotero",
"type": "custom"
},
{
"url": "https://github.com/oscarotero",
"type": "github"
},
{
"url": "https://www.patreon.com/misteroom",
"type": "patreon"
}
],
"time": "2024-05-18T10:25:07+00:00"
"time": "2026-03-02T19:56:11+00:00"
},
{
"name": "gettext/languages",
@ -4085,6 +4082,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"gettext/gettext": 20,
"morris/lessql": 20
},
"prefer-stable": false,

14
helpers/extensions.php
View File

@ -278,17 +278,3 @@ function EmptyFolder($folderPath)
}
}
}
global $ERROR_REPORTING_STATE;
function ErrorReportingDisableDeprecationWarnings()
{
global $ERROR_REPORTING_STATE;
$ERROR_REPORTING_STATE = error_reporting();
error_reporting($ERROR_REPORTING_STATE & ~E_DEPRECATED);
}
function ErrorReportingReset()
{
global $ERROR_REPORTING_STATE;
error_reporting($ERROR_REPORTING_STATE);
}

2
services/ApiKeyService.php
View File

@ -7,7 +7,7 @@ class ApiKeyService extends BaseService
const API_KEY_TYPE_DEFAULT = 'default';
const API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL = 'special-purpose-calendar-ical';
public function CreateApiKey(string $keyType = self::API_KEY_TYPE_DEFAULT, string $description = null)
public function CreateApiKey(string $keyType = self::API_KEY_TYPE_DEFAULT, ?string $description = null)
{
$newApiKey = $this->GenerateApiKey();

15
services/LocalizationService.php
View File

@ -73,9 +73,6 @@ class LocalizationService
public function __n($number, $singularForm, $pluralForm, $isQu = false)
{
// TODO: Upgrade to gettext/gettext >= v5.7
ErrorReportingDisableDeprecationWarnings();
$this->CheckAndAddMissingTranslationToPot($singularForm);
if (empty($pluralForm))
@ -91,18 +88,10 @@ class LocalizationService
{
return sprintf($this->Translator->ngettext($singularForm, $pluralForm, abs(floatval($number))), $number);
}
// TODO: Upgrade to gettext/gettext >= v5.7
ErrorReportingReset();
}
public function __t($text, ...$placeholderValues)
{
// TODO: Upgrade to gettext/gettext >= v5.7
ErrorReportingDisableDeprecationWarnings();
$this->CheckAndAddMissingTranslationToPot($text);
if (func_num_args() === 1)
@ -120,10 +109,6 @@ class LocalizationService
return sprintf($this->Translator->gettext($text), array_shift($placeholderValues));
}
}
// TODO: Upgrade to gettext/gettext >= v5.7
ErrorReportingReset();
}
public static function getInstance(string $culture)

4
services/UsersService.php
View File

@ -6,7 +6,7 @@ use LessQL\Result;
class UsersService extends BaseService
{
public function CreateUser(string $username, ?string $firstName, ?string $lastName, string $password, string $pictureFileName = null)
public function CreateUser(string $username, ?string $firstName, ?string $lastName, string $password, ?string $pictureFileName = null)
{
$newUserRow = $this->getDatabase()->users()->createRow([
'username' => $username,
@ -37,7 +37,7 @@ class UsersService extends BaseService
$row->delete();
}
public function EditUser(int $userId, string $username, string $firstName, string $lastName, ?string $password, string $pictureFileName = null)
public function EditUser(int $userId, string $username, string $firstName, string $lastName, ?string $password, ?string $pictureFileName = null)
{
if (!$this->UserExists($userId))
{