Refactoring

phpstan.neon.dist

@@ -1,5 +1,3 @@
-includes:
-    - ./vendor/larastan/larastan/extension.neon
 parameters:
     level: 5
     paths:

src/Eloquent/Relations/Ancestors.php

@@ -9,8 +9,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends HasMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\HasMany<TRelatedModel, TDeclaringModel>
  */
 class Ancestors extends HasMany implements ConcatenableRelation
 {

src/Eloquent/Relations/BelongsToManyOfDescendants.php

@@ -9,8 +9,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends BelongsToMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\BelongsToMany<TRelatedModel, TDeclaringModel>
  */
 class BelongsToManyOfDescendants extends BelongsToMany
 {

src/Eloquent/Relations/Bloodline.php

@@ -7,8 +7,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends Descendants<TRelatedModel>
+ * @extends \Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\Descendants<TRelatedModel, TDeclaringModel>
  */
 class Bloodline extends Descendants
 {

src/Eloquent/Relations/Descendants.php

@@ -13,8 +13,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends HasMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\HasMany<TRelatedModel, TDeclaringModel>
  */
 class Descendants extends HasMany implements ConcatenableRelation
 {
@@ -115,7 +116,9 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns));
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query);
     }
 
     /** @inheritDoc */
@@ -143,10 +146,19 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns), $from);
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query, $from);
     }
 
-    /** @inheritDoc */
+    /**
+     * Add a recursive expression to the query.
+     *
+     * @param callable $constraint
+     * @param \Illuminate\Database\Eloquent\Builder|null $query
+     * @param string|null $from
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
     protected function addExpression(callable $constraint, ?Builder $query = null, $from = null)
     {
         $query = $query ?: $this->query;

src/Eloquent/Relations/Graph/Ancestors.php

@@ -12,8 +12,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends BelongsToMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\BelongsToMany<TRelatedModel, TDeclaringModel>
  */
 class Ancestors extends BelongsToMany implements ConcatenableRelation
 {
@@ -104,7 +105,9 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns));
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query);
     }
 
     /**
@@ -140,7 +143,9 @@ public function getRelationExistenceQueryForSelfRelation(
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns), $from);
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query, $from);
     }
 
     /**

src/Eloquent/Relations/Graph/Descendants.php

@@ -12,8 +12,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends BelongsToMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\BelongsToMany<TRelatedModel, TDeclaringModel>
  */
 class Descendants extends BelongsToMany implements ConcatenableRelation
 {
@@ -104,7 +105,9 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns));
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query);
     }
 
     /**
@@ -140,7 +143,9 @@ public function getRelationExistenceQueryForSelfRelation(
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns), $from);
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query, $from);
     }
 
     /**

src/Eloquent/Relations/Graph/Traits/Concatenation/IsConcatenableRelation.php

@@ -131,10 +131,12 @@ protected function mergeExpressions(Builder $query, Builder $from): Builder
             $fromQuery->expressions
         );
 
-        return $query->addBinding(
+        $query->addBinding(
             $fromQuery->getRawBindings()['expressions'],
             'expressions'
         );
+
+        return $query;
     }
 
     /**

src/Eloquent/Relations/HasManyOfDescendants.php

@@ -9,8 +9,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends HasMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\HasMany<TRelatedModel, TDeclaringModel>
  */
 class HasManyOfDescendants extends HasMany
 {

src/Eloquent/Relations/MorphToManyOfDescendants.php

@@ -7,8 +7,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends BelongsToManyOfDescendants<TRelatedModel>
+ * @extends \Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\BelongsToManyOfDescendants<TRelatedModel, TDeclaringModel>
  */
 class MorphToManyOfDescendants extends BelongsToManyOfDescendants
 {

src/Eloquent/Relations/RootAncestor.php

@@ -9,8 +9,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends HasOne<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\HasOne<TRelatedModel, TDeclaringModel>
  */
 class RootAncestor extends HasOne
 {

src/Eloquent/Relations/RootAncestorOrSelf.php

@@ -7,8 +7,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends RootAncestor<TRelatedModel>
+ * @extends \Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\RootAncestor<TRelatedModel, TDeclaringModel>
  */
 class RootAncestorOrSelf extends RootAncestor
 {

src/Eloquent/Relations/Siblings.php

@@ -9,8 +9,9 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
  *
- * @extends HasMany<TRelatedModel>
+ * @extends \Illuminate\Database\Eloquent\Relations\HasMany<TRelatedModel, TDeclaringModel>
  */
 class Siblings extends HasMany
 {

src/Eloquent/Relations/Traits/Concatenation/IsConcatenableRelation.php

@@ -129,9 +129,11 @@ protected function mergeExpressions(Builder $query, Builder $from): Builder
             $fromQuery->expressions
         );
 
-        return $query->addBinding(
+        $query->addBinding(
             $fromQuery->getRawBindings()['expressions'],
             'expressions'
         );
+
+        return $query;
     }
 }

src/Eloquent/Relations/Traits/IsAncestorRelation.php

@@ -95,7 +95,9 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns));
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query);
     }
 
     /**
@@ -128,7 +130,9 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
             );
         };
 
-        return $this->addExpression($constraint, $query->select($columns), $from);
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query, $from);
     }
 
     /**

src/Eloquent/Relations/Traits/IsOfDescendantsRelation.php

@@ -237,9 +237,9 @@ protected function addExpression(callable $constraint, ?Builder $query = null, $
                 $this->getExpressionForeignKeyName(),
                 (new $this->parent())->setTable($name)
                     ->newQuery()
-                    ->select($this->getExpressionLocalKeyName())
                     ->withGlobalScopes($this->intermediateScopes)
                     ->withoutGlobalScopes($this->removedIntermediateScopes)
+                    ->select($this->getExpressionLocalKeyName())
             );
         });
 
@@ -368,7 +368,9 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
             $this->addExistenceExpressionWhereConstraints($query, $table);
         };
 
-        return $this->addExpression($constraint, $query->select($columns), $alias);
+        $query->select($columns);
+
+        return $this->addExpression($constraint, $query, $alias);
     }
 
     /**