kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Added PHP 8.2 support

Browse Source
This commit is contained in:
Bernd Bestel 2023-08-01 21:23:59 +02:00
parent 847337443d
commit 6c4cc00fd5
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -47,7 +47,7 @@ Alternatively clone this repository (the `release` branch always references the
### Platform support ### Platform support
- PHP 8.1 (with SQLite 3.34.0+) - PHP 8.1 or 8.2 (with SQLite 3.34.0+)
- Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring` - Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring`
- _Recommendation: Benchmark tests showed that e.g. unit conversion handling is up to 5 times faster when using a more recent (3.39.4+) SQLite version._ - _Recommendation: Benchmark tests showed that e.g. unit conversion handling is up to 5 times faster when using a more recent (3.39.4+) SQLite version._

2
changelog/71_UNRELEASED_xxxx-xx-xx.md
View File

@ -2,6 +2,8 @@
> ❗ xxxImportant upgrade informationXXX > ❗ xxxImportant upgrade informationXXX
> 💡 PHP 8.2 is from now on (additionally to PHP 8.1) supported.
### New feature: xxxx ### New feature: xxxx
- xxx - xxx

2
changelog/__TEMPLATE.md
View File

@ -2,6 +2,8 @@
> ❗ xxxImportant upgrade informationXXX > ❗ xxxImportant upgrade informationXXX
> 💡 xxxMinor upgrade informationXXX
### New feature: xxxx ### New feature: xxxx
- xxx - xxx

2
composer.json
View File

@ -6,7 +6,7 @@
"slim/http": "^1.0", "slim/http": "^1.0",
"php-di/php-di": "^7.0.3", "php-di/php-di": "^7.0.3",
"berrnd/slim-blade-view": "^1.0.0", "berrnd/slim-blade-view": "^1.0.0",
"morris/lessql": "dev-php81", "morris/lessql": "dev-php82",
"gettext/gettext": "dev-php81", "gettext/gettext": "dev-php81",
"eluceo/ical": "^2.2.0", "eluceo/ical": "^2.2.0",
"erusev/parsedown": "^1.7", "erusev/parsedown": "^1.7",

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b8846213f297473589e188b118440eb9", "content-hash": "ffa5545aaf16f26d4916e4c9f2eee408",
"packages": [ "packages": [
{ {
"name": "berrnd/slim-blade-view", "name": "berrnd/slim-blade-view",
@ -1809,16 +1809,16 @@
}, },
{ {
"name": "morris/lessql", "name": "morris/lessql",
"version": "dev-php81", "version": "dev-php82",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/berrnd/lessql.git", "url": "https://github.com/berrnd/lessql.git",
"reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1" "reference": "6e119fcf0e8145cd9b5e22fe030e147655acc4e3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/berrnd/lessql/zipball/210577d9f36ec7cf4b9347e45713ddb3596e49e1", "url": "https://api.github.com/repos/berrnd/lessql/zipball/6e119fcf0e8145cd9b5e22fe030e147655acc4e3",
"reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1", "reference": "6e119fcf0e8145cd9b5e22fe030e147655acc4e3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1861,9 +1861,9 @@
"sql" "sql"
], ],
"support": { "support": {
"source": "https://github.com/berrnd/lessql/tree/php81" "source": "https://github.com/berrnd/lessql/tree/php82"
}, },
"time": "2022-12-10T13:56:17+00:00" "time": "2023-08-01T19:13:22+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",

2
controllers/BaseController.php
View File

@ -30,6 +30,8 @@ class BaseController
protected $AppContainer; protected $AppContainer;
private $View;
protected function getApiKeyService() protected function getApiKeyService()
{ {
return ApiKeyService::getInstance(); return ApiKeyService::getInstance();

4
services/LocalizationService.php
View File

@ -17,6 +17,8 @@ class LocalizationService
protected $Po; protected $Po;
protected $PoQu;
protected $Pot; protected $Pot;
protected $PotMain; protected $PotMain;
@ -25,6 +27,8 @@ class LocalizationService
protected $TranslatorQu; protected $TranslatorQu;
protected $Culture;
private static $instanceMap = []; private static $instanceMap = [];
public function CheckAndAddMissingTranslationToPot($text) public function CheckAndAddMissingTranslationToPot($text)