diff --git a/README.md b/README.md index 9701406d..ef1fea44 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Alternatively clone this repository (the `release` branch always references the ### 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` - _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._ diff --git a/changelog/71_UNRELEASED_xxxx-xx-xx.md b/changelog/71_UNRELEASED_xxxx-xx-xx.md index ffb7a7a1..4dfcb10c 100644 --- a/changelog/71_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/71_UNRELEASED_xxxx-xx-xx.md @@ -2,6 +2,8 @@ > ❗ xxxImportant upgrade informationXXX +> 💡 PHP 8.2 is from now on (additionally to PHP 8.1) supported. + ### New feature: xxxx - xxx diff --git a/changelog/__TEMPLATE.md b/changelog/__TEMPLATE.md index 522293dd..a36fb346 100644 --- a/changelog/__TEMPLATE.md +++ b/changelog/__TEMPLATE.md @@ -2,6 +2,8 @@ > ❗ xxxImportant upgrade informationXXX +> 💡 xxxMinor upgrade informationXXX + ### New feature: xxxx - xxx diff --git a/composer.json b/composer.json index 52cea3e2..96152391 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "slim/http": "^1.0", "php-di/php-di": "^7.0.3", "berrnd/slim-blade-view": "^1.0.0", - "morris/lessql": "dev-php81", + "morris/lessql": "dev-php82", "gettext/gettext": "dev-php81", "eluceo/ical": "^2.2.0", "erusev/parsedown": "^1.7", diff --git a/composer.lock b/composer.lock index 8cbf355e..5d967606 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "b8846213f297473589e188b118440eb9", + "content-hash": "ffa5545aaf16f26d4916e4c9f2eee408", "packages": [ { "name": "berrnd/slim-blade-view", @@ -1809,16 +1809,16 @@ }, { "name": "morris/lessql", - "version": "dev-php81", + "version": "dev-php82", "source": { "type": "git", "url": "https://github.com/berrnd/lessql.git", - "reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1" + "reference": "6e119fcf0e8145cd9b5e22fe030e147655acc4e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/berrnd/lessql/zipball/210577d9f36ec7cf4b9347e45713ddb3596e49e1", - "reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1", + "url": "https://api.github.com/repos/berrnd/lessql/zipball/6e119fcf0e8145cd9b5e22fe030e147655acc4e3", + "reference": "6e119fcf0e8145cd9b5e22fe030e147655acc4e3", "shasum": "" }, "require": { @@ -1861,9 +1861,9 @@ "sql" ], "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", diff --git a/controllers/BaseController.php b/controllers/BaseController.php index 874d15ad..1ef26a48 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -30,6 +30,8 @@ class BaseController protected $AppContainer; + private $View; + protected function getApiKeyService() { return ApiKeyService::getInstance(); diff --git a/services/LocalizationService.php b/services/LocalizationService.php index 8a10831a..da318e69 100644 --- a/services/LocalizationService.php +++ b/services/LocalizationService.php @@ -17,6 +17,8 @@ class LocalizationService protected $Po; + protected $PoQu; + protected $Pot; protected $PotMain; @@ -25,6 +27,8 @@ class LocalizationService protected $TranslatorQu; + protected $Culture; + private static $instanceMap = []; public function CheckAndAddMissingTranslationToPot($text)