Use arrow functions where possible

Author: JaZo

src/Collection.php

@@ -16,9 +16,7 @@ class Collection extends \Illuminate\Support\Collection implements DataInterface
     public function toJsonApiArray(): array
     {
         return array_map(
-            function ($value) {
-                return $value instanceof DataInterface ? $value->toJsonApiArray() : $value;
-            },
+            static fn ($value) => $value instanceof DataInterface ? $value->toJsonApiArray() : $value,
             $this->items
         );
     }

src/DocumentFactory.php

@@ -37,16 +37,8 @@ public function make(DataInterface $data): DocumentInterface
     private function getIncluded(DataInterface $data): Collection
     {
         return Collection::wrap($data)
-            ->flatMap(
-                function (ItemInterface $item) {
-                    return $this->getIncludedFromItem($item);
-                }
-            )
-            ->unique(
-                static function (ItemInterface $item) {
-                    return sprintf('%s:%s', $item->getType(), $item->getId());
-                }
-            )
+            ->flatMap(fn (ItemInterface $item) => $this->getIncludedFromItem($item))
+            ->unique(static fn (ItemInterface $item) => sprintf('%s:%s', $item->getType(), $item->getId()))
             ->values();
     }
 
@@ -70,16 +62,8 @@ static function ($relationship) {
                     return Collection::wrap($relationship->getIncluded());
                 }
             )
-            ->flatMap(
-                function (ItemInterface $item) {
-                    return Collection::wrap($item)->merge($this->getIncludedFromItem($item));
-                }
-            )
-            ->filter(
-                function (ItemInterface $item) {
-                    return $this->itemCanBeIncluded($item);
-                }
-            );
+            ->flatMap(fn (ItemInterface $item) => Collection::wrap($item)->merge($this->getIncludedFromItem($item)))
+            ->filter(fn (ItemInterface $item) => $this->itemCanBeIncluded($item));
     }
 
     /**

src/Item.php

@@ -83,9 +83,7 @@ public function fill(array $attributes)
      */
     public function forceFill(array $attributes)
     {
-        return static::unguarded(function () use ($attributes) {
-            return $this->fill($attributes);
-        });
+        return static::unguarded(fn () => $this->fill($attributes));
     }
 
     /**
@@ -118,9 +116,10 @@ public static function hydrate(array $items): array
     {
         $instance = new static();
 
-        return array_map(static function ($item) use ($instance) {
-            return $instance->newInstance($item);
-        }, $items);
+        return array_map(
+            static fn ($item) => $instance->newInstance($item),
+            $items
+        );
     }
 
     /**

src/Links.php

@@ -118,9 +118,7 @@ public function offsetUnset($offset)
     public function toArray()
     {
         return array_map(
-            static function (?Link $link) {
-                return $link ? $link->toArray() : null;
-            },
+            static fn (?Link $link) => $link ? $link->toArray() : null,
             $this->links
         );
     }

src/Parsers/CollectionParser.php

@@ -37,10 +37,6 @@ public function parse($data): Collection
         }
 
         return Collection::make($data)
-            ->map(
-                function ($item) {
-                    return $this->itemParser->parse($item);
-                }
-            );
+            ->map(fn ($item) => $this->itemParser->parse($item));
     }
 }

src/Parsers/DocumentParser.php

@@ -202,11 +202,7 @@ private function getDocument($data): DocumentInterface
      */
     private function linkRelationships(Collection $items): void
     {
-        $keyedItems = $items->keyBy(
-            function (ItemInterface $item) {
-                return $this->getItemKey($item);
-            }
-        );
+        $keyedItems = $items->keyBy(fn (ItemInterface $item) => $this->getItemKey($item));
 
         $items->each(
             function (ItemInterface $item) use ($keyedItems) {
@@ -232,9 +228,7 @@ function (ItemInterface $item) use ($keyedItems) {
                         }
 
                         $relation->setIncluded(
-                            $relatedCollection->map(function (ItemInterface $relatedItem) use ($keyedItems) {
-                                return $this->getItem($keyedItems, $relatedItem) ?? $relatedItem;
-                            })
+                            $relatedCollection->map(fn (ItemInterface $relatedItem) => $this->getItem($keyedItems, $relatedItem) ?? $relatedItem)
                         );
                     }
                 }
@@ -270,10 +264,6 @@ private function getItemKey(ItemInterface $item): string
      */
     private function getDuplicateItems(Collection $items): Collection
     {
-        $valueRetriever = function (ItemInterface $item) {
-            return $this->getItemKey($item);
-        };
-
-        return $items->duplicates($valueRetriever);
+        return $items->duplicates(fn (ItemInterface $item) => $this->getItemKey($item));
     }
 }

src/Parsers/ErrorCollectionParser.php

@@ -41,9 +41,7 @@ public function parse($data): ErrorCollection
 
         return new ErrorCollection(
             array_map(
-                function ($error) {
-                    return $this->errorParser->parse($error);
-                },
+                fn ($error) => $this->errorParser->parse($error),
                 $data
             )
         );

src/Parsers/ItemParser.php

@@ -167,11 +167,7 @@ private function parseRelationshipData($data): DataInterface
     {
         if (is_array($data)) {
             return Collection::make($data)
-                ->map(
-                    function ($identifier) {
-                        return $this->parseRelationshipData($identifier);
-                    }
-                );
+                ->map(fn ($identifier) => $this->parseRelationshipData($identifier));
         }
 
         if (!is_object($data)) {

src/Parsers/LinksParser.php

@@ -57,11 +57,7 @@ public function parse($data, string $source): Links
 
         return new Links(
             Collection::wrap((array) $data)
-                ->map(
-                    function ($link, $name) {
-                        return $this->buildLink($link, $name);
-                    }
-                )
+                ->map(fn ($link, $name) => $this->buildLink($link, $name))
                 ->toArray()
         );
     }