Revert "[1.3] Backport Symfony session listener for Symfony 3.4+ to restore user context functionality (#441)"

This reverts commit 5e9a1b2.

Master already has this feature, avoid problems when we have to sync 1.3 to master in the future

Author: dbu

.travis.yml

@@ -50,11 +50,6 @@ matrix:
       env:
         - SYMFONY_VERSION='3.2.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.6
-      env:
-        - SYMFONY_VERSION='3.4.*'
-        - PHPUNIT_FLAGS="--group sf34"
-        - FRAMEWORK_EXTRA_VERSION='~3.0'
     - php: hhvm
       dist: trusty
 

CHANGELOG.md

@@ -1,12 +1,6 @@
 Changelog
 =========
 
-1.3.14
-------
-
-* User context compatibility which was broken due to Symfony making responses
-  private if the session is started as of Symfony 3.4+.
-
 1.3.13
 ------
 

DependencyInjection/FOSHttpCacheExtension.php

@@ -19,7 +19,6 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -225,15 +224,6 @@ private function loadUserContext(ContainerBuilder $container, XmlFileLoader $loa
                 ->addTag(HashGeneratorPass::TAG_NAME)
                 ->setAbstract(false);
         }
-
-        // Only decorate default session listener for Symfony 3.4+
-        if (version_compare(Kernel::VERSION, '3.4', '>=')) {
-            $container->getDefinition('fos_http_cache.user_context.session_listener')
-                ->setArgument(1, strtolower($config['user_hash_header']))
-                ->setArgument(2, array_map('strtolower', $config['user_identifier_headers']));
-        } else {
-            $container->removeDefinition('fos_http_cache.user_context.session_listener');
-        }
     }
 
     private function createRequestMatcher(ContainerBuilder $container, $path = null, $host = null, $methods = null, $ips = null, array $attributes = array())

EventListener/SessionListener.php

@@ -41,12 +41,6 @@
             <argument />
         </service>
 
-        <service id="fos_http_cache.user_context.session_listener" class="FOS\HttpCacheBundle\EventListener\SessionListener" decorates="session_listener" public="false">
-            <argument type="service" id="fos_http_cache.user_context.session_listener.inner" />
-            <argument /> <!-- set by extension -->
-            <argument /> <!-- set by extension -->
-        </service>
-
         <service id="fos_http_cache.user_context.anonymous_request_matcher" class="FOS\HttpCache\UserContext\AnonymousRequestMatcher">
             <argument type="collection" />
         </service>

Resources/config/user_context.xml

@@ -1 +1 @@
-fos_http_cache: []
+fos_http_cache:

Tests/Resources/Fixtures/config/empty.yml

@@ -16,7 +16,6 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\HttpKernel\Kernel;
 
 class FOSHttpCacheExtensionTest extends \PHPUnit_Framework_TestCase
 {
@@ -347,37 +346,6 @@ public function testConfigWithoutUserContext()
         $this->assertFalse($container->has('fos_http_cache.user_context.request_matcher'));
         $this->assertFalse($container->has('fos_http_cache.user_context.role_provider'));
         $this->assertFalse($container->has('fos_http_cache.user_context.logout_handler'));
-        $this->assertFalse($container->has('fos_http_cache.user_context.session_listener'));
-    }
-
-    /**
-     * @group sf34
-     */
-    public function testSessionListenerIsDecoratedIfNeeded()
-    {
-        $config = array(
-            array('user_context' => array(
-                'user_identifier_headers' => array('X-Foo'),
-                'user_hash_header' => 'X-Bar',
-                'hash_cache_ttl' => 30,
-                'role_provider' => true,
-            )),
-        );
-
-        $container = $this->createContainer();
-        $this->extension->load($config, $container);
-
-        // The whole definition should be removed for Symfony < 3.4
-        if (version_compare(Kernel::VERSION, '3.4', '<')) {
-            $this->assertFalse($container->hasDefinition('fos_http_cache.user_context.session_listener'));
-        } else {
-            $this->assertTrue($container->hasDefinition('fos_http_cache.user_context.session_listener'));
-
-            $definition = $container->getDefinition('fos_http_cache.user_context.session_listener');
-
-            $this->assertSame('x-bar', $definition->getArgument(1));
-            $this->assertSame(array('x-foo'), $definition->getArgument(2));
-        }
     }
 
     public function testConfigLoadFlashMessageSubscriber()

Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php

@@ -34,8 +34,7 @@
         "symfony/expression-language": "^2.4||^3.0",
         "symfony/monolog-bundle": "^2.3||^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^0.7.4",
-        "sebastian/exporter": "^1.2||^2.0||^3.0"
+        "matthiasnoback/symfony-dependency-injection-test": "^0.7.4"
     },
     "suggest": {
         "sensio/framework-extra-bundle": "For Tagged Cache Invalidation",