8000 minor #37207 [Ssi] Move configuration to PHP (50bhan) · flack/symfony@3c5f9d1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3c5f9d1

Browse files
fabpotfabpot
committed
minor symfony#37207 [Ssi] Move configuration to PHP (50bhan)
This PR was squashed before being merged into the 5.2-dev branch. Discussion ---------- [Ssi] Move configuration to PHP | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Ref symfony#37186 | License | MIT | Doc PR | n/a Commits ------- 5a4d667 [Ssi] Move configuration to PHP
2 parents 188a985 + 5a4d667 commit 3c5f9d1

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public function load(array $configs, ContainerBuilder $container)
366366
$propertyInfoEnabled = $this->isConfigEnabled($container, $config['property_info']);
367367
$this->registerValidationConfiguration($config['validation'], $container, $loader, $propertyInfoEnabled);
368368
$this->registerEsiConfiguration($config['esi'], $container, $loader);
369-
$this->registerSsiConfiguration($config['ssi'], $container, $loader);
369+
$this->registerSsiConfiguration($config['ssi'], $container, $phpLoader);
370370
$this->registerFragmentsConfiguration($config['fragments'], $container, $loader);
371371
$this->registerTranslatorConfiguration($config['translator'], $container, $loader, $config['default_locale']);
372372
$this->registerProfilerConfiguration($config['profiler'], $container, $loader);
@@ -543,15 +543,15 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta
543543
$loader->load('esi.xml');
544544
}
545545

546-
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
546+
private function registerSsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
547547
{
548548
if (!$this->isConfigEnabled($container, $config)) {
549549
$container->removeDefinition('fragment.renderer.ssi');
550550

551551
return;
552552
}
553553

554-
$loader->load('ssi.xml');
554+
$loader->load('ssi.php');
555555
}
556556

557557
private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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\SurrogateListener;
15+
use Symfony\Component\HttpKernel\HttpCache\Ssi;
16+
17+
return static function (ContainerConfigurator $container) {
18+
$container->services()
19+
->set('ssi', Ssi::class)
20+
21+
->set('ssi_listener', SurrogateListener::class)
22+
->args([service('ssi')->ignoreOnInvalid()])
23+
->tag('kernel.event_subscriber')
24+
;
25+
};

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

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

0 commit comments

Comments
 (0)
0