Updated composer dependencies, small refactoring.

Author: DKravtsov

.idea/laravel-idea.xml

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.4.1",
+	"version": "v3.4.2",
 	"license": "MIT",
 	"authors": [
 		{
@@ -44,15 +44,15 @@
 		"beberlei/doctrineextensions": "^1.5",
 		"doctrine/doctrine-bundle": "^2.13.2",
 		"doctrine/doctrine-migrations-bundle": "^3.4.1",
-		"doctrine/orm": "^2.20.1",
+		"doctrine/orm": "^2.20.2",
 		"dukecity/command-scheduler-bundle": "^6.0.3",
 		"elasticsearch/elasticsearch": "^7.17.2",
-		"gedmo/doctrine-extensions": "^3.17.1",
+		"gedmo/doctrine-extensions": "^3.18.0",
 		"lexik/jwt-authentication-bundle": "^3.1.1",
 		"mark-gerarts/automapper-plus-bundle": "^1.5",
 		"matomo/device-detector": "^6.4.3",
 		"matthiasnoback/symfony-console-form": "^6.0",
-		"nelmio/api-doc-bundle": "^4.36.1",
+		"nelmio/api-doc-bundle": "^4.37.1",
 		"nelmio/cors-bundle": "^2.5",
 		"phpdocumentor/reflection-docblock": "^5.6.1",
 		"ramsey/uuid-doctrine": "^2.1",
@@ -83,16 +83,16 @@
 		"symfony/routing": "7.2.*",
 		"symfony/security-bundle": "7.2.*",
 		"symfony/serializer": "7.2.*",
-		"symfony/stimulus-bundle": "^2.22.1",
+		"symfony/stimulus-bundle": "^2.23.0",
 		"symfony/string": "7.2.*",
 		"symfony/translation": "7.2.*",
 		"symfony/twig-bundle": "7.2.*",
-		"symfony/ux-turbo": "^2.22.1",
+		"symfony/ux-turbo": "^2.23.0",
 		"symfony/validator": "7.2.*",
 		"symfony/web-link": "7.2.*",
 		"symfony/yaml": "7.2.*",
-		"twig/extra-bundle": "^2.12|^3.19",
-		"twig/twig": "^2.12|^3.19"
+		"twig/extra-bundle": "^2.12|^3.20",
+		"twig/twig": "^2.12|^3.20"
 	},
 	"conflict": {
 		"symfony/debug": "<3.3",

composer.json

@@ -11,22 +11,25 @@
 use DateTimeImmutable;
 use DateTimeZone;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Throwable;
 
 use function explode;
 use function floor;
+use function in_array;
 use function str_replace;
 
 /**
  * @package App\Tool
  */
-class LocalizationService implements LocalizationServiceInterface
+readonly class LocalizationService implements LocalizationServiceInterface
 {
     public function __construct(
-        private readonly CacheInterface $appCache,
-        private readonly LoggerInterface $logger,
+        private CacheInterface $appCache,
+        private LoggerInterface $logger,
+        private RequestStack $requestStack,
     ) {
     }
 
@@ -46,6 +49,13 @@ public function getLocales(): array
         return Locale::getValues();
     }
 
+    public function getRequestLocale(): string
+    {
+        $locale = $this->requestStack->getCurrentRequest()?->getLocale() ?? Locale::getDefault()->value;
+
+        return in_array($locale, $this->getLocales(), true) ? $locale : Locale::getDefault()->value;
+    }
+
     /**
      * {@inheritdoc}
      */

composer.lock

@@ -23,6 +23,8 @@ public function getLanguages(): array;
      */
     public function getLocales(): array;
 
+    public function getRequestLocale(): string;
+
     /**
      * @return array<int, array{timezone: string, identifier: string,  offset: string, value: string}>
      */

src/Tool/Application/Service/LocalizationService.php

@@ -5,7 +5,7 @@
 		"php": "^8.4.0"
 	},
 	"require-dev": {
-		"friendsofphp/php-cs-fixer": "3.68.*",
+		"friendsofphp/php-cs-fixer": "3.69.*",
 		"squizlabs/php_codesniffer": "3.11.*",
 		"symplify/easy-coding-standard": "12.5.*",
 		"roave/security-advisories": "dev-latest"