Updated to use more types where possible.

Author: Jakub Gawron

src/ChildResourceHandler.php

@@ -7,18 +7,12 @@
 
 class ChildResourceHandler
 {
-    /** @var JsonResource|ResourceCollection */
-    public $childResource;
+    public JsonResource|ResourceCollection $childResource;
 
     /** @var callable */
     public $resolver;
 
-    /**
-     * ChildResourceHandler constructor.
-     * @param JsonResource|ResourceCollection $childResource
-     * @param callable $resolver
-     */
-    public function __construct($childResource, callable $resolver)
+    public function __construct(JsonResource|ResourceCollection $childResource, callable $resolver)
     {
         $this->childResource = $childResource;
         $this->resolver = $resolver;

src/DeferredValue.php

@@ -7,33 +7,21 @@
 
 abstract class DeferredValue
 {
-    /**
-     * @var JsonResource|ResourceCollection
-     */
-    public $resource;
+    public JsonResource|ResourceCollection $resource;
 
     /** @var callable|null */
     public $callback;
 
     /** @var callable|null */
     public $resolver;
 
-    /**
-     * DeferredValue constructor.
-     * @param JsonResource $resource
-     * @param callable|null $callback
-     */
-    public function __construct($resource, ?callable $callback = null)
+    public function __construct(JsonResource $resource, ?callable $callback = null)
     {
         $this->resource = $resource;
         $this->callback = $callback;
     }
 
-    /**
-     * @param callable $resolver
-     * @return $this
-     */
-    public function useResolver(callable $resolver): self
+    public function useResolver(callable $resolver): static
     {
         $this->resolver = $resolver;
 
@@ -43,5 +31,5 @@ public function useResolver(callable $resolver): self
     /**
      * @param static[] $deferredValues
      */
-    abstract public static function resolve(array $deferredValues);
+    abstract public static function resolve(array $deferredValues): void;
 }

src/Eloquent/EloquentDeferredValue.php

@@ -11,15 +11,9 @@ abstract class EloquentDeferredValue extends DeferredValue
     /**
      * @var string[]
      */
-    public $relations;
+    public array $relations;
 
-    /**
-     * EloquentDeferredValue constructor.
-     * @param JsonResource|ResourceCollection $resource
-     * @param array $relations
-     * @param callable|null $callback
-     */
-    public function __construct($resource, array $relations, ?callable $callback = null)
+    public function __construct(JsonResource|ResourceCollection $resource, array $relations, ?callable $callback = null)
     {
         parent::__construct($resource, $callback);
         $this->relations = $relations;
@@ -28,7 +22,7 @@ public function __construct($resource, array $relations, ?callable $callback = n
     /**
      * @param static[] $deferredValues
      */
-    public static function resolve(array $deferredValues)
+    public static function resolve(array $deferredValues): void
     {
         static::loadEloquentRelations($deferredValues);
 
@@ -48,7 +42,6 @@ public static function resolve(array $deferredValues)
     /**
      * Begins eager loading eloquent model relations.
      * @param static[] $deferredValues
-     * @return string
      */
-    abstract protected static function loadEloquentRelations(array $deferredValues);
+    abstract protected static function loadEloquentRelations(array $deferredValues): void;
 }

src/Eloquent/Load.php

@@ -10,7 +10,7 @@ class Load extends EloquentDeferredValue
     /**
      * @inheritDoc
      */
-    protected static function loadEloquentRelations(array $deferredValues)
+    protected static function loadEloquentRelations(array $deferredValues): void
     {
         collect($deferredValues)->groupBy('relations')
             ->each(function (Collection $collection, $relation) {

src/Eloquent/LoadCount.php

@@ -10,7 +10,7 @@ class LoadCount extends EloquentDeferredValue
     /**
      * @inheritDoc
      */
-    protected static function loadEloquentRelations(array $deferredValues)
+    protected static function loadEloquentRelations(array $deferredValues): void
     {
         collect($deferredValues)->groupBy('relations')
             ->each(function (Collection $collection, $relation) {

src/Eloquent/LoadMissing.php

@@ -10,7 +10,7 @@ class LoadMissing extends EloquentDeferredValue
     /**
      * @inheritDoc
      */
-    protected static function loadEloquentRelations(array $deferredValues)
+    protected static function loadEloquentRelations(array $deferredValues): void
     {
         collect($deferredValues)->groupBy('relations')
             ->each(function (Collection $collection, $relation) {

src/Eloquent/ResolvesEloquentResources.php

@@ -2,19 +2,22 @@
 
 namespace Netsells\Http\Resources\Eloquent;
 
+use Netsells\Http\Resources\DeferredValue;
+use Netsells\Http\Resources\Json\JsonResource;
+
 trait ResolvesEloquentResources
 {
     /**
-     * @var string
+     * @var class-string<DeferredValue>
      */
-    protected $defaultDeferredValueClass = LoadMissing::class;
+    protected string $defaultDeferredValueClass = LoadMissing::class;
 
     /**
      * @param string|string[] $relations
      * @param callable|null $fn
      * @return EloquentDeferredValue
      */
-    protected function load($relations, ?callable $fn = null): EloquentDeferredValue
+    protected function load(string|array $relations, ?callable $fn = null): EloquentDeferredValue
     {
         return new Load($this, (array) $relations, $fn);
     }
@@ -24,7 +27,7 @@ protected function load($relations, ?callable $fn = null): EloquentDeferredValue
      * @param callable|null $fn
      * @return EloquentDeferredValue
      */
-    protected function loadMissing($relations, ?callable $fn = null): EloquentDeferredValue
+    protected function loadMissing(string|array $relations, ?callable $fn = null): EloquentDeferredValue
     {
         return new LoadMissing($this, (array) $relations, $fn);
     }
@@ -34,7 +37,7 @@ protected function loadMissing($relations, ?callable $fn = null): EloquentDeferr
      * @param callable|null $fn
      * @return EloquentDeferredValue
      */
-    protected function loadCount($relations, ?callable $fn = null): EloquentDeferredValue
+    protected function loadCount(string|array $relations, ?callable $fn = null): EloquentDeferredValue
     {
         return new LoadCount($this, (array) $relations, $fn);
     }
@@ -44,7 +47,7 @@ protected function loadCount($relations, ?callable $fn = null): EloquentDeferred
      * @param callable|null $fn
      * @return EloquentDeferredValue
      */
-    protected function use($relations, ?callable $fn = null): EloquentDeferredValue
+    protected function use(string|array $relations, ?callable $fn = null): EloquentDeferredValue
     {
         return new $this->defaultDeferredValueClass($this, (array) $relations, $fn);
     }
@@ -53,31 +56,31 @@ protected function use($relations, ?callable $fn = null): EloquentDeferredValue
      * @param string ...$relations
      * @return EloquentDeferredValue
      */
-    protected function preload(...$relations): EloquentDeferredValue
+    protected function preload(string ...$relations): EloquentDeferredValue
     {
         return new $this->defaultDeferredValueClass($this, $relations);
     }
 
     /**
-     * @param string $relationship
-     * @param string $resourceClass
+     * @param string $relation
+     * @param class-string<JsonResource> $resourceClass
      * @return EloquentDeferredValue
      */
-    protected function many(string $relationship, string $resourceClass): EloquentDeferredValue
+    protected function many(string $relation, string $resourceClass): EloquentDeferredValue
     {
-        return $this->use($relationship, function ($model) use ($resourceClass) {
+        return $this->use($relation, function ($model) use ($resourceClass) {
             return $resourceClass::collection($model);
         });
     }
 
     /**
-     * @param string $relationship
-     * @param string $resourceClass
+     * @param string $relation
+     * @param class-string<JsonResource> $resourceClass
      * @return EloquentDeferredValue
      */
-    protected function one(string $relationship, string $resourceClass): EloquentDeferredValue
+    protected function one(string $relation, string $resourceClass): EloquentDeferredValue
     {
-        return $this->use($relationship, function ($model) use ($resourceClass) {
+        return $this->use($relation, function ($model) use ($resourceClass) {
             return $resourceClass::make($model);
         });
     }

src/Json/AnonymousResourceCollection.php

@@ -4,21 +4,7 @@
 
 class AnonymousResourceCollection extends ResourceCollection
 {
-    /**
-     * The name of the resource being collected.
-     *
-     * @var string
-     */
-    public $collects;
-
-    /**
-     * Create a new anonymous resource collection.
-     *
-     * @param  mixed  $resource
-     * @param  string  $collects
-     * @return void
-     */
-    public function __construct($resource, $collects)
+    public function __construct(mixed $resource, string $collects)
     {
         $this->collects = $collects;
 

src/Json/JsonResource.php

@@ -2,21 +2,26 @@
 
 namespace Netsells\Http\Resources\Json;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Netsells\Http\Resources\DeferredValue;
 use Netsells\Http\Resources\Eloquent\ResolvesEloquentResources;
 use Netsells\Http\Resources\ResolvesResources;
 
 class JsonResource extends \Illuminate\Http\Resources\Json\JsonResource
 {
-    use ResolvesResources, ResolvesEloquentResources;
+    use ResolvesResources;
+    use ResolvesEloquentResources;
 
     /**
-     * Create new anonymous resource collection.
-     *
-     * @param  mixed  $resource
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     * @return DeferredValue|DeferredValue[]
      */
-    public static function collection($resource)
+    public function preloads(/** @param Request $request */)
+    {
+        return [];
+    }
+
+    public static function collection(mixed $resource): AnonymousResourceCollection
     {
         return tap(new AnonymousResourceCollection($resource, static::class), function ($collection) {
             if (property_exists(static::class, 'preserveKeys')) {
@@ -25,7 +30,7 @@ public static function collection($resource)
         });
     }
 
-    protected function beforeResolveRoot($request)
+    protected function beforeResolveRoot(Request $request): void
     {
         $this->collectAndResolvePreloads($request, Collection::make([$this]));
     }

src/Json/ResourceCollection.php

@@ -2,13 +2,14 @@
 
 namespace Netsells\Http\Resources\Json;
 
+use Illuminate\Http\Request;
 use Netsells\Http\Resources\ResolvesResources;
 
 class ResourceCollection extends \Illuminate\Http\Resources\Json\ResourceCollection
 {
     use ResolvesResources;
 
-    protected function beforeResolveRoot($request)
+    protected function beforeResolveRoot(Request $request): void
     {
         $this->collectAndResolvePreloads($request, $this->collection);
     }