formatting

Author: taylorotwell

src/Illuminate/Http/Resources/JsonApi/Concerns/ResolvesJsonApiSpecifications.php

@@ -113,7 +113,7 @@ public function resolveResourceIncluded(Request $request): array
             $relations->push([
                 'id' => $uniqueKey[1],
                 'type' => $uniqueKey[0],
-                'attributes' => $resource->asJsonApi()->toArray($request),
+                'attributes' => $resource->toArray($request),
             ]);
         }
 

src/Illuminate/Http/Resources/JsonApi/JsonApiResource.php

@@ -57,32 +57,29 @@ public static function configure(?string $version = null, array $ext = [], array
     }
 
     /**
-     * Set the string that should wrap the outer-most resource array.
+     * Get the resource's ID.
      *
-     * @param  string  $value
-     * @return never
-     *
-     * @throws \RuntimeException
+     * @param  \Illuminate\Http\Request  $request
+     * @return string
      */
-    #[\Override]
-    public static function wrap($value)
+    public function id(Request $request)
     {
-        throw new BadMethodCallException(sprintf('Using %s() method is not allowed.', __METHOD__));
+        return $this->resolveResourceIdentifier($request);
     }
 
     /**
-     * Disable wrapping of the outer-most resource array.
+     * Get the resource's type.
      *
-     * @return never
+     * @param  \Illuminate\Http\Request  $request
+     * @return string
      */
-    #[\Override]
-    public static function withoutWrapping()
+    public function type(Request $request)
     {
-        throw new BadMethodCallException(sprintf('Using %s() method is not allowed.', __METHOD__));
+        return $this->resolveResourceType($request);
     }
 
     /**
-     * Resource "links" for JSON:API.
+     * Get the resource's links.
      *
      * @param  \Illuminate\Http\Request  $request
      * @return array
@@ -93,7 +90,7 @@ public function links(Request $request)
     }
 
     /**
-     * Resource "meta" for JSON:API.
+     * Get the resource's meta information.
      *
      * @param  \Illuminate\Http\Request  $request
      * @return array
@@ -103,28 +100,6 @@ public function meta(Request $request)
         return $this->jsonApiMeta;
     }
 
-    /**
-     * Resource "id" for JSON:API.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string
-     */
-    public function id(Request $request)
-    {
-        return $this->resolveResourceIdentifier($request);
-    }
-
-    /**
-     * Resource "type" for JSON:API.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string
-     */
-    public function type(Request $request)
-    {
-        return $this->resolveResourceType($request);
-    }
-
     /**
      * Get any additional data that should be returned with the resource array.
      *
@@ -166,39 +141,44 @@ public function resolve($request = null)
     #[\Override]
     public function withResponse(Request $request, JsonResponse $response): void
     {
-        $response->header('Content-type', 'application/vnd.api+json');
+        $response->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
-     * Transform JSON resource to JSON:API.
+     * Create a new resource collection instance.
      *
-     * @param  array  $links
-     * @param  array  $meta
-     * @return $this
+     * @param  mixed  $resource
+     * @return \Illuminate\Http\Resources\JsonApi\AnonymousResourceCollection
      */
-    public function asJsonApi(array $links = [], array $meta = [])
+    #[\Override]
+    protected static function newCollection($resource)
     {
-        if (! empty($links)) {
-            $this->jsonApiLinks = array_merge($this->jsonApiLinks, $links);
-        }
-
-        if (! empty($meta)) {
-            $this->jsonApiMeta = array_merge($this->jsonApiMeta, $meta);
-        }
+        return new AnonymousResourceCollection($resource, static::class);
+    }
 
-        return $this;
+    /**
+     * Set the string that should wrap the outer-most resource array.
+     *
+     * @param  string  $value
+     * @return never
+     *
+     * @throws \RuntimeException
+     */
+    #[\Override]
+    public static function wrap($value)
+    {
+        throw new BadMethodCallException(sprintf('Using %s() method is not allowed.', __METHOD__));
     }
 
     /**
-     * Create a new resource collection instance.
+     * Disable wrapping of the outer-most resource array.
      *
-     * @param  mixed  $resource
-     * @return \Illuminate\Http\Resources\JsonApi\AnonymousResourceCollection
+     * @return never
      */
     #[\Override]
-    protected static function newCollection($resource)
+    public static function withoutWrapping()
     {
-        return new AnonymousResourceCollection($resource, static::class);
+        throw new BadMethodCallException(sprintf('Using %s() method is not allowed.', __METHOD__));
     }
 
     /**