Merge pull request #2 from webfactory/no-304-in-debug

Avoid sending 304s in Symfony kernel.debug mode

Author: mpdude

NotModified/EventListener.php

@@ -37,15 +37,21 @@ final class EventListener
      */
     private $lastModified;
 
+    /**
+     * @var bool Symfony kernel.debug mode
+     */
+    private $debug;
+
     /**
      * @param Reader $reader
      * @param ContainerInterface $container
      */
-    public function __construct(Reader $reader, ContainerInterface $container)
+    public function __construct(Reader $reader, ContainerInterface $container, bool $debug = false)
     {
         $this->reader = $reader;
         $this->container = $container;
         $this->lastModified = new \SplObjectStorage();
+        $this->debug = $debug;
     }
 
     /**
@@ -72,6 +78,12 @@ public function onKernelController(FilterControllerEvent $event)
 
         $this->lastModified[$request] = $lastModified;
 
+        /* Never send 304s for kernel.debug = true: This leads to confusing
+           behavior, for example if you don't see updates to Twig templates. */
+        if ($this->debug) {
+            return;
+        }
+
         $response = new Response();
         $response->setLastModified($lastModified);
 
@@ -108,7 +120,7 @@ private function findAnnotation(callable $controllerCallable)
             return null;
         }
 
-        list($class, $methodName) = $controllerCallable;
+        [$class, $methodName] = $controllerCallable;
         $method = new \ReflectionMethod($class, $methodName);
 
         /** @var ReplaceWithNotModifiedResponse|null $annotation */

NotModified/services.xml

@@ -7,6 +7,7 @@
         <service id="Webfactory\HttpCacheBundle\NotModified\EventListener" class="Webfactory\HttpCacheBundle\NotModified\EventListener" public="true">
             <argument type="service" id="annotation_reader" />
             <argument type="service" id="service_container" />
+            <argument>%kernel.debug%</argument>
             <tag name="kernel.event_listener" event="kernel.controller" priority="-200" />
             <tag name="kernel.event_listener" event="kernel.response" />
         </service>