Skip to content

Commit 583ab25

Browse files
committed
Deprecate enable_profiler
1 parent afa9865 commit 583ab25

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
0.3.3
5+
-----
6+
7+
* Deprecate `enable_profiler` configuration
8+
49
0.3.2
510
-----
611

src/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getConfigTreeBuilder(): TreeBuilder
8888
->end()
8989
->scalarNode('default_hub')->end()
9090
->integerNode('default_cookie_lifetime')->defaultNull()->info('Default lifetime of the cookie containing the JWT, in seconds. Defaults to the value of "framework.session.cookie_lifetime".')->end()
91-
->booleanNode('enable_profiler')->info('Enable Symfony Web Profiler integration.')->defaultFalse()->end()
91+
->booleanNode('enable_profiler')->info('Enable Symfony Web Profiler integration.')->setDeprecated('symfony/mercure-bundle', '0.3')->end()
9292
->end()
9393
->end()
9494
;

src/DependencyInjection/MercureExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function load(array $configs, ContainerBuilder $container)
7171
$hubs = [];
7272
$defaultHubUrl = null;
7373
$defaultHubName = null;
74-
$enableProfiler = $config['enable_profiler'] && class_exists(Stopwatch::class);
74+
$enableProfiler = ($config['enable_profiler'] ?? $container->getParameter('kernel.debug')) && class_exists(Stopwatch::class);
7575
foreach ($config['hubs'] as $name => $hub) {
7676
$tokenFactory = null;
7777
if (isset($hub['jwt'])) {

tests/DependencyInjection/MercureExtensionTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPUnit\Framework\TestCase;
1717
use Symfony\Bundle\MercureBundle\DependencyInjection\MercureExtension;
1818
use Symfony\Component\DependencyInjection\ContainerBuilder;
19+
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
1920
use Symfony\Component\Mercure\HubRegistry;
2021

2122
/**
@@ -36,7 +37,7 @@ public function testExtensionMinimum(): void
3637
],
3738
];
3839

39-
$container = new ContainerBuilder();
40+
$container = new ContainerBuilder(new ParameterBag(['kernel.debug' => false]));
4041
(new MercureExtension())->load($config, $container);
4142

4243
$this->assertTrue($container->hasDefinition('mercure.hub.default')); // Hub instance
@@ -83,7 +84,7 @@ public function testExtension(): void
8384
],
8485
];
8586

86-
$container = new ContainerBuilder();
87+
$container = new ContainerBuilder(new ParameterBag(['kernel.debug' => false]));
8788
(new MercureExtension())->load($config, $container);
8889

8990
$this->assertTrue($container->hasDefinition('mercure.hub.managed')); // Hub instance
@@ -154,7 +155,7 @@ public function testExtensionLegacy()
154155
],
155156
];
156157

157-
$container = new ContainerBuilder();
158+
$container = new ContainerBuilder(new ParameterBag(['kernel.debug' => false]));
158159
(new MercureExtension())->load($config, $container);
159160

160161
$this->assertTrue($container->hasDefinition('mercure.hub.default.jwt_provider'));

0 commit comments

Comments
 (0)