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

n3storm · web-flow · commit 54b73e29d39d · 2024-01-08T10:48:01.000Z
References #265 265
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]);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ public function __invoke(string $method)`
`70`	`70`
`71`	`71`	`$response = $this->run($method);`
`72`	`72`
`73`		`- if ($this->hasMethod('jsonResponse') && $request->expectsJson()) {`
	`73`	`+ if ($this->hasMethod('jsonResponse') && ($request->expectsJson() \|\| $request->isJson())) {`
`74`	`74`	`$response = $this->callMethod('jsonResponse', [$response, $request]);`
`75`		`- } elseif ($this->hasMethod('htmlResponse') && ! $request->expectsJson()) {`
	`75`	`+ } elseif ($this->hasMethod('htmlResponse') && ! ($request->expectsJson() \|\| $request->isJson())) {`
`76`	`76`	`$response = $this->callMethod('htmlResponse', [$response, $request]);`
`77`	`77`	`}`
`78`	`78`