Skip to content

Commit 9652e00

Browse files
Wire DebugLoggerConfigurator on Symfony 6.4+
1 parent 0e136c5 commit 9652e00

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,8 @@ class Configuration implements ConfigurationInterface
375375
{
376376
/**
377377
* Generates the configuration tree builder.
378-
*
379-
* @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
380378
*/
381-
public function getConfigTreeBuilder()
379+
public function getConfigTreeBuilder(): TreeBuilder
382380
{
383381
$treeBuilder = new TreeBuilder('monolog');
384382
$rootNode = method_exists(TreeBuilder::class, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root('monolog');

DependencyInjection/MonologExtension.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Bridge\Monolog\Processor\SwitchUserTokenProcessor;
2323
use Symfony\Bridge\Monolog\Processor\TokenProcessor;
2424
use Symfony\Bridge\Monolog\Processor\WebProcessor;
25+
use Symfony\Bridge\Monolog\Logger as LegacyLogger;
2526
use Symfony\Bundle\FullStack;
2627
use Symfony\Component\Config\FileLocator;
2728
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
@@ -32,6 +33,7 @@
3233
use Symfony\Component\DependencyInjection\Reference;
3334
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
3435
use Symfony\Component\HttpKernel\Kernel;
36+
use Symfony\Component\HttpKernel\Log\DebugLoggerConfigurator;
3537
use Symfony\Contracts\HttpClient\HttpClientInterface;
3638

3739
/**
@@ -66,6 +68,10 @@ public function load(array $configs, ContainerBuilder $container)
6668
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
6769
$loader->load('monolog.xml');
6870

71+
if (!class_exists(DebugLoggerConfigurator::class)) {
72+
$container->getDefinition('monolog.logger_prototype')->setClass(LegacyLogger::class);
73+
}
74+
6975
$container->setParameter('monolog.use_microseconds', $config['use_microseconds']);
7076

7177
$handlers = [];

Resources/config/monolog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<service id="Psr\Log\LoggerInterface" alias="logger" public="false" />
1818

19-
<service id="monolog.logger_prototype" class="Symfony\Bridge\Monolog\Logger" abstract="true">
19+
<service id="monolog.logger_prototype" class="Monolog\Logger" abstract="true">
2020
<argument /><!-- Channel -->
2121
</service>
2222

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"symfony/monolog-bridge": "~4.4 || ^5.0 || ^6.0",
21-
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
22-
"symfony/config": "~4.4 || ^5.0 || ^6.0",
23-
"symfony/http-kernel": "~4.4 || ^5.0 || ^6.0",
20+
"symfony/monolog-bridge": "~4.4 || ^5.0 || ^6.0 || ^7.0",
21+
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
22+
"symfony/config": "~4.4 || ^5.0 || ^6.0 || ^7.0",
23+
"symfony/http-kernel": "~4.4 || ^5.0 || ^6.0 || ^7.0",
2424
"monolog/monolog": "^1.22 || ^2.0 || ^3.0"
2525
},
2626
"require-dev": {
27-
"symfony/yaml": "~4.4 || ^5.0 || ^6.0",
28-
"symfony/console": "~4.4 || ^5.0 || ^6.0",
29-
"symfony/phpunit-bridge": "^5.2 || ^6.0"
27+
"symfony/yaml": "~4.4 || ^5.0 || ^6.0 || ^7.0",
28+
"symfony/console": "~4.4 || ^5.0 || ^6.0 || ^7.0",
29+
"symfony/phpunit-bridge": "^5.2 || ^6.0 || ^7.0"
3030
},
3131
"autoload": {
3232
"psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" },

0 commit comments

Comments
 (0)