8000 minor #37211 [Fragment] Move configuration to PHP (idetox) · JudicaelR/symfony@f6d1869 · GitHub
[go: up one dir, main page]
Skip to content

Commit f6d1869

Browse files
TobionTobion
committed
minor symfony#37211 [Fragment] Move configuration to PHP (idetox)
This PR was merged into the 5.2-dev branch. Discussion ---------- [Fragment] Move configuration to PHP | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Ref symfony#37186 | License | MIT Commits ------- eaf53f6 [Fragment] Move configuration to PHP
2 parents 4b22f97 + eaf53f6 commit f6d1869

File tree

5 files changed

+91
-71
lines changed

5 files changed

+91
-71
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public function load(array $configs, ContainerBuilder $container)
175175

176176
$loader->load('web.xml');
177177
$loader->load('services.xml');
178-
$loader->load('fragment_renderer.xml');
178+
$phpLoader->load('fragment_renderer.php');
179179
$phpLoader->load('error_renderer.php');
180180

181181
if (interface_exists(PsrEventDispatcherInterface::class)) {
@@ -367,7 +367,7 @@ public function load(array $configs, ContainerBuilder $container)
367367
$this->registerValidationConfiguration($config['validation'], $container, $loader, $propertyInfoEnabled);
368368
$this->registerEsiConfiguration($config['esi'], $container, $loader);
369369
$this->registerSsiConfiguration($config['ssi'], $container, $phpLoader);
370-
$this->registerFragmentsConfiguration($config['fragments'], $container, $loader);
370+
$this->registerFragmentsConfiguration($config['fragments'], $container, $phpLoader);
371371
$this->registerTranslatorConfiguration($config['translator'], $container, $loader, $config['default_locale']);
372372
$this->registerProfilerConfiguration($config['profiler'], $container, $loader, $phpLoader);
373373
$this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
@@ -554,7 +554,7 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta
554554
$loader->load('ssi.php');
555555
}
556556

557-
private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
557+
private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
558558
{
559559
if (!$this->isConfigEnabled($container, $config)) {
560560
$container->removeDefinition('fragment.renderer.hinclude');
@@ -564,7 +564,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
564564

565565
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
566566

567-
$loader->load('fragment_listener.xml');
567+
$loader->load('fragment_listener.php');
568568
$container->setParameter('fragment.path', $config['path']);
569569
}
570570

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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\FragmentListener;
15+
16+
return static function (ContainerConfigurator $container) {
17+
$container->services()
18+
->set('fragment.listener', FragmentListener::class)
19+
->args([service('uri_signer'), param('fragment.path')])
20+
->tag('kernel.event_subscriber')
21+
;
22+
};

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml

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

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.php

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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\DependencyInjection\LazyLoadingFragmentHandler;
15+
use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
16+
use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
17+
use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
18+
use Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer;
19+
20+
return static function (ContainerConfigurator $container) {
21+
$container->parameters()
22+
->set('fragment.renderer.hinclude.global_template', null)
23+
->set('fragment.path', '/_fragment')
24+
;
25+
26+
$container->services()
27+
->set('fragment.handler', LazyLoadingFragmentHandler::class)
28+
->args([
29+
abstract_arg('fragment renderer locator'),
30+
service('request_stack'),
31+
param('kernel.debug'),
32+
])
33+
34+
->set('fragment.renderer.inline', InlineFragmentRenderer::class)
35+
->args([service('http_kernel'), service('event_dispatcher')])
36+
->call('setFragmentPath', [param('fragment.path')])
37+
->tag('kernel.fragment_renderer', ['alias' => 'inline'])
38+
39+
->set('fragment.renderer.hinclude', HIncludeFragmentRenderer::class)
40+
->args([
41+
service('twig')->nullOnInvalid(),
42+
service('uri_signer'),
43+
param('fragment.renderer.hinclude.global_template'),
44+
])
45+
->call('setFragmentPath', [param('fragment.path')])
46+
47+
->set('fragment.renderer.esi', EsiFragmentRenderer::class)
48+
->args([
49+
service('esi')->nullOnInvalid(),
50+
service('fragment.renderer.inline'),
51+
service('uri_signer'),
52+
])
53+
->call('setFragmentPath', [param('fragment.path')])
54+
->tag('kernel.fragment_renderer', ['alias' => 'esi'])
55+
56+
->set('fragment.renderer.ssi', SsiFragmentRenderer::class)
57+
->args([
58+
service('ssi')->nullOnInvalid(),
59+
service('fragment.renderer.inline'),
60+
service('uri_signer'),
61+
])
62+
->call('setFragmentPath', [param('fragment.path')])
63+
->tag('kernel.fragment_renderer', ['alias' => 'ssi'])
64+
;
65+
};

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml

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

0 commit comments

Comments
 (0)
0