Merge branch 'hotfix/1.1.2'

Author: Toflar

.php_cs

@@ -35,6 +35,7 @@ return PhpCsFixer\Config::create()
             'psr4' => true,
             'strict_comparison' => true,
             'strict_param' => true,
+            'native_function_invocation' => ['include' => ['@compiler_optimized']],
         )
     )
     ->setFinder(

composer.json

@@ -18,7 +18,7 @@
         "symfony/options-resolver": "^3.0|^4.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.6",
+        "friendsofphp/php-cs-fixer": "^2.12",
         "phpunit/phpunit": "^5.7.27",
         "php-coveralls/php-coveralls": "^2.1"
     },

src/Psr6Store.php

@@ -231,7 +231,11 @@ public function write(Request $request, Response $response)
         // Tags
         $tags = [];
         if ($response->headers->has($this->options['cache_tags_header'])) {
-            $tags = explode(',', $response->headers->get($this->options['cache_tags_header']));
+            foreach ($response->headers->get($this->options['cache_tags_header'], '', false) as $header) {
+                foreach (explode(',', $header) as $tag) {
+                    $tags[] = $tag;
+                }
+            }
         }
 
         // Prune expired entries on file system if needed

tests/Psr6StoreTest.php

@@ -22,7 +22,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Lock\Exception\LockReleasingException;
 use Symfony\Component\Lock\Factory;
-use Symfony\Component\Lock\Lock;
 use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
@@ -231,6 +230,21 @@ public function testWriteAddsTags()
         $this->assertFalse($this->getCache()->getItem($cacheKey)->isHit());
     }
 
+    public function testWriteAddsTagsWithMultipleHeaders()
+    {
+        $request = Request::create('/');
+        $response = new Response('hello world', 200);
+        $response->headers->set('Cache-Tags', ['foobar,other tag', 'some,more', 'tags', 'split,over', 'multiple-headers']);
+
+        $cacheKey = $this->store->getCacheKey($request);
+
+        $this->store->write($request, $response);
+
+        $this->assertTrue($this->getCache()->getItem($cacheKey)->isHit());
+        $this->assertTrue($this->store->invalidateTags(['multiple-headers']));
+        $this->assertFalse($this->getCache()->getItem($cacheKey)->isHit());
+    }
+
     public function testInvalidateTagsThrowsExceptionIfWrongCacheAdapterProvided()
     {
         $this->expectException(\RuntimeException::class);