diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #37207 [Ssi] Move configuration to PHP (50bhan)

Browse Source 
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 #37186
| License       | MIT
| Doc PR        | n/a

Commits
-------

5a4d667369 [Ssi] Move configuration to PHP
This commit is contained in:
Fabien Potencier 2020-06-11 16:52:53 +02:00
commit 3c5f9d1c8c
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -366,7 +366,7 @@ class FrameworkExtension extends Extension
$propertyInfoEnabled = $this->isConfigEnabled($container, $config['property_info']);
$this->registerValidationConfiguration($config['validation'], $container, $loader, $propertyInfoEnabled);
$this->registerEsiConfiguration($config['esi'], $container, $loader);
$this->registerSsiConfiguration($config['ssi'], $container, $loader);
$this->registerSsiConfiguration($config['ssi'], $container, $phpLoader);
$this->registerFragmentsConfiguration($config['fragments'], $container, $loader);
$this->registerTranslatorConfiguration($config['translator'], $container, $loader, $config['default_locale']);
$this->registerProfilerConfiguration($config['profiler'], $container, $loader);
@ -543,7 +543,7 @@ class FrameworkExtension extends Extension
$loader->load('esi.xml');
}
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
private function registerSsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
{
if (!$this->isConfigEnabled($container, $config)) {
$container->removeDefinition('fragment.renderer.ssi');
@ -551,7 +551,7 @@ class FrameworkExtension extends Extension
return;
}
$loader->load('ssi.xml');
$loader->load('ssi.php');
}
private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)

25
src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.php Normal file
View File

@ -0,0 +1,25 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
use Symfony\Component\HttpKernel\EventListener\SurrogateListener;
use Symfony\Component\HttpKernel\HttpCache\Ssi;
return static function (ContainerConfigurator $container) {
$container->services()
->set('ssi', Ssi::class)
->set('ssi_listener', SurrogateListener::class)
->args([service('ssi')->ignoreOnInvalid()])
->tag('kernel.event_subscriber')
;
};

17
src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<defaults public="false" />
<service id="ssi" class="Symfony\Component\HttpKernel\HttpCache\Ssi" />
<service id="ssi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener">
<tag name="kernel.event_subscriber" />
<argument type="service" id="ssi" on-invalid="ignore" />
</service>
</services>
</container>