Skip to content

Commit 1af0791

Browse files
Fixed an error in setting requests for exceptions
1 parent bba9370 commit 1af0791

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/Middlewares/SetHeaderMiddleware.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
namespace DragonCode\LaravelJsonResponse\Middlewares;
66

77
use Closure;
8-
use Illuminate\Http\Request;
8+
use Illuminate\Support\Str;
99
use Lmc\HttpConstants\Header;
1010

1111
class SetHeaderMiddleware
1212
{
13-
public function handle(Request $request, Closure $next)
13+
public function handle($request, Closure $next)
1414
{
1515
return $this->set(
1616
$next($this->set($request))
@@ -19,10 +19,20 @@ public function handle(Request $request, Closure $next)
1919

2020
protected function set($request)
2121
{
22-
if (! $request->headers->has(Header::ACCEPT)) {
22+
if (!$this->hasHeader($request) || $this->isAsterisk($request)) {
2323
$request->headers->set(Header::ACCEPT, 'application/json');
2424
}
2525

2626
return $request;
2727
}
28+
29+
protected function hasHeader($request): bool
30+
{
31+
return $request->headers->has(Header::ACCEPT);
32+
}
33+
34+
protected function isAsterisk($request): bool
35+
{
36+
return Str::contains($request->headers->get(Header::ACCEPT, ''), '*/*');
37+
}
2838
}

0 commit comments

Comments
 (0)