testing and CakeResponseFactory improvements

Author: jeffersongoncalves

composer.json

@@ -11,11 +11,12 @@
         }
     ],
     "require": {
-        "cakephp/cakephp": "^3.0|^4.0",
-        "league/glide": "^1.0"
+        "cakephp/cakephp": "^3.4|^4.0",
+        "league/glide": "^1.0",
+        "laminas/laminas-diactoros": "^1.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": ">=5.6.3|^8.0"
     },
     "autoload": {
         "psr-4": {

src/Responses/CakeResponseFactory.php

@@ -2,6 +2,8 @@
 
 namespace League\Glide\Responses;
 
+use Cake\Http\Response;
+use Laminas\Diactoros\CallbackStream;
 use League\Flysystem\FilesystemInterface;
 
 class CakeResponseFactory implements ResponseFactoryInterface
@@ -24,21 +26,16 @@ public function create(FilesystemInterface $cache, $path)
         $cacheControl = 'max-age=31536000, public';
         $expires = date_create('+1 years')->format('D, d M Y H:i:s').' GMT';
 
-        if (class_exists('\Cake\Network\Response')) {
-            $response = new \Cake\Network\Response();
-        } else {
-            $response = new \Cake\Http\Response();
-        }
-        $response->type($contentType);
-        $response->header('Content-Length', $contentLength);
-        $response->header('Cache-Control', $cacheControl);
-        $response->header('Expires', $expires);
-        $response->body(function () use ($stream) {
-            rewind($stream);
-            fpassthru($stream);
-            fclose($stream);
-        });
+        $response = new Response();
 
-        return $response;
+        return $response->withType($contentType)
+            ->withLength($contentLength)
+            ->withAddedHeader('Cache-Control', $cacheControl)
+            ->withExpires($expires)
+            ->withBody(new CallbackStream(function () use ($stream) {
+                rewind($stream);
+                fpassthru($stream);
+                fclose($stream);
+            }));
     }
 }

tests/Responses/CakeResponseFactoryTest.php

@@ -4,17 +4,22 @@
 
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
+use PHPUnit\Framework\TestCase;
 
-class CakeResponseFactoryTest extends \PHPUnit_Framework_TestCase
+class CakeResponseFactoryTest extends TestCase
 {
     public function testCreateInstance()
     {
+        $cakeResponseFactory = new CakeResponseFactory();
         $this->assertInstanceOf(
             'League\Glide\Responses\CakeResponseFactory',
-            new CakeResponseFactory()
+            $cakeResponseFactory
         );
     }
 
+    /**
+     * @throws \League\Flysystem\FileNotFoundException
+     */
     public function testCreate()
     {
         $cache = new Filesystem(
@@ -25,10 +30,12 @@ public function testCreate()
         /** @var \Cake\Http\Response|\Cake\Network\Response $response */
         $response = $factory->create($cache, 'kayaks.jpg');
 
-        $this->assertInstanceOf('Cake\Network\Response', $response);
-        $this->assertEquals('image/jpeg', $response->type());
-        $this->assertEquals('5175', $response->getHeaderLine('Content-Length'));
-        $this->assertContains(gmdate('D, d M Y H:i', strtotime('+1 years')), $response->getHeaderLine('Expires'));
-        $this->assertEquals('max-age=31536000, public', $response->getHeaderLine('Cache-Control'));
+        $headers = $response->getHeaders();
+
+        $this->assertInstanceOf('Cake\Http\Response', $response);
+        $this->assertEquals('image/jpeg', $headers['Content-Type'][0]);
+        $this->assertEquals('5175', $headers['Content-Length'][0]);
+        $this->assertStringContainsString(gmdate('D, j M Y H:i:s', strtotime('+1 years')).' GMT', $headers['Expires'][0]);
+        $this->assertEquals('max-age=31536000, public', $headers['Cache-Control'][0]);
     }
 }