Fixed clone of queries that were duplicating joins

Author: luisdalmolin

src/JoinsHelper.php

@@ -15,9 +15,11 @@ protected function __construct()
 
     }
 
-    public static function make($builder): static
+    public static function make(): static
     {
-        return static::$instances[spl_object_id($builder)] ??= new self();
+        $objects = array_map(fn ($object) => spl_object_id($object), func_get_args());
+
+        return static::$instances[implode('-', $objects)] ??= new self();
     }
 
     /**

src/Mixins/JoinRelationship.php

@@ -16,11 +16,11 @@
 
 /**
  * @mixin Builder
+ * @method \Illuminate\Database\Eloquent\Model getModel()
+ * @property \Illuminate\Database\Eloquent\Builder $query
  */
 class JoinRelationship
 {
-
-
     /**
      * New clause for making joins, where we pass the model to the joiner class.
      */
@@ -97,7 +97,7 @@ public function joinRelationship(): Closure
         ) {
             $joinType = JoinsHelper::$joinMethodsMap[$joinType] ?? $joinType;
             $useAlias = is_string($callback) ? false : $useAlias;
-            $joinHelper = JoinsHelper::make($this);
+            $joinHelper = JoinsHelper::make($this->getModel());
             $callback = $joinHelper->formatJoinCallback($callback);
 
             if (is_null($this->getSelect())) {
@@ -233,7 +233,7 @@ public function joinNestedRelationship(): Closure
             bool $disableExtraConditions = false
         ) {
             $relations = explode('.', $relationships);
-            $joinHelper = JoinsHelper::make($this);
+            $joinHelper = JoinsHelper::make($this->getModel());
             /** @var Relation */
             $latestRelation = null;
 
@@ -515,5 +515,4 @@ public function powerJoinWhereHas(): Closure
             return $this->powerJoinHas($relation, $operator, $count, 'and', $callback);
         };
     }
-
 }

tests/JoinRelationshipTest.php

@@ -691,11 +691,11 @@ public function test_union_query()
 
     public function test_scope_inside_nested_where()
     {
-        Comment::joinRelationship('post', function ($join) {
+        Comment::query()->joinRelationship('post', function ($join) {
             $join->where(fn ($query) => $query->published());
         })->get();
 
-        $sql = Comment::joinRelationship('post', function ($join) {
+        $sql = Comment::query()->joinRelationship('post', function ($join) {
             $join->where(fn ($query) => $query->published());
         })->toSql();
 
@@ -768,4 +768,15 @@ public function test_has_one_of_many()
 
         $this->assertEquals($lastComment->body, $lastCommentPost->body);
     }
+
+    public function test_join_with_clone_does_not_duplicate()
+    {
+        $query = Post::query();
+
+        $query->leftJoinRelationship('user');
+        $clonedSql = $query->clone()->leftJoinRelationship('user')->toSql();
+        $sql = $query->toSql();
+
+        $this->assertEquals($clonedSql, $sql);
+    }
 }