Rename isRequestSafe to isRequestCacheable

FriendsOfSymfony · Jan 4, 2017 · cf0687a · cf0687a
1 parent ca76fde
commit cf0687a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/EventListener/AbstractRuleSubscriber.php b/EventListener/AbstractRuleSubscriber.php
@@ -62,7 +62,7 @@ protected function matchRule(Request $request, Response $response)
      *
      * @return bool True if the request is safe and headers can be set
      */
-    protected function isRequestSafe(Request $request)
+    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;
         }
 

diff --git a/EventListener/TagSubscriber.php b/EventListener/TagSubscriber.php
@@ -79,7 +79,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             }
         }
 
-        if ($this->isRequestSafe($request)) {
+        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/Fixtures/Controller/TagController.php b/Tests/Functional/Fixtures/Controller/TagController.php
@@ -23,9 +23,9 @@ class TagController extends Controller
      *
      * @param Request $request
      *
-     * @return bool True if the request is safe
+     * @return bool True if the request is cacheable
      */
-    private function isRequestSafe(Request $request)
+    private function isRequestCacheable(Request $request)
     {
         return method_exists($request, 'isMethodCacheable') ? $request->isMethodCacheable() : $request->isMethodSafe();
     }
@@ -44,7 +44,7 @@ public function listAction()
      */
     public function itemAction(Request $request, $id)
     {
-        if (!$this->isRequestSafe($request)) {
+        if (!$this->isRequestCacheable($request)) {
             $this->container->get('fos_http_cache.handler.tag_handler')->invalidateTags(array('all-items'));
         }