Update ControllerDecorator.php for Laravel 9 and 10 compatibility (#266)

References #265 265
lorisleiva · Jan 8, 2024 · 54b73e2 · 54b73e2
1 parent 5250614
commit 54b73e2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Decorators/ControllerDecorator.php b/src/Decorators/ControllerDecorator.php
@@ -70,9 +70,9 @@ public function __invoke(string $method)
 
         $response = $this->run($method);
 
-        if ($this->hasMethod('jsonResponse') && $request->expectsJson()) {
+        if ($this->hasMethod('jsonResponse') && ($request->expectsJson() || $request->isJson())) {
             $response = $this->callMethod('jsonResponse', [$response, $request]);
-        } elseif ($this->hasMethod('htmlResponse') && ! $request->expectsJson()) {
+        } elseif ($this->hasMethod('htmlResponse') && ! ($request->expectsJson() || $request->isJson())) {
             $response = $this->callMethod('htmlResponse', [$response, $request]);
         }