Skip to content

Commit 1d503d3

Browse files
committed
[FrameworkBundle] Move profiling configuration to PHP
1 parent 2f0a185 commit 1d503d3

File tree

3 files changed

+41
-32
lines changed

3 files changed

+41
-32
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public function load(array $configs, ContainerBuilder $container)
369369
$this->registerSsiConfiguration($config['ssi'], $container, $loader);
370370
$this->registerFragmentsConfiguration($config['fragments'], $container, $loader);
371371
$this->registerTranslatorConfiguration($config['translator'], $container, $loader, $config['default_locale']);
372-
$this->registerProfilerConfiguration($config['profiler'], $container, $loader);
372+
$this->registerProfilerConfiguration($config['profiler'], $container, $loader, $phpLoader);
373373
$this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
374374
$this->registerDebugConfiguration($config['php_errors'], $container, $phpLoader);
375375
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['translator']['enabled_locales'] ?? []);
@@ -568,7 +568,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
568568
$container->setParameter('fragment.path', $config['path']);
569569
}
570570

571-
private function registerProfilerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
571+
private function registerProfilerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader, PhpFileLoader $phpLoader)
572572
{
573573
if (!$this->isConfigEnabled($container, $config)) {
574574
// this is needed for the WebProfiler to work even if the profiler is disabled
@@ -577,7 +577,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
577577
return;
578578
}
579579

580-
$loader->load('profiling.xml');
580+
$phpLoader->load('profiling.php');
581581
$loader->load('collectors.xml');
582582
$loader->load('cache_debug.xml');
583583

Resources/config/profiling.php

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
13+
14+
use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
15+
use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
16+
use Symfony\Component\HttpKernel\Profiler\Profiler;
17+
18+
return static function (ContainerConfigurator $container) {
19+
$container->services()
20+
->set('profiler', Profiler::class)
21+
->public()
22+
->args([service('profiler.storage'), service('logger')->nullOnInvalid()])
23+
->tag('monolog.logger', ['channel' => 'profiler'])
24+
25+
->set('profiler.storage', FileProfilerStorage::class)
26+
->args([param('profiler.storage.dsn')])
27+
28+
->set('profiler_listener', ProfilerListener::class)
29+
->args([
30+
service('profiler'),
31+
service('request_stack'),
32+
null,
33+
param('profiler_listener.only_exceptions'),
34+
param('profiler_listener.only_master_requests'),
35+
])
36+
->tag('kernel.event_subscriber')
37+
;
38+
};

Resources/config/profiling.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)