Added fig/http-message-util package

TheDragonCode · Feb 4, 2022 · 6a5d552 · 6a5d552
1 parent 78cb718
commit 6a5d552
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "dragon-code/laravel-cache": "^2.10",
         "dragon-code/simple-data-transfer-object": "^2.1",
         "dragon-code/support": "^5.6",
+        "fig/http-message-util": "^1.1",
         "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",

diff --git a/src/Middlewares/CheckLastModified.php b/src/Middlewares/CheckLastModified.php
@@ -20,6 +20,8 @@
 use Closure;
 use DragonCode\LastModified\Facades\Config;
 use DragonCode\LastModified\Services\Checker;
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Illuminate\Http\Request;
 
 class CheckLastModified
@@ -33,7 +35,7 @@ public function handle(Request $request, Closure $next)
         $service = $this->service($request);
 
         if ($service->isNotModified()) {
-            return response(null, 304);
+            return response(null, StatusCodeInterface::STATUS_NOT_MODIFIED);
         }
 
         return $this->setLastModified($request, $next, $service);
@@ -63,6 +65,11 @@ protected function disallowMethod(Request $request): bool
     {
         $method = $request->getRealMethod();
 
-        return ! in_array($method, ['GET', 'HEAD'], true);
+        return ! in_array($method, $this->requestMethods(), true);
+    }
+
+    protected function requestMethods(): array
+    {
+        return [RequestMethodInterface::METHOD_GET, RequestMethodInterface::METHOD_HEAD];
     }
 }
diff --git a/tests/Concerns/Requests.php b/tests/Concerns/Requests.php
@@ -20,6 +20,7 @@
 namespace Tests\Concerns;
 
 use Carbon\Carbon;
+use Fig\Http\Message\RequestMethodInterface;
 use Illuminate\Http\Request;
 use Lmc\HttpConstants\Header;
 
@@ -44,7 +45,7 @@ protected function requestInstance(Carbon $date = null): Request
     {
         $server = ! empty($date) ? $this->getRequestDateHeader($date) : [];
 
-        return Request::create($this->url(), 'GET', [], [], [], $server);
+        return Request::create($this->url(), RequestMethodInterface::METHOD_GET, [], [], [], $server);
     }
 
     protected function getRequestDateHeader(Carbon $date): array