f

Author: dunglas

composer.json

@@ -17,14 +17,9 @@
 
         "doctrine/inflector": "^1.0",
         "psr/cache": "^1.0",
-<<<<<<< HEAD
         "psr/container": "^1.0",
         "symfony/http-foundation": "^3.3@beta",
         "symfony/http-kernel": "^3.3@beta",
-=======
-        "symfony/http-foundation": "^3.1.6",
-        "symfony/http-kernel": "^2.7 || ^3.0",
->>>>>>> Fix tests
         "symfony/property-access": "^2.7 || ^3.0",
         "symfony/property-info": "^3.3@beta",
         "symfony/serializer": "^3.3@beta",

src/Bridge/Symfony/Bundle/Resources/config/http_cache.xml

@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.http_cache.listener.response.configure" class="ApiPlatform\Core\HttpCache\EventListener\ConfigureListener">
+        <service id="api_platform.http_cache.listener.response.configure" class="ApiPlatform\Core\HttpCache\EventListener\AddHeadersListener">
             <argument>%api_platform.http_cache.etag%</argument>
             <argument>%api_platform.http_cache.max_age%</argument>
             <argument>%api_platform.http_cache.shared_max_age%</argument>

src/HttpCache/EventListener/ConfigureListener.php renamed to src/HttpCache/EventListener/AddHeadersListener.php

@@ -22,7 +22,7 @@
  *
  * @experimental
  */
-final class ConfigureListener
+final class AddHeadersListener
 {
     private $etag;
     private $maxAge;