Merge pull request #445 from FriendsOfSymfony/session-listener-no-ses…

…sion

when sessions are not enabled, the listener does not exist either

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.2.2
+-----
+
+### Fixed
+
+* Fix session_listener decoration when session is not enabled.
+
 2.2.1
 -----
 

src/DependencyInjection/Compiler/SessionListenerRemovePass.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the FOSHttpCacheBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\HttpCacheBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Remove the session listener decorator again if the application has no session listener.
+ *
+ * This will happen on some APIs when the session system is not activated.
+ */
+class SessionListenerRemovePass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->has('session_listener')) {
+            return;
+        }
+
+        $container->removeDefinition('fos_http_cache.user_context.session_listener');
+    }
+}

src/FOSHttpCacheBundle.php

@@ -13,10 +13,12 @@
 
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\HashGeneratorPass;
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\LoggerPass;
+use FOS\HttpCacheBundle\DependencyInjection\Compiler\SessionListenerRemovePass;
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\TagListenerPass;
 use Symfony\Component\Console\Application;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\HttpKernel\Kernel;
 
 class FOSHttpCacheBundle extends Bundle
 {
@@ -28,6 +30,11 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new LoggerPass());
         $container->addCompilerPass(new TagListenerPass());
         $container->addCompilerPass(new HashGeneratorPass());
+        if (version_compare(Kernel::VERSION, '3.4', '>=')
+            && version_compare(Kernel::VERSION, '4.1', '<')
+        ) {
+            $container->addCompilerPass(new SessionListenerRemovePass());
+        }
     }
 
     public function registerCommands(Application $application)