Merge remote-tracking branch 'origin/master'

Author: d8vjork

src/Http/Resources/Authorizable.php

@@ -2,8 +2,8 @@
 
 namespace SkoreLabs\JsonApi\Http\Resources;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 trait Authorizable
 {
@@ -18,12 +18,13 @@ trait Authorizable
      * Authorize to view this resource.
      *
      * @param mixed $resource
+     *
      * @return void
      */
     protected function authorize($resource)
     {
         $this->authorize = $this->authorize
-            ?: ! $resource instanceof Model
+            ?: !$resource instanceof Model
             ?: Auth::user()->can('view', $resource);
 
         return $this->authorize;

src/Http/Resources/CollectsResources.php

@@ -3,17 +3,18 @@
 namespace SkoreLabs\JsonApi\Http\Resources;
 
 use Illuminate\Http\Resources\MissingValue;
-use Illuminate\Support\Str;
 use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
 
 trait CollectsResources
 {
     /**
      * Map the given collection resource into its individual resources.
      *
-     * @param  mixed  $resource
+     * @param mixed $resource
+     *
      * @return mixed
      */
     protected function collectResource($resource)
@@ -24,7 +25,7 @@ protected function collectResource($resource)
 
         $collects = $this->collects();
 
-        $this->collection = $collects && ! $resource->first() instanceof $collects
+        $this->collection = $collects && !$resource->first() instanceof $collects
             ? $this->getFiltered($resource, $collects)
             : $resource->toBase();
 
@@ -34,9 +35,10 @@ protected function collectResource($resource)
     }
 
     /**
-     * Undocumented function
+     * Undocumented function.
      *
      * @param \Illuminate\Pagination\AbstractPaginator $resource
+     *
      * @return void
      */
     protected function refreshPaginator(AbstractPaginator $resource)
@@ -55,6 +57,7 @@ protected function refreshPaginator(AbstractPaginator $resource)
      *
      * @param mixed $resource
      * @param mixed $collects
+     *
      * @return \Illuminate\Support\Collection
      */
     protected function getFiltered($resource, $collects)
@@ -71,7 +74,7 @@ protected function getFiltered($resource, $collects)
         });
 
         return $collection->filter(function (JsonApiResource $item) {
-            return ! $item->resource instanceof MissingValue;
+            return !$item->resource instanceof MissingValue;
         });
     }
 

src/Http/Resources/Json/ResourceCollection.php

@@ -3,11 +3,11 @@
 namespace SkoreLabs\JsonApi\Http\Resources\Json;
 
 use Countable;
-use IteratorAggregate;
-use Illuminate\Pagination\AbstractPaginator;
-use SkoreLabs\JsonApi\Http\Resources\JsonApiResource;
 use Illuminate\Http\Resources\Json\PaginatedResourceResponse;
+use Illuminate\Pagination\AbstractPaginator;
+use IteratorAggregate;
 use SkoreLabs\JsonApi\Http\Resources\CollectsResources;
+use SkoreLabs\JsonApi\Http\Resources\JsonApiResource;
 
 class ResourceCollection extends JsonApiResource implements Countable, IteratorAggregate
 {
@@ -30,7 +30,8 @@ class ResourceCollection extends JsonApiResource implements Countable, IteratorA
     /**
      * Create a new resource instance.
      *
-     * @param  mixed  $resource
+     * @param mixed $resource
+     *
      * @return void
      */
     public function __construct($resource)
@@ -51,7 +52,8 @@ public function count()
     /**
      * Transform the resource into a JSON array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
@@ -62,7 +64,8 @@ public function toArray($request)
     /**
      * Create an HTTP response that represents the object.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function toResponse($request)

src/Http/Resources/JsonApiCollection.php

@@ -11,8 +11,9 @@ class JsonApiCollection extends ResourceCollection
     /**
      * Create a new resource instance.
      *
-     * @param  mixed  $resource
-     * @param  bool|null  $authorize
+     * @param mixed     $resource
+     * @param bool|null $authorize
+     *
      * @return void
      */
     public function __construct($resource, $authorize = null)

src/Http/Resources/JsonApiResource.php

@@ -20,8 +20,9 @@ class JsonApiResource extends JsonResource
     /**
      * Create a new resource instance.
      *
-     * @param  mixed  $resource
-     * @param  bool|null  $authorize
+     * @param mixed     $resource
+     * @param bool|null $authorize
+     *
      * @return void
      */
     public function __construct($resource, $authorize = null)
@@ -30,7 +31,7 @@ public function __construct($resource, $authorize = null)
             $this->authorize = $authorize;
         }
 
-        if (! $this->authorize($resource)) {
+        if (!$this->authorize($resource)) {
             $this->resource = new MissingValue();
         } else {
             $this->resource = $resource;
@@ -41,15 +42,16 @@ public function __construct($resource, $authorize = null)
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         if ($this->evaluateResponse()) {
             return [
                 $this->merge($this->getResourceIdentifier()),
-                'attributes' => $this->getAttributes(),
+                'attributes'    => $this->getAttributes(),
                 'relationships' => $this->when(
                     $this->relationships, $this->relationships
                 ),
@@ -66,9 +68,9 @@ public function toArray($request)
      */
     protected function evaluateResponse()
     {
-        return ! is_array($this->resource)
-            && ! is_null($this->resource)
-            && ! $this->resource instanceof MissingValue;
+        return !is_array($this->resource)
+            && !is_null($this->resource)
+            && !$this->resource instanceof MissingValue;
     }
 
     /**
@@ -80,7 +82,7 @@ public function getResourceIdentifier()
     {
         return [
             $this->resource->getKeyName() => (string) $this->resource->getKey(),
-            'type' => Str::snake(class_basename($this->resource)),
+            'type'                        => Str::snake(class_basename($this->resource)),
         ];
     }
 
@@ -92,7 +94,7 @@ public function getResourceIdentifier()
     protected function getAttributes()
     {
         return array_filter($this->resource->attributesToArray(), function ($key) {
-            return ! Str::endsWith($key, '_id') && $key !== $this->resource->getKeyName();
+            return !Str::endsWith($key, '_id') && $key !== $this->resource->getKeyName();
         }, ARRAY_FILTER_USE_KEY);
     }
 }

src/Http/Resources/RelationshipsWithIncludes.php

@@ -2,8 +2,8 @@
 
 namespace SkoreLabs\JsonApi\Http\Resources;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Arr;
 
@@ -37,6 +37,7 @@ protected function withRelationships()
      * Attach relationships to the resource.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
+     *
      * @return void
      */
     protected function attachRelations(Model $model)
@@ -53,7 +54,7 @@ protected function attachRelations(Model $model)
                 }
             }
 
-            if ($relationObj instanceof Model && ! $relationObj instanceof Pivot) {
+            if ($relationObj instanceof Model && !$relationObj instanceof Pivot) {
                 $this->relationships[$relation]['data'] = $this->processModelRelation(
                     $relationObj
                 );
@@ -65,6 +66,7 @@ protected function attachRelations(Model $model)
      * Process a model relation attaching to its model additional attributes.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
+     *
      * @return array
      */
     protected function processModelRelation(Model $model)
@@ -82,6 +84,7 @@ protected function processModelRelation(Model $model)
      * Set included data to resource's with.
      *
      * @param array $arrays,...
+     *
      * @return void
      */
     protected function addIncluded(...$arrays)