8000 minor #37237 [DebugBundle] Move xml service configuration to php (jsc… · symfony/symfony@d12eabc · GitHub
[go: up one dir, main page]
Skip to content

Commit d12eabc

Browse files
TobionTobion
committed
minor #37237 [DebugBundle] Move xml service configuration to php (jschaedl)
This PR was squashed before being merged into the 5.2-dev branch. Discussion ---------- [DebugBundle] Move xml service configuration to php | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | #37186 | License | MIT | Doc PR | - Move DebugBundles xml service configuration to php. Commits ------- 7355c95 [DebugBundle] Move xml service configuration to php
2 parents 9a6e727 + 7355c95 commit d12eabc

File tree

4 files changed

+139
-119
lines changed

4 files changed

+139
-119
lines changed

‎src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Config\FileLocator;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
1818
use Symfony\Component\DependencyInjection\Extension\Extension;
19-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
19+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2020
use Symfony\Component\DependencyInjection\Reference;
2121
use Symfony\Component\VarDumper\Caster\ReflectionCaster;
2222
use Symfony\Component\VarDumper\Dumper\CliDumper;
@@ -37,8 +37,8 @@ public function load(array $configs, ContainerBuilder $container)
3737
$configuration = new Configuration();
3838
$config = $this->processConfiguration($configuration, $configs);
3939

40-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
41< 8000 /code>-
$loader->load('services.xml');
40+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
41+
$loader->load('services.php');
4242

4343
$container->getDefinition('var_dumper.cloner')
4444
->addMethodCall('setMaxItems', [$config['max_items']])

‎src/Symfony/Bundle/DebugBundle/Resources/config/services.php

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
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\Bridge\Monolog\Command\ServerLogCommand;
15+
use Symfony\Bridge\Twig\Extension\DumpExtension;
16+
use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
17+
use Symfony\Component\HttpKernel\EventListener\DumpListener;
18+
use Symfony\Component\VarDumper\Cloner\VarCloner;
19+
use Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor;
20+
use Symfony\Component\VarDumper\Command\Descriptor\HtmlDescriptor;
21+
use Symfony\Component\VarDumper\Command\ServerDumpCommand;
22+
use Symfony\Component\VarDumper\Dumper\CliDumper;
23+
use Symfony\Component\VarDumper\Dumper\ContextProvider\CliContextProvider;
24+
use Symfony\Component\VarDumper\Dumper\ContextProvider\RequestContextProvider;
25+
use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
26+
use Symfony\Component\VarDumper\Dumper\ContextualizedDumper;
27+
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
28+
use Symfony\Component\VarDumper\Server\Connection;
29+
use Symfony\Component\VarDumper\Server\DumpServer;
30+
31+
return static function (ContainerConfigurator $container) {
32+
$container->parameters()
33+
->set('env(VAR_DUMPER_SERVER)', '127.0.0.1:9912')
34+
;
35+
36+
$container->services()
37+
38+
->set('twig.extension.dump', DumpExtension::class)
39+
->args([
40+
service('var_dumper.cloner'),
41+
service('var_dumper.html_dumper'),
42+
])
43+
->tag('twig.extension')
44+
45+
->set('data_collector.dump', DumpDataCollector::class)
46+
->public()
47+
->args([
48+
service('debug.stopwatch')->ignoreOnInvalid(),
49+
service('debug.file_link_formatter')->ignoreOnInvalid(),
50+
param('kernel.charset'),
51+
service('request_stack'),
52+
null, // var_dumper.cli_dumper or var_dumper.server_connection when debug.dump_destination is set
53+
])
54+
->tag('data_collector', [
55+
'id' => 'dump',
56+
'template' => '@Debug/Profiler/dump.html.twig',
57+
'priority' => 240,
58+
])
59+
60+
->set('debug.dump_listener< 9E88 /span>', DumpListener::class)
61+
->args([
62+
service('var_dumper.cloner'),
63+
service('var_dumper.cli_dumper'),
64+
null,
65+
])
66+
->tag('kernel.event_subscriber')
67+
68+
->set('var_dumper.cloner', VarCloner::class)
69+
->public()
70+
71+
->set('var_dumper.cli_dumper', CliDumper::class)
72+
->args([
73+
null, // debug.dump_destination,
74+
param('kernel.charset'),
75+
0, // flags
76+
])
77+
78+
->set('var_dumper.contextualized_cli_dumper', ContextualizedDumper::class)
79+
->decorate('var_dumper.cli_dumper')
80+
->args([
81+
service('var_dumper.contextualized_cli_dumper.inner'),
82+
[
83+
'source' => inline_service(SourceContextProvider::class)->args([
84+
param('kernel.charset'),
85+
param('kernel.project_dir'),
86+
service('debug.file_link_formatter')->nullOnInvalid(),
87+
]),
88+
],
89+
])
90+
91+
->set('var_dumper.html_dumper', HtmlDumper::class)
92+
->args([
93+
null,
94+
param('kernel.charset'),
95+
0, // flags
96+
])
97+
->call('setDisplayOptions', [
98+
['fileLinkFormat' => service('debug.file_link_formatter')->ignoreOnInvalid()],
99+
])
100+
101+
->set('var_dumper.server_connection', Connection::class)
102+
->args([
103+
abstract_arg('server host'),
104+
[
105+
'source' => inline_service(SourceContextProvider::class)->args([
106+
param('kernel.charset'),
107+
param('kernel.project_dir'),
108+
service('debug.file_link_formatter')->nullOnInvalid(),
109+
]),
110+
'request' => inline_service(RequestContextProvider::class)->args([service('request_stack')]),
111+
'cli' => inline_service(CliContextProvider::class),
112+
],
113+
])
114+
115+
->set('var_dumper.dump_server', DumpServer::class)
116+
->args([
117+
abstract_arg('server host'),
118+
service('logger')->nullOnInvalid(),
119+
])
120+
->tag('monolog.logger', ['channel' => 'debug'])
121+
122+
->set('var_dumper.command.server_dump', ServerDumpCommand::class)
123+
->args([
124+
service('var_dumper.dump_server'),
125+
[
126+
'cli' => inline_service(CliDescriptor::class)->args([service('var_dumper.contextualized_cli_dumper.inner')]),
127+
'html' => inline_service(HtmlDescriptor::class)->args([service('var_dumper.html_dumper')]),
128+
],
129+
])
130+
->tag('console.command', ['command' => 'server:dump'])
131+
132+
->set('monolog.command.server_log', ServerLogCommand::class)
133+
->tag('console.command', ['command' => 'server:log'])
134+
;
135+
};

‎src/Symfony/Bundle/DebugBundle/Resources/config/services.xml

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

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"conflict": {
3131
"symfony/config": "<4.4",
32-
"symfony/dependency-injection": "<4.4"
32+
"symfony/dependency-injection": "<5.2"
3333
},
3434
"suggest": {
3535
"symfony/config": "For service container configuration",

0 commit comments

Comments
 (0)
0