JsonResponse返回状态码回滚

app/Http/Controllers/JsonResponseHelper.php

@@ -11,43 +11,31 @@ trait JsonResponseHelper
      * 201
      *
      * @param array|string|null $content
-     * @return JsonResponse
+     * @return Response
      */
-    protected function created(string $message='', array $headers = [], int $options = 0): JsonResponse
+    protected function created(array|string $content = null): Response
     {
-        //return new Response($content, Response::HTTP_CREATED);
-        return response()->json([
-            'code'=>201,
-            'message' =>  $message ? $message : 'Successfully Created.'
-        ], Response::HTTP_CREATED, $headers, $options);
+        return new Response($content, Response::HTTP_CREATED);
     }
 
     /**
      * 202
      *
-     * @return JsonResponse
+     * @return Response
      */
-    protected function accepted(string $message='', array $headers = [], int $options = 0): JsonResponse
+    protected function accepted(): Response
     {
-        //return new Response('', Response::HTTP_ACCEPTED);
-        return response()->json([
-            'code'=>202,
-            'message' =>  $message
-        ], Response::HTTP_ACCEPTED, $headers, $options);
+        return new Response('', Response::HTTP_ACCEPTED);
     }
 
     /**
      * 204
      *
-     * @return JsonResponse
+     * @return Response
      */
-    protected function noContent(string $message='', array $headers = [], int $options = 0): JsonResponse
+    protected function noContent(): Response
     {
-        //return new Response('', Response::HTTP_NO_CONTENT);
-        return response()->json([
-            'code'=>204,
-            'message' => $message
-        ], Response::HTTP_NO_CONTENT, $headers, $options);
+        return new Response('', Response::HTTP_NO_CONTENT);
     }
 
     /**
@@ -61,7 +49,6 @@ trait JsonResponseHelper
     protected function badRequest(string $message, array $headers = [], int $options = 0): JsonResponse
     {
         return response()->json([
-            'code'=>400,
             'message' => $message
         ], Response::HTTP_BAD_REQUEST, $headers, $options);
     }
@@ -77,7 +64,6 @@ trait JsonResponseHelper
     protected function unauthorized(string $message = '', array $headers = [], int $options = 0): JsonResponse
     {
         return response()->json([
-            'code'=>401,
             'message' => $message ? $message : 'Token Signature could not be verified.'
         ], Response::HTTP_UNAUTHORIZED, $headers, $options);
     }
@@ -93,7 +79,6 @@ trait JsonResponseHelper
     protected function forbidden(string $message = '', array $headers = [], int $options = 0): JsonResponse
     {
         return response()->json([
-            'code'=>403,
             'message' => $message ? $message : 'Insufficient permissions.'
         ], Response::HTTP_FORBIDDEN, $headers, $options);
     }
@@ -110,7 +95,6 @@ trait JsonResponseHelper
     protected function unprocesableEtity(array $errors = [], array $headers = [], string $message = '', $options = 0): JsonResponse
     {
         return response()->json([
-            'code'=>422,
             'message' => $message ? $message : '422 Unprocessable Entity',
             'errors' => $errors
         ], Response::HTTP_UNPROCESSABLE_ENTITY, $headers, $options);
@@ -126,9 +110,6 @@ trait JsonResponseHelper
      */
     protected function success(array $data, array $headers = [], $options = 0): JsonResponse
     {
-        return response()->json([
-           'code'=>200,
-           'data'=> $data
-        ], Response::HTTP_OK, $headers, $options);
+        return response()->json($data, Response::HTTP_OK, $headers, $options);
     }
 }