diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php index de65415d..b706d71b 100644 --- a/src/Foundation/Application.php +++ b/src/Foundation/Application.php @@ -22,6 +22,7 @@ use Illuminate\Http\Middleware\TrustHosts; use Illuminate\Http\Middleware\TrustProxies; use Illuminate\Http\Resources\Json\JsonResource; +use Illuminate\Http\Resources\JsonApi\JsonApiResource; use Illuminate\Mail\Markdown; use Illuminate\Queue\Console\WorkCommand; use Illuminate\Queue\Queue; @@ -233,7 +234,13 @@ public static function flushState(object $instance): void HandleExceptions::flushState($instance); } - JsonResource::wrap('data'); + if (class_exists(JsonApiResource::class)) { + JsonResource::flushState(); // @phpstan-ignore staticMethod.notFound + JsonApiResource::flushState(); + } else { + JsonResource::wrap('data'); + } + Markdown::flushState(); Migrator::withoutMigrations([]); Model::handleDiscardedAttributeViolationUsing(null);