Merge branch 'hotfix/1.0.2' into develop

Author: Toflar

README.md

@@ -65,7 +65,12 @@ For the Symfony 4/Flex structure, you need to adjust your `index.php` like this:
 
 // public/index.php
 $kernel = new Kernel($env, $debug);
-$kernel = new HttpCache($kernel, new Psr6Store(['cache_directory' => $kernel->getCacheDir()]));
+$kernel = new HttpCache(
+    $kernel,
+    new Psr6Store(['cache_directory' => $kernel->getCacheDir()]),
+    null,
+    ['debug' => $debug]
+);
 ```
 
 That's it, that's all there is to do. The `Psr6Store` will automatically

src/Psr6Store.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Lock\Exception\LockReleasingException;
@@ -120,7 +119,7 @@ public function __construct(array $options = [])
             }
 
             return new TagAwareAdapter(
-                new FilesystemAdapter('http-cache-tags', 0, $options['cache_directory'])
+                new FilesystemAdapter('http_cache', 0, $options['cache_directory'])
             );
         })->setAllowedTypes('cache', AdapterInterface::class);
 
@@ -167,7 +166,7 @@ public function lookup(Request $request)
             // Otherwise we have to see if Vary headers match
             $varyKeyRequest = $this->getVaryKey(
                 $responseData['vary'],
-                $request->headers
+                $request
             );
 
             if ($varyKeyRequest === $varyKeyResponse) {
@@ -218,7 +217,7 @@ public function write(Request $request, Response $response)
         }
 
         // Add or replace entry with current Vary header key
-        $entries[$this->getVaryKey($response->getVary(), $response->headers)] = [
+        $entries[$this->getVaryKey($response->getVary(), $request)] = [
             'vary' => $response->getVary(),
             'headers' => $headers,
             'status' => $response->getStatusCode(),
@@ -400,12 +399,12 @@ public function getCacheKey(Request $request)
     }
 
     /**
-     * @param array     $vary
-     * @param HeaderBag $headerBag
+     * @param array   $vary
+     * @param Request $request
      *
      * @return string
      */
-    public function getVaryKey(array $vary, HeaderBag $headerBag)
+    public function getVaryKey(array $vary, Request $request)
     {
         if (0 === \count($vary)) {
             return self::NON_VARYING_KEY;
@@ -416,7 +415,7 @@ public function getVaryKey(array $vary, HeaderBag $headerBag)
         $hashData = '';
 
         foreach ($vary as $headerName) {
-            $hashData .= $headerName.':'.$headerBag->get($headerName);
+            $hashData .= $headerName.':'.$request->headers->get($headerName);
         }
 
         return hash('sha256', $hashData);

tests/Psr6StoreTest.php

@@ -332,34 +332,36 @@ public function testLookupWithEmptyCache()
     public function testLookupWithVaryResponse()
     {
         $request = Request::create('https://foobar.com/');
-        $response = new Response('hello world', 200, ['Vary' => 'Foobar', 'Foobar' => 'whatever']);
+        $request->headers->set('Foobar', 'whatever');
+        $response = new Response('hello world', 200, ['Vary' => 'Foobar']);
 
         $this->store->write($request, $response);
 
+        $request = Request::create('https://foobar.com/');
         $result = $this->store->lookup($request);
-
         $this->assertNull($result);
 
         $request = Request::create('https://foobar.com/');
         $request->headers->set('Foobar', 'whatever');
-
         $result = $this->store->lookup($request);
-
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('hello world', $result->getContent());
         $this->assertSame('Foobar', $result->headers->get('Vary'));
-        $this->assertSame('whatever', $result->headers->get('Foobar'));
     }
 
     public function testLookupWithMultipleVaryResponse()
     {
-        $request = Request::create('https://foobar.com/');
-        $response1 = new Response('should be whatever 1', 200, ['Vary' => 'Foobar', 'Foobar' => 'whatever1']);
-        $response2 = new Response('should be whatever 2', 200, ['Vary' => 'Foobar', 'Foobar' => 'whatever2']);
+        $jsonRequest = Request::create('https://foobar.com/');
+        $jsonRequest->headers->set('Accept', 'application/json');
+        $htmlRequest = Request::create('https://foobar.com/');
+        $htmlRequest->headers->set('Accept', 'text/html');
+
+        $jsonResponse = new Response('{}', 200, ['Vary' => 'Accept', 'Content-Type' => 'application/json']);
+        $htmlResponse = new Response('<html></html>', 200, ['Vary' => 'Accept', 'Content-Type' => 'text/html']);
 
         // Fill cache
-        $this->store->write($request, $response1);
-        $this->store->write($request, $response2);
+        $this->store->write($jsonRequest, $jsonResponse);
+        $this->store->write($htmlRequest, $htmlResponse);
 
         // Should return null because no header provided
         $request = Request::create('https://foobar.com/');
@@ -368,27 +370,27 @@ public function testLookupWithMultipleVaryResponse()
 
         // Should return null because header provided but non matching content
         $request = Request::create('https://foobar.com/');
-        $request->headers->set('Foobar', 'whatever3');
+        $request->headers->set('Accept', 'application/xml');
         $result = $this->store->lookup($request);
         $this->assertNull($result);
 
-        // Should return $response1
+        // Should return a JSON response
         $request = Request::create('https://foobar.com/');
-        $request->headers->set('Foobar', 'whatever1');
+        $request->headers->set('Accept', 'application/json');
         $result = $this->store->lookup($request);
         $this->assertSame(200, $result->getStatusCode());
-        $this->assertSame('should be whatever 1', $result->getContent());
-        $this->assertSame('Foobar', $result->headers->get('Vary'));
-        $this->assertSame('whatever1', $result->headers->get('Foobar'));
+        $this->assertSame('{}', $result->getContent());
+        $this->assertSame('Accept', $result->headers->get('Vary'));
+        $this->assertSame('application/json', $result->headers->get('Content-Type'));
 
-        // Should return $response2
+        // Should return an HTML response
         $request = Request::create('https://foobar.com/');
-        $request->headers->set('Foobar', 'whatever2');
+        $request->headers->set('Accept', 'text/html');
         $result = $this->store->lookup($request);
         $this->assertSame(200, $result->getStatusCode());
-        $this->assertSame('should be whatever 2', $result->getContent());
-        $this->assertSame('Foobar', $result->headers->get('Vary'));
-        $this->assertSame('whatever2', $result->headers->get('Foobar'));
+        $this->assertSame('<html></html>', $result->getContent());
+        $this->assertSame('Accept', $result->headers->get('Vary'));
+        $this->assertSame('text/html', $result->headers->get('Content-Type'));
     }
 
     public function testInvalidate()