Merge pull request #338 from j0k3r/symfony-3.2-for-1.3

Add support for Symfony 3.*
FriendsOfSymfony · Jan 6, 2017 · d5cccee · d5cccee
2 parents 23c4dc2 + cf0687a
commit d5cccee
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -64,6 +64,14 @@ matrix:
       env:
         - SYMFONY_VERSION='3.0.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
+    - php: 5.6
+      env:
+        - SYMFONY_VERSION='3.1.*'
+        - FRAMEWORK_EXTRA_VERSION='~3.0'
+    - php: 5.6
+      env:
+        - SYMFONY_VERSION='3.2.*'
+        - FRAMEWORK_EXTRA_VERSION='~3.0'
 
 install:
   - pip install -qr Resources/doc/requirements.txt --user

diff --git a/EventListener/AbstractRuleSubscriber.php b/EventListener/AbstractRuleSubscriber.php
@@ -54,4 +54,16 @@ protected function matchRule(Request $request, Response $response)
 
         return false;
     }
+
+    /**
+     * Decide whether to even look for matching rules with the current request.
+     *
+     * @param Request $request
+     *
+     * @return bool True if the request is safe and headers can be set
+     */
+    protected function isRequestCacheable(Request $request)
+    {
+        return method_exists($request, 'isMethodCacheable') ? $request->isMethodCacheable() : $request->isMethodSafe();
+    }
 }
diff --git a/EventListener/CacheControlSubscriber.php b/EventListener/CacheControlSubscriber.php
@@ -102,7 +102,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         // do not change cache directives on unsafe requests.
-        if ($this->skip || !$this->isRequestSafe($request)) {
+        if ($this->skip || !$this->isRequestCacheable($request)) {
             return;
         }
 
@@ -158,7 +158,7 @@ private function setCache(Response $response, array $directives, $overwrite)
             return;
         }
 
-        if ('no-cache' === $response->headers->get('cache-control')) {
+        if (false !== strpos($response->headers->get('Cache-Control'), 'no-cache')) {
             // this single header is set by default. if its the only thing, we override it.
             $response->setCache($directives);
 
@@ -210,16 +210,4 @@ private function setExtraCacheDirectives(Response $response, array $controls, $o
             }
         }
     }
-
-    /**
-     * Decide whether to even look for matching rules with the current request.
-     *
-     * @param Request $request
-     *
-     * @return bool True if the request is safe and headers can be set
-     */
-    protected function isRequestSafe(Request $request)
-    {
-        return $request->isMethodSafe();
-    }
 }
diff --git a/EventListener/TagSubscriber.php b/EventListener/TagSubscriber.php
@@ -79,7 +79,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             }
         }
 
-        if ($request->isMethodSafe()) {
+        if ($this->isRequestCacheable($request)) {
             $this->tagHandler->addTags($tags);
             if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
                 // For safe requests (GET and HEAD), set cache tags on response

diff --git a/Tests/Functional/EventListener/CacheControlSubscriberTest.php b/Tests/Functional/EventListener/CacheControlSubscriberTest.php
@@ -30,6 +30,6 @@ public function testNotCached()
 
         $client->request('GET', '/noncached');
         $response = $client->getResponse();
-        $this->assertEquals('no-cache', $response->headers->get('Cache-Control'));
+        $this->assertContains('no-cache', $response->headers->get('Cache-Control'));
     }
 }
diff --git a/Tests/Functional/Fixtures/Controller/TagController.php b/Tests/Functional/Fixtures/Controller/TagController.php
@@ -18,6 +18,18 @@
 
 class TagController extends Controller
 {
+    /**
+     * Workaround to be compliant with all Symfony version.
+     *
+     * @param Request $request
+     *
+     * @return bool True if the request is cacheable
+     */
+    private function isRequestCacheable(Request $request)
+    {
+        return method_exists($request, 'isMethodCacheable') ? $request->isMethodCacheable() : $request->isMethodSafe();
+    }
+
     /**
      * @Tag("all-items")
      * @Tag("item-123")
@@ -32,7 +44,7 @@ public function listAction()
      */
     public function itemAction(Request $request, $id)
     {
-        if (!$request->isMethodSafe()) {
+        if (!$this->isRequestCacheable($request)) {
             $this->container->get('fos_http_cache.handler.tag_handler')->invalidateTags(array('all-items'));
         }
 

diff --git a/Tests/Unit/EventListener/CacheControlSubscriberTest.php b/Tests/Unit/EventListener/CacheControlSubscriberTest.php
@@ -224,7 +224,7 @@ public function testSetOnlyNoCacheHeader()
         $subscriber->onKernelResponse($event);
         $newHeaders = $event->getResponse()->headers->all();
 
-        $this->assertEquals('no-cache', $newHeaders['cache-control'][0]);
+        $this->assertContains('no-cache', $newHeaders['cache-control'][0]);
     }
 
     public function testSkip()
@@ -242,7 +242,7 @@ public function testSkip()
         $subscriber->onKernelResponse($event);
         $newHeaders = $event->getResponse()->headers->all();
 
-        $this->assertEquals('no-cache', $newHeaders['cache-control'][0]);
+        $this->assertContains('no-cache', $newHeaders['cache-control'][0]);
     }
 
     public function testVary()
@@ -332,7 +332,7 @@ public function testMatchRule()
 
         $subscriber->onKernelResponse($event2);
         $newHeaders = $response2->headers->all();
-        $this->assertEquals('no-cache', $newHeaders['cache-control'][0]);
+        $this->assertContains('no-cache', $newHeaders['cache-control'][0]);
     }
 
     /**