Merge branch 'hotfix/2.1.2'

Author: Toflar

.travis.yml

@@ -12,23 +12,13 @@ matrix:
     - php: 7.2
     - php: 7.2
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-    - php: 7.3
-      env: COVERAGE='--coverage-clover build/logs/clover.xml'
     - php: 7.3
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-    - php: 7.4snapshot
-    - php: 7.4snapshot
-      env: COMPOSER_DEV_STABILITY=true
-    - php: 7.4snapshot
+    - php: 7.4
+    - php: 7.4
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-    - php: nightly
-    - php: nightly
-      env: COMPOSER_DEV_STABILITY=true
-    - php: nightly
-      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-  allow_failures:
-    - php: 7.4snapshot
-    - php: nightly
+    - php: 7.4
+      env: COVERAGE='--coverage-clover build/logs/clover.xml'
 
 before_script:
   - |

composer.json

@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^5.6|^7.1",
         "symfony/lock": "^3.4|^4.0|^5.0",
         "symfony/cache": "^3.4|^4.0|^5.0",
         "symfony/http-foundation": "^3.0|^4.0|^5.0",
         "symfony/http-kernel": "^3.0|^4.0|^5.0",
         "symfony/options-resolver": "^3.0|^4.0|^5.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.12",
+        "friendsofphp/php-cs-fixer": "^2.16.1",
         "symfony/phpunit-bridge": "^4.3.5",
         "php-coveralls/php-coveralls": "^2.1"
     },

phpunit.xml.dist

@@ -11,7 +11,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
     </php>
     <testsuites>
         <testsuite name="PSR-6 HttpCache Store Test Suite">

src/Psr6Store.php

@@ -107,8 +107,6 @@ class Psr6Store implements Psr6StoreInterface
      *
      *                      Type: string
      *                      Default: Cache-Tags
-     *
-     * @param array $options
      */
     public function __construct(array $options = [])
     {
@@ -256,12 +254,10 @@ public function write(Request $request, Response $response)
         // Tags
         $tags = [];
         if ($response->headers->has($this->options['cache_tags_header'])) {
-            // Symfony < 4.4
-            $headers = $response->headers->get($this->options['cache_tags_header'], '', false);
-            if (\is_string($headers)) {
-                // Symfony >= 4.4
-                $headers = $response->headers->all($this->options['cache_tags_header']);
-            }
+            // Compatibility with Symfony 3+
+            $allHeaders = $response->headers->all();
+            $key = str_replace('_', '-', strtolower($this->options['cache_tags_header']));
+            $headers = isset($allHeaders[$key]) ? $allHeaders[$key] : [];
 
             foreach ($headers as $header) {
                 foreach (explode(',', $header) as $tag) {
@@ -428,8 +424,6 @@ public function prune()
     }
 
     /**
-     * @param Request $request
-     *
      * @return string
      */
     public function getCacheKey(Request $request)
@@ -442,9 +436,6 @@ public function getCacheKey(Request $request)
     }
 
     /**
-     * @param array   $vary
-     * @param Request $request
-     *
      * @return string
      */
     public function getVaryKey(array $vary, Request $request)
@@ -478,8 +469,6 @@ public function getVaryKey(array $vary, Request $request)
     }
 
     /**
-     * @param Response $response
-     *
      * @return string
      */
     public function generateContentDigest(Response $response)