Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- php: '8.2'
- php: '8.3'
- php: '8.4'
- php: '8.5'
mode: high-deps
fail-fast: false

Expand Down
4 changes: 2 additions & 2 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions DependencyInjection/DeamonLoggerExtraExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
2 changes: 1 addition & 1 deletion Processors/Monolog/DeamonLoggerExtraWebProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
16 changes: 0 additions & 16 deletions Resources/config/processors.xml

This file was deleted.

16 changes: 16 additions & 0 deletions Resources/config/processors.yaml
Original file line number Diff line number Diff line change
@@ -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

11 changes: 0 additions & 11 deletions Resources/config/services.xml

This file was deleted.

7 changes: 7 additions & 0 deletions Resources/config/services.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
services:
deamon.logger_extra.context:
class: Deamon\LoggerExtraBundle\Services\DeamonLoggerExtraContext

Deamon\LoggerExtraBundle\Services\DeamonLoggerExtraContext:
alias: deamon.logger_extra.context

5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down