Merge pull request #447 from emodric/session_listener_regression

[1.3] when sessions are not enabled, the listener does not exist either

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.3.15
+------
+
+* Fix session_listener decoration when session is not enabled.
+
 1.3.14
 ------
 

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');
+    }
+}

FOSHttpCacheBundle.php

@@ -15,8 +15,10 @@
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\SecurityContextPass;
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\TagSubscriberPass;
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\HashGeneratorPass;
+use FOS\HttpCacheBundle\DependencyInjection\Compiler\SessionListenerRemovePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\HttpKernel\Kernel;
 
 class FOSHttpCacheBundle extends Bundle
 {
@@ -29,5 +31,8 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new SecurityContextPass());
         $container->addCompilerPass(new TagSubscriberPass());
         $container->addCompilerPass(new HashGeneratorPass());
+        if (version_compare(Kernel::VERSION, '3.4', '>=')) {
+            $container->addCompilerPass(new SessionListenerRemovePass());
+        }
     }
 }