From 67ab87889d4834d8d23007c47970315cb4dc2c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Cr=C3=A9mier?= Date: Fri, 27 Feb 2026 10:07:32 +0100 Subject: [PATCH] fix symfony deprecations --- .github/workflows/unit-tests.yml | 1 + .scrutinizer.yml | 4 ++-- .../DeamonLoggerExtraExtension.php | 6 +++--- .../Monolog/DeamonLoggerExtraWebProcessor.php | 2 +- Resources/config/processors.xml | 16 ---------------- Resources/config/processors.yaml | 16 ++++++++++++++++ Resources/config/services.xml | 11 ----------- Resources/config/services.yaml | 7 +++++++ composer.json | 5 +++-- 9 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 Resources/config/processors.xml create mode 100644 Resources/config/processors.yaml delete mode 100644 Resources/config/services.xml create mode 100644 Resources/config/services.yaml diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 85eaf1d..daaa368 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -18,6 +18,7 @@ jobs: - php: '8.2' - php: '8.3' - php: '8.4' + - php: '8.5' mode: high-deps fail-fast: false diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 99fa246..dc62416 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -12,10 +12,10 @@ checks: php: true build: - image: default-bionic + image: default-jammy environment: php: - version: 8.0 + version: 8.2 dependencies: before: - restore-from-cache repository "dependencies" diff --git a/DependencyInjection/DeamonLoggerExtraExtension.php b/DependencyInjection/DeamonLoggerExtraExtension.php index c82b51f..6e97720 100644 --- a/DependencyInjection/DeamonLoggerExtraExtension.php +++ b/DependencyInjection/DeamonLoggerExtraExtension.php @@ -22,9 +22,9 @@ public function load(array $configs, ContainerBuilder $container): void $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); - $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.xml'); - $loader->load('processors.xml'); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yaml'); + $loader->load('processors.yaml'); $definition = $container->getDefinition('deamon.logger_extra.context'); $definition->addArgument($config['application']['name']); diff --git a/Processors/Monolog/DeamonLoggerExtraWebProcessor.php b/Processors/Monolog/DeamonLoggerExtraWebProcessor.php index 4f1bd0a..7d051c7 100644 --- a/Processors/Monolog/DeamonLoggerExtraWebProcessor.php +++ b/Processors/Monolog/DeamonLoggerExtraWebProcessor.php @@ -83,7 +83,7 @@ private function addRequestInfo(): void $request = $this->requestStack?->getCurrentRequest(); if ($request instanceof Request) { $this->addInfo('url', $request->getRequestUri()); - $this->addInfo('route', $request->get('_route')); + $this->addInfo('route', $request->attributes->get('_route')); $this->addInfo('user_agent', $request->server->get('HTTP_USER_AGENT')); $this->addInfo('accept_encoding', $request->headers->get('Accept-Encoding')); $this->addInfo('client_ip', $request->getClientIp()); diff --git a/Resources/config/processors.xml b/Resources/config/processors.xml deleted file mode 100644 index f9585b9..0000000 --- a/Resources/config/processors.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - %kernel.environment% - - - - - - diff --git a/Resources/config/processors.yaml b/Resources/config/processors.yaml new file mode 100644 index 0000000..3b72930 --- /dev/null +++ b/Resources/config/processors.yaml @@ -0,0 +1,16 @@ +services: + deamon.logger_extra.processors.web_processor: + class: Deamon\LoggerExtraBundle\Processors\Monolog\DeamonLoggerExtraWebProcessor + calls: + - setLoggerExtraContext: + - '@deamon.logger_extra.context' + - setEnvironment: + - '%kernel.environment%' + - setTokenStorage: + - '@security.token_storage' + - setRequestStack: + - '@request_stack' + + Deamon\LoggerExtraBundle\Processors\Monolog\DeamonLoggerExtraWebProcessor: + alias: deamon.logger_extra.processors.web_processor + diff --git a/Resources/config/services.xml b/Resources/config/services.xml deleted file mode 100644 index 1edffb9..0000000 --- a/Resources/config/services.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml new file mode 100644 index 0000000..2cb6781 --- /dev/null +++ b/Resources/config/services.yaml @@ -0,0 +1,7 @@ +services: + deamon.logger_extra.context: + class: Deamon\LoggerExtraBundle\Services\DeamonLoggerExtraContext + + Deamon\LoggerExtraBundle\Services\DeamonLoggerExtraContext: + alias: deamon.logger_extra.context + diff --git a/composer.json b/composer.json index aae4692..26a362e 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,9 @@ "symfony/monolog-bridge": "^7.0", "monolog/monolog": "^3.0", "symfony/http-kernel": "^7.0", - "symfony/http-foundation": "^7.2", - "symfony/config": "^7.0" + "symfony/http-foundation": "^7.0", + "symfony/config": "^7.0", + "symfony/yaml": "^7.0" }, "require-dev": { "symfony/phpunit-bridge": "^7.0"