Making joinRelationshipCache a private non-static property

Author: luisdalmolin

src/PowerJoins.php

@@ -15,7 +15,7 @@ trait PowerJoins
      *
      * @var array
      */
-    public static $joinRelationshipCache = [];
+    private $joinRelationshipCache = [];
 
     /**
      * Cache to not join the same relationship twice.
@@ -328,15 +328,15 @@ public function scopePowerJoinWhereHas(Builder $query, $relation, Closure $callb
      */
     public function relationshipAlreadyJoined($relation)
     {
-        return isset(PowerJoins::$joinRelationshipCache[spl_object_id($this)][$relation]);
+        return isset($this->joinRelationshipCache[spl_object_id($this)][$relation]);
     }
 
     /**
      * Marks the relationship as already joined.
      */
     public function markRelationshipAsAlreadyJoined($relation)
     {
-        PowerJoins::$joinRelationshipCache[spl_object_id($this)][$relation] = true;
+        $this->joinRelationshipCache[spl_object_id($this)][$relation] = true;
     }
 
     public function generateAliasForRelationship($relation, $relationName)
@@ -368,9 +368,4 @@ public function clearPowerJoinCaches()
 
         return $this;
     }
-
-    public function __destruct()
-    {
-        PowerJoins::$joinRelationshipCache = [];
-    }
 }

tests/JoinRelationshipTest.php

@@ -247,6 +247,30 @@ public function test_join_belongs_to_many_with_callback()
 
     /** @test */
     public function test_it_doesnt_join_the_same_relationship_twice()
+    {
+        $query = User::query()
+            ->select('users.*')
+            ->joinRelationship('posts')
+            ->joinRelationship('posts')
+            ->toSql();
+
+        // making sure it doesn't throw any errors
+        User::query()->select('users.*')->joinRelationship('posts')->joinRelationship('posts')->get();
+
+        $this->assertStringContainsString(
+            'inner join "posts" on "posts"."user_id" = "users"."id"',
+            $query
+        );
+
+        $this->assertEquals(
+            1,
+            substr_count($query, 'inner join "posts" on "posts"."user_id" = "users"."id"'),
+            'It should only make 1 join with the posts table'
+        );
+    }
+
+    /** @test */
+    public function test_it_doesnt_join_the_same_relationship_twice_with_nested()
     {
         $query = User::query()
             ->select('users.*')
@@ -421,14 +445,4 @@ public function test_passing_where_closure_inside_join_callback()
             $sql
         );
     }
-
-    /** @test */
-    public function test_join_cache_is_cleared_between_queries()
-    {
-        $query = User::query()->joinRelationship('posts')->toSql();
-        $this->assertEmpty(PowerJoins::$joinRelationshipCache, 'Join Relationship Cache not cleared after query');
-
-        $query = User::query()->joinRelationship('posts')->toSql();
-        $this->assertEmpty(PowerJoins::$joinRelationshipCache, 'Join Relationship Cache not cleared after query');
-    }
 }