Update the annotations on the eloquent casts

Author: rubenvanassche

src/Support/EloquentCasts/DataCollectionEloquentCast.php

@@ -12,10 +12,21 @@
 use Spatie\LaravelData\Exceptions\CannotCastData;
 use Spatie\LaravelData\Support\DataConfig;
 
+/**
+ * @template TData of (BaseData&TransformableData)
+ * @template TDataCollection of DataCollection
+ *
+ * @implements CastsAttributes<TDataCollection<TData>|null,TDataCollection<TData>|array|null>
+ */
 class DataCollectionEloquentCast implements CastsAttributes
 {
     protected DataConfig $dataConfig;
 
+    /**
+     * @param class-string<TData> $dataClass
+     * @param class-string<TDataCollection> $dataCollectionClass
+     * @param array<string> $arguments
+     */
     public function __construct(
         protected string $dataClass,
         protected string $dataCollectionClass = DataCollection::class,
@@ -105,6 +116,10 @@ public function set($model, string $key, $value, array $attributes): ?string
         return $dataCollection;
     }
 
+    /**
+     * @param TDataCollection<TData>|null $firstValue
+     * @param TDataCollection<TData>|null $secondValue
+     */
     public function compare($model, string $key, $firstValue, $secondValue): bool
     {
         return $this->get($model, $key, $firstValue, [])?->toArray() === $this->get($model, $key, $secondValue, [])?->toArray();

src/Support/EloquentCasts/DataEloquentCast.php

@@ -9,14 +9,21 @@
 use Spatie\LaravelData\Exceptions\CannotCastData;
 use Spatie\LaravelData\Support\DataConfig;
 
+/**
+ * @template TData of (BaseData&TransformableData)
+ *
+ * @implements CastsAttributes<TData|null,TData|array|null>
+ */
 class DataEloquentCast implements CastsAttributes
 {
     protected DataConfig $dataConfig;
 
+    /**
+     * @param class-string<TData> $dataClass $dataClass
+     * @param string[] $arguments
+     */
     public function __construct(
-        /** @var class-string<BaseData&TransformableData> $dataClass */
         protected string $dataClass,
-        /** @var string[] $arguments */
         protected array $arguments = []
     ) {
         $this->dataConfig = app(DataConfig::class);
@@ -39,7 +46,7 @@ public function get($model, string $key, $value, array $attributes): BaseData|Tr
         $payload = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
 
         if ($this->isAbstractClassCast()) {
-            /** @var class-string<BaseData&TransformableData> $dataClass */
+            /** @var class-string<TData> $dataClass */
             $dataClass = $this->dataConfig->morphMap->getMorphedDataClass($payload['type']) ?? $payload['type'];
 
             return $dataClass::from($payload['data']);
@@ -82,6 +89,10 @@ public function set($model, string $key, $value, array $attributes): ?string
         return $value;
     }
 
+    /**
+     * @param TData|null $firstValue
+     * @param TData|null $secondValue
+     */
     public function compare($model, string $key, $firstValue, $secondValue): bool
     {
         return $this->get($model, $key, $firstValue, [])?->toArray() === $this->get($model, $key, $secondValue, [])?->toArray();