From cb1db1a63e7d1f5cada6eedb7b4c7eb829ca0f7e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 20 Nov 2013 10:43:36 +0100
Subject: [PATCH] remove Thelia ResponseListener

---
 core/lib/Thelia/Config/Resources/action.xml   |  6 --
 core/lib/Thelia/Config/Resources/config.xml   | 16 ++--
 core/lib/Thelia/Core/Bundle/TheliaBundle.php  |  3 +-
 .../Core/EventListener/ResponseListener.php   | 76 -------------------
 4 files changed, 12 insertions(+), 89 deletions(-)
 delete mode 100644 core/lib/Thelia/Core/EventListener/ResponseListener.php

diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index 60c435a05..d8252f11b 100755
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -4,12 +4,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
-    <parameters>
-        <parameter key="thelia.actionEvent" type="collection">
-
-        </parameter>
-    </parameters>
-
     <services>
 
         <service id="thelia.action.cart" class="Thelia\Action\Cart">
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 54b699b71..f30e6b9cb 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -4,11 +4,13 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
+    <parameters>
+        <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
+        <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\EsiListener</parameter>
+    </parameters>
 
     <services>
-
         <!--  URL maganement -->
-
         <service id="thelia.url.manager" class="Thelia\Tools\URL">
             <argument type="service" id="service_container" />
         </service>
@@ -17,6 +19,12 @@
             <argument type="service" id="service_container" />
         </service>
 
+        <service id="esi" class="%esi.class%" />
+
+        <service id="esi_listener" class="%esi_listener.class%">
+            <tag name="kernel.event_subscriber" />
+            <argument type="service" id="esi" on-invalid="ignore" />
+        </service>
 		<!--
 		A ControllerResolver that supports "a:b:c", "service:method" and class::method" notations,
 		thus allowing the definition of controllers as service (see http://symfony.com/fr/doc/current/cookbook/controller/service.html)
@@ -70,10 +78,6 @@
         <service id="mailer" class="Thelia\Mailer\MailerFactory">
             <argument type="service" id="event_dispatcher"/>
         </service>
-
-        <service id="thelia.response.listener" class="Thelia\Core\EventListener\ResponseListener">
-            <tag name="kernel.event_subscriber"/>
-        </service>
     </services>
 
 </config>
diff --git a/core/lib/Thelia/Core/Bundle/TheliaBundle.php b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
index 3df5e4345..4678bae88 100755
--- a/core/lib/Thelia/Core/Bundle/TheliaBundle.php
+++ b/core/lib/Thelia/Core/Bundle/TheliaBundle.php
@@ -22,6 +22,7 @@
 /*************************************************************************************/
 namespace Thelia\Core\Bundle;
 
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Scope;
@@ -61,7 +62,7 @@ class TheliaBundle extends Bundle
 
         $container
             ->addCompilerPass(new TranslatorPass())
-            ->addCompilerPass(new RegisterListenersPass())
+            ->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_AFTER_REMOVING)
             ->addCompilerPass(new RegisterParserPluginPass())
             ->addCompilerPass(new RegisterRouterPass())
             ->addCompilerPass(new RegisterCouponPass())
diff --git a/core/lib/Thelia/Core/EventListener/ResponseListener.php b/core/lib/Thelia/Core/EventListener/ResponseListener.php
deleted file mode 100644
index eb03bde81..000000000
--- a/core/lib/Thelia/Core/EventListener/ResponseListener.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*************************************************************************************/
-/*                                                                                   */
-/*      Thelia	                                                                     */
-/*                                                                                   */
-/*      Copyright (c) OpenStudio                                                     */
-/*      email : info@thelia.net                                                      */
-/*      web : http://www.thelia.net                                                  */
-/*                                                                                   */
-/*      This program is free software; you can redistribute it and/or modify         */
-/*      it under the terms of the GNU General Public License as published by         */
-/*      the Free Software Foundation; either version 3 of the License                */
-/*                                                                                   */
-/*      This program is distributed in the hope that it will be useful,              */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
-/*      GNU General Public License for more details.                                 */
-/*                                                                                   */
-/*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
-/*                                                                                   */
-/*************************************************************************************/
-
-namespace Thelia\Core\EventListener;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-
-/**
- * Class ResponseListener
- * @package Thelia\Core\EventListener
- * @author manuel raynaud <mraynaud@openstudio.fr>
- */
-class ResponseListener implements EventSubscriberInterface
-{
-
-    public function onResponse(FilterResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        if($request->headers->has('Surrogate-Capability'))
-        {
-            $response = $event->getResponse();
-            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
-            $event->setResponse($response);
-        }
-    }
-
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The array keys are event names and the value can be:
-     *
-     *  * The method name to call (priority defaults to 0)
-     *  * An array composed of the method name to call and the priority
-     *  * An array of arrays composed of the method names to call and respective
-     *    priorities, or 0 if unset
-     *
-     * For instance:
-     *
-     *  * array('eventName' => 'methodName')
-     *  * array('eventName' => array('methodName', $priority))
-     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
-     *
-     * @return array The event names to listen to
-     *
-     * @api
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => array('onResponse', 0)
-        );
-    }
-}
\ No newline at end of file