CS

Toflar · Toflar · commit 6540ef3a3970 · 2018-03-28T18:09:30.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -22,18 +22,19 @@
 /**
  * Sets the session onto the request on the "kernel.request" event and saves
  * it on the "kernel.response" event.
+ * 
  * In addition, if the session has been started it overrides the Cache-Control
  * header in such a way that all caching is disabled in that case.
  * If you have a scenario where caching responses with session information in
  * them makes sense, you can disable this behaviour by setting the header
- * AbstractSessionListener::SESSION_NO_AUTO_CACHE_CONTROL on the response.
+ * AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER on the response.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Tobias Schultze <http://tobion.de>
  */
 abstract class AbstractSessionListener implements EventSubscriberInterface
 {
-    const SESSION_NO_AUTO_CACHE_CONTROL = 'Symfony-Session-NoAutoCacheControl';
+    const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
 
     protected $container;
 
@@ -71,7 +72,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         $response = $event->getResponse();
 
         if ($session->isStarted() || ($session instanceof Session && $session->hasBeenStarted())) {
-            if (!$response->headers->has(self::SESSION_NO_AUTO_CACHE_CONTROL)) {
+            if (!$response->headers->has(self::NO_AUTO_CACHE_CONTROL_HEADER)) {
                 $response
                     ->setPrivate()
                     ->setMaxAge(0)
@@ -80,7 +81,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         // Always remove the internal header if present
-        $response->headers->remove(self::SESSION_NO_AUTO_CACHE_CONTROL);
+        $response->headers->remove(self::NO_AUTO_CACHE_CONTROL_HEADER);
 
         if ($session->isStarted()) {
             /*
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -74,7 +74,7 @@ public function testResponseIsPrivateIfSessionStarted()
         $this->assertTrue($response->headers->hasCacheControlDirective('private'));
         $this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
         $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
-        $this->assertFalse($response->headers->has(AbstractSessionListener::SESSION_NO_AUTO_CACHE_CONTROL));
+        $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
     }
 
     public function testResponseIsStillPublicIfSessionStartedAndHeaderPresent()
@@ -91,14 +91,14 @@ public function testResponseIsStillPublicIfSessionStartedAndHeaderPresent()
 
         $response = new Response();
         $response->setSharedMaxAge(60);
-        $response->headers->set(AbstractSessionListener::SESSION_NO_AUTO_CACHE_CONTROL, 'true');
+        $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true');
         $listener->onKernelResponse(new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
 
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));
         $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
         $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
-        $this->assertFalse($response->headers->has(AbstractSessionListener::SESSION_NO_AUTO_CACHE_CONTROL));
+        $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
     }
 
     public function testUninitilizedSession()
