Simplify header use advised by @lalop

Author: designermonkey

src/Cache.php

@@ -57,16 +57,14 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
         }
 
         // Last-Modified header and conditional GET check
-        $lastModified = $response->getHeader('Last-Modified');
-        $lastModified = reset($lastModified);
+        $lastModified = $response->getHeaderLine('Last-Modified');
 
         if ($lastModified) {
             if (!is_integer($lastModified)) {
                 $lastModified = strtotime($lastModified);
             }
 
-            $ifModifiedSince = $request->getHeader('If-Modified-Since');
-            $ifModifiedSince = reset($ifModifiedSince);
+            $ifModifiedSince = $request->getHeaderLine('If-Modified-Since');
 
             if ($ifModifiedSince && $lastModified <= strtotime($ifModifiedSince)) {
                 return $response->withStatus(304);
@@ -78,8 +76,7 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
         $etag = reset($etag);
 
         if ($etag) {
-            $ifNoneMatch = $request->getHeader('If-None-Match');
-            $ifNoneMatch = reset($ifNoneMatch);
+            $ifNoneMatch = $request->getHeaderLine('If-None-Match');
 
             if ($ifNoneMatch) {
                 $etagList = preg_split('@\s*,\s*@', $ifNoneMatch);

tests/CacheProviderTest.php

@@ -11,8 +11,7 @@ public function testAllowCache()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->allowCache(new Response(), 'private', 43200);
 
-        $cacheControl = $res->getHeader('Cache-Control');
-        $cacheControl = reset($cacheControl);
+        $cacheControl = $res->getHeaderLine('Cache-Control');
 
         $this->assertEquals('private, max-age=43200', $cacheControl);
     }
@@ -22,8 +21,7 @@ public function testDenyCache()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->denyCache(new Response());
 
-        $cacheControl = $res->getHeader('Cache-Control');
-        $cacheControl = reset($cacheControl);
+        $cacheControl = $res->getHeaderLine('Cache-Control');
 
         $this->assertEquals('no-store,no-cache', $cacheControl);
     }
@@ -34,8 +32,7 @@ public function testWithExpires()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->withExpires(new Response(), $now);
 
-        $expires = $res->getHeader('Expires');
-        $expires = reset($expires);
+        $expires = $res->getHeaderLine('Expires');
 
         $this->assertEquals(gmdate('D, d M Y H:i:s T', $now), $expires);
     }
@@ -46,8 +43,7 @@ public function testWithETag()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->withEtag(new Response(), $etag);
 
-        $etagHeader = $res->getHeader('ETag');
-        $etagHeader = reset($etagHeader);
+        $etagHeader = $res->getHeaderLine('ETag');
 
         $this->assertEquals('"' . $etag . '"', $etagHeader);
     }
@@ -58,8 +54,7 @@ public function testWithETagWeak()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->withEtag(new Response(), $etag, 'weak');
 
-        $etagHeader = $res->getHeader('ETag');
-        $etagHeader = reset($etagHeader);
+        $etagHeader = $res->getHeaderLine('ETag');
 
         $this->assertEquals('W/"' . $etag . '"', $etagHeader);
     }
@@ -80,8 +75,7 @@ public function testWithLastModified()
         $cacheProvider = new CacheProvider();
         $res = $cacheProvider->withLastModified(new Response(), $now);
 
-        $lastModified = $res->getHeader('Last-Modified');
-        $lastModified = reset($lastModified);
+        $lastModified = $res->getHeaderLine('Last-Modified');
 
         $this->assertEquals(gmdate('D, d M Y H:i:s T', $now), $lastModified);
     }

tests/CacheTest.php

@@ -32,8 +32,7 @@ public function testCacheControlHeader()
         };
         $res = $cache($req, $res, $next);
 
-        $cacheControl = $res->getHeader('Cache-Control');
-        $cacheControl = reset($cacheControl);
+        $cacheControl = $res->getHeaderLine('Cache-Control');
 
         $this->assertEquals('public, max-age=86400', $cacheControl);
     }
@@ -48,8 +47,7 @@ public function testCacheControlHeaderDoesNotOverrideExistingHeader()
         };
         $res = $cache($req, $res, $next);
 
-        $cacheControl = $res->getHeader('Cache-Control');
-        $cacheControl = reset($cacheControl);
+        $cacheControl = $res->getHeaderLine('Cache-Control');
 
         $this->assertEquals('no-cache,no-store', $cacheControl);
     }