[HttpFoundation] Add support for all core http control directives

azjezz · azjezz · commit 1686e68c3e49 · 2020-02-17T11:59:54.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -82,6 +82,24 @@ class Response
     const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
     const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;                             // RFC6585
 
+    const HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES = [
+        // Core
+        'must_revalidate',
+        'no_cache',
+        'no_store',
+        'no_transform',
+        'public',
+        'private',
+        'proxy_revalidate',
+        'max_age',
+        's_maxage',
+        // Extensions
+        'immutable',
+        // Other
+        'last_modified',
+        'etag',
+    ];
+
     /**
      * @var ResponseHeaderBag
      */
@@ -928,7 +946,7 @@ public function setEtag(string $etag = null, bool $weak = false): object
      */
     public function setCache(array $options): object
     {
-        if ($diff = array_diff(array_keys($options), ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'])) {
+        if ($diff = array_diff(array_keys($options), static::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES)) {
             throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
         }
 
@@ -968,6 +986,16 @@ public function setCache(array $options): object
             $this->setImmutable((bool) $options['immutable']);
         }
 
+        foreach (['proxy_revalidate', 'must_revalidate', 'no_cache', 'no_store', 'no_transform'] as $directive) {
+            if (isset($options[$directive])) {
+                if ($options[$directive]) {
+                    $this->headers->addCacheControlDirective(str_replace('_', '-', $directive));
+                } else {
+                    $this->headers->removeCacheControlDirective(str_replace('_', '-', $directive));
+                }
+            }
+        }
+
         return $this;
     }
 
