Fix code and tests

Author: designermonkey

src/Cache.php

@@ -58,20 +58,29 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
 
         // Last-Modified header and conditional GET check
         $lastModified = $response->getHeader('Last-Modified');
+        $lastModified = reset($lastModified);
+
         if ($lastModified) {
             if (!is_integer($lastModified)) {
                 $lastModified = strtotime($lastModified);
             }
+
             $ifModifiedSince = $request->getHeader('If-Modified-Since');
+            $ifModifiedSince = reset($ifModifiedSince);
+
             if ($ifModifiedSince && $lastModified <= strtotime($ifModifiedSince)) {
                 return $response->withStatus(304);
             }
         }
 
         // ETag header and conditional GET check
         $etag = $response->getHeader('ETag');
+        $etag = reset($etag);
+
         if ($etag) {
             $ifNoneMatch = $request->getHeader('If-None-Match');
+            $ifNoneMatch = reset($ifNoneMatch);
+
             if ($ifNoneMatch) {
                 $etagList = preg_split('@\s*,\s*@', $ifNoneMatch);
                 if (in_array($etag, $etagList) || in_array('*', $etagList)) {

tests/CacheProviderTest.php

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

tests/CacheTest.php

@@ -7,16 +7,16 @@
 use Slim\Http\Uri;
 use Slim\Http\Headers;
 use Slim\Http\Body;
-use Slim\Collection;
+use Slim\Http\Collection;
 
 class CacheTest extends \PHPUnit_Framework_TestCase
 {
     public function requestFactory()
     {
         $uri = Uri::createFromString('https://example.com:443/foo/bar?abc=123');
         $headers = new Headers();
-        $cookies = new Collection();
-        $serverParams = new Collection();
+        $cookies = [];
+        $serverParams = [];
         $body = new Body(fopen('php://temp', 'r+'));
 
         return new Request('GET', $uri, $headers, $cookies, $serverParams, $body);
@@ -32,7 +32,10 @@ public function testCacheControlHeader()
         };
         $res = $cache($req, $res, $next);
 
-        $this->assertEquals('public, max-age=86400', $res->getHeader('Cache-Control'));
+        $cacheControl = $res->getHeader('Cache-Control');
+        $cacheControl = reset($cacheControl);
+
+        $this->assertEquals('public, max-age=86400', $cacheControl);
     }
 
     public function testCacheControlHeaderDoesNotOverrideExistingHeader()
@@ -45,7 +48,10 @@ public function testCacheControlHeaderDoesNotOverrideExistingHeader()
         };
         $res = $cache($req, $res, $next);
 
-        $this->assertEquals('no-cache,no-store', $res->getHeader('Cache-Control'));
+        $cacheControl = $res->getHeader('Cache-Control');
+        $cacheControl = reset($cacheControl);
+
+        $this->assertEquals('no-cache,no-store', $cacheControl);
     }
 
     public function testLastModifiedWithCacheHit()