Move configuration to PHP

Author: tuanminhgp

DependencyInjection/FrameworkExtension.php

@@ -365,7 +365,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $propertyInfoEnabled = $this->isConfigEnabled($container, $config['property_info']);
         $this->registerValidationConfiguration($config['validation'], $container, $phpLoader, $propertyInfoEnabled);
-        $this->registerEsiConfiguration($config['esi'], $container, $loader);
+        $this->registerEsiConfiguration($config['esi'], $container, $phpLoader);
         $this->registerSsiConfiguration($config['ssi'], $container, $phpLoader);
         $this->registerFragmentsConfiguration($config['fragments'], $container, $phpLoader);
         $this->registerTranslatorConfiguration($config['translator'], $container, $phpLoader, $config['default_locale']);
@@ -532,15 +532,15 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
         }
     }
 
-    private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function registerEsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
             $container->removeDefinition('fragment.renderer.esi');
 
             return;
         }
 
-        $loader->load('esi.xml');
+        $loader->load('esi.php');
     }
 
     private function registerSsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)

Resources/config/esi.php

@@ -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\Esi;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('esi', Esi::class)
+
+        ->set('esi_listener', SurrogateListener::class)
+            ->args([service('esi')->ignoreOnInvalid()])
+            ->tag('kernel.event_subscriber')
+        ;
+};