Merge pull request #13 from CodeIncHQ/2.x

v2.0.2

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "codeinc/assets-middleware",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A PSR-15 middleware to server static assets (CSS, JS, images, etc.)",
   "homepage": "https://github.com/CodeIncHQ/AssetsMiddleware",
   "type": "library",

src/Responses/AssetResponse.php

@@ -21,7 +21,7 @@
 //
 declare(strict_types=1);
 namespace CodeInc\AssetsMiddleware\Responses;
-use CodeInc\Psr7Responses\FileResponse;
+use CodeInc\Psr7Responses\LocalFileResponse;
 
 
 /**
@@ -30,7 +30,7 @@
  * @package CodeInc\AssetsMiddleware\Responses
  * @author Joan Fabrégat <[email protected]>
  */
-class AssetResponse extends FileResponse implements AssetResponseInterface
+class AssetResponse extends LocalFileResponse implements AssetResponseInterface
 {
     /**
      * @var string
@@ -41,18 +41,19 @@ class AssetResponse extends FileResponse implements AssetResponseInterface
      * AssetResponse constructor.
      *
      * @param string $assetPath
-     * @param string $mediaType
+     * @param string $contentType
      * @throws \CodeInc\MediaTypes\Exceptions\MediaTypesException
      */
-    public function __construct(string $assetPath, string $mediaType)
+    public function __construct(string $assetPath, string $contentType)
     {
         $this->assetPath = $assetPath;
         parent::__construct(
             $assetPath,
-            basename($assetPath),
             200,
             '',
-            $mediaType,
+            null,
+            $contentType,
+            null,
             false
         );
     }

src/Responses/MinifiedAssetResponse.php

@@ -59,11 +59,12 @@ public function __construct(string $assetPath, string $mediaType)
         $this->assetPath = $assetPath;
         $this->mediaType = $mediaType;
         parent::__construct(
-            $this->buildStream($assetPath),
             basename($assetPath),
+            $this->buildStream($assetPath),
             200,
             '',
             $mediaType,
+            null,
             false
         );
     }

src/Responses/NotModifiedAssetResponse.php

@@ -21,7 +21,7 @@
 //
 declare(strict_types=1);
 namespace CodeInc\AssetsMiddleware\Responses;
-use CodeInc\Psr7Responses\EmptyResponse;
+use CodeInc\Psr7Responses\NotModifiedResponse;
 
 
 /**
@@ -30,7 +30,7 @@
  * @package CodeInc\AssetsMiddleware\Responses
  * @author Joan Fabrégat <[email protected]>
  */
-class NotModifiedAssetResponse extends EmptyResponse implements AssetResponseInterface
+class NotModifiedAssetResponse extends NotModifiedResponse implements AssetResponseInterface
 {
     /**
      * @var string
@@ -45,7 +45,7 @@ class NotModifiedAssetResponse extends EmptyResponse implements AssetResponseInt
     public function __construct(string $assetPath)
     {
         $this->assetPath = $assetPath;
-        parent::__construct(304);
+        parent::__construct();
     }
 
     /**