add compatibility with larastan

laravel · Jun 3, 2024 · d29f0f9 · d29f0f9
1 parent 98f3503
commit d29f0f9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -11,9 +11,10 @@
 use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
 
 /**
- * @template T of \Illuminate\Database\Eloquent\Model
+ * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TChildModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends Relation<T>
+ * @extends Relation<TRelatedModel>
  */
 class BelongsTo extends Relation
 {
@@ -24,7 +25,7 @@ class BelongsTo extends Relation
     /**
      * The child model instance of the relation.
      *
-     * @var T
+     * @var TChildModel
      */
     protected $child;
 
@@ -200,8 +201,8 @@ public function match(array $models, Collection $results, $relation)
     /**
      * Associate the model instance to the given parent.
      *
-     * @param  T|int|string|null  $model
-     * @return T
+     * @param  TRelatedModel|int|string|null  $model
+     * @return TChildModel
      */
     public function associate($model)
     {
@@ -221,7 +222,7 @@ public function associate($model)
     /**
      * Dissociate previously associated model from the given parent.
      *
-     * @return T
+     * @return TChildModel
      */
     public function dissociate()
     {
@@ -233,7 +234,7 @@ public function dissociate()
     /**
      * Alias of "dissociate" method.
      *
-     * @return T
+     * @return TChildModel
      */
     public function disassociate()
     {
@@ -295,7 +296,7 @@ protected function relationHasIncrementingId()
      * Make a new related instance for the given model.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $parent
-     * @return T
+     * @return TRelatedModel
      */
     protected function newRelatedInstanceFor(Model $parent)
     {
@@ -305,7 +306,7 @@ protected function newRelatedInstanceFor(Model $parent)
     /**
      * Get the child of the relationship.
      *
-     * @return T
+     * @return TChildModel
      */
     public function getChild()
     {

diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -9,9 +9,10 @@
 use Illuminate\Database\Eloquent\Relations\Concerns\InteractsWithDictionary;
 
 /**
- * @template T of \Illuminate\Database\Eloquent\Model
+ * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TChildModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends BelongsTo<T>
+ * @extends BelongsTo<TRelatedModel, TChildModel>
  */
 class MorphTo extends BelongsTo
 {
@@ -133,7 +134,7 @@ public function getEager()
      * Get all of the relation results for a type.
      *
      * @param  string  $type
-     * @return \Illuminate\Database\Eloquent\Collection<mixed, T>
+     * @return \Illuminate\Database\Eloquent\Collection<mixed, TRelatedModel>
      */
     protected function getResultsByType($type)
     {
@@ -182,7 +183,7 @@ protected function gatherKeysByType($type, $keyType)
      * Create a new model instance by type.
      *
      * @param  string  $type
-     * @return T
+     * @return TRelatedModel
      */
     public function createModelByType($type)
     {
@@ -232,7 +233,7 @@ protected function matchToMorphParents($type, Collection $results)
      * Associate the model instance to the given parent.
      *
      * @param  \Illuminate\Database\Eloquent\Model|null  $model
-     * @return T
+     * @return TRelatedModel
      */
     public function associate($model)
     {
@@ -256,7 +257,7 @@ public function associate($model)
     /**
      * Dissociate previously associated model from the given parent.
      *
-     * @return T
+     * @return TRelatedModel
      */
     public function dissociate()
     {
@@ -283,7 +284,7 @@ public function touch()
      * Make a new related instance for the given model.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $parent
-     * @return T
+     * @return TRelatedModel
      */
     protected function newRelatedInstanceFor(Model $parent)
     {
@@ -314,7 +315,7 @@ public function getDictionary()
      * Specify which relations to load for a given morph type.
      *
      * @param  array  $with
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<T>
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<TRelatedModel>
      */
     public function morphWith(array $with)
     {
@@ -329,7 +330,7 @@ public function morphWith(array $with)
      * Specify which relationship counts to load for a given morph type.
      *
      * @param  array  $withCount
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<T>
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<TRelatedModel>
      */
     public function morphWithCount(array $withCount)
     {
@@ -344,7 +345,7 @@ public function morphWithCount(array $withCount)
      * Specify constraints on the query for a given morph type.
      *
      * @param  array  $callbacks
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<T>
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<TRelatedModel>
      */
     public function constrain(array $callbacks)
     {