Refactoring

src/HasJsonRelationships.php

@@ -33,7 +33,7 @@ trait HasJsonRelationships
      */
     public function getAttribute($key)
     {
-        $attribute = preg_split('/(->|\[\])/', $key)[0];
+        $attribute = preg_split('/(->|\[])/', $key)[0];
 
         if (array_key_exists($attribute, $this->attributes)) {
             return $this->getAttributeValue($key);

src/Relations/BelongsToJson.php

@@ -18,6 +18,26 @@ class BelongsToJson extends BelongsTo implements ConcatenableRelation
     use IsConcatenableBelongsToJsonRelation;
     use IsJsonRelation;
 
+    /**
+     * Create a new belongs to JSON relationship instance.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Model $child
+     * @param string $foreignKey
+     * @param string $ownerKey
+     * @param string $relationName
+     * @return void
+     */
+    public function __construct(Builder $query, Model $child, $foreignKey, $ownerKey, $relationName)
+    {
+        $segments = explode('[]->', $foreignKey);
+
+        $this->path = $segments[0];
+        $this->key = $segments[1] ?? null;
+
+        parent::__construct($query, $child, $foreignKey, $ownerKey, $relationName);
+    }
+
     /**
      * Get the results of the relationship.
      *

src/Relations/HasManyJson.php

@@ -17,6 +17,25 @@ class HasManyJson extends HasMany implements ConcatenableRelation
     use IsConcatenableHasManyJsonRelation;
     use IsJsonRelation;
 
+    /**
+     * Create a new has many JSON relationship instance.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Model $parent
+     * @param string $foreignKey
+     * @param string $localKey
+     * @return void
+     */
+    public function __construct(Builder $query, Model $parent, $foreignKey, $localKey)
+    {
+        $segments = explode('[]->', $foreignKey);
+
+        $this->path = $segments[0];
+        $this->key = $segments[1] ?? null;
+
+        parent::__construct($query, $parent, $foreignKey, $localKey);
+    }
+
     /**
      * Get the results of the relationship.
      *

src/Relations/Traits/IsJsonRelation.php

@@ -30,23 +30,6 @@ trait IsJsonRelation
      */
     protected $key;
 
-    /**
-     * Create a new JSON relationship instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $args = func_get_args();
-
-        $foreignKey = explode('[]->', $args[2]);
-
-        $this->path = $foreignKey[0];
-        $this->key = $foreignKey[1] ?? null;
-
-        parent::__construct(...$args);
-    }
-
     /**
      * Hydrate the pivot relationship on the models.
      *

tests/Concatenation/HasManyThroughJsonTest.php

@@ -15,7 +15,7 @@ public function testLazyLoading()
     {
         $projects = Role::find(2)->projects;
 
-        $this->assertEquals([71, 73], $projects->pluck('id')->all());
+        $this->assertEquals([91, 93], $projects->pluck('id')->all());
     }
 
     public function testLazyLoadingWithObjects()
@@ -26,7 +26,7 @@ public function testLazyLoadingWithObjects()
 
         $projects = Role::find(2)->projects2;
 
-        $this->assertEquals([71, 73], $projects->pluck('id')->all());
+        $this->assertEquals([91, 93], $projects->pluck('id')->all());
         $pivot = $projects[0]->pivot;
         $this->assertInstanceOf(Pivot::class, $pivot);
         $this->assertTrue($pivot->exists);
@@ -35,7 +35,7 @@ public function testLazyLoadingWithObjects()
 
     public function testLazyLoadingWithReverseRelationship()
     {
-        $roles = Project::find(71)->roles;
+        $roles = Project::find(91)->roles;
 
         $this->assertEquals([1, 2], $roles->pluck('id')->all());
     }
@@ -46,7 +46,7 @@ public function testLazyLoadingWithReverseRelationshipAndObjects()
             $this->markTestSkipped();
         }
 
-        $roles = Project::find(71)->roles2;
+        $roles = Project::find(91)->roles2;
 
         $this->assertEquals([1, 2], $roles->pluck('id')->all());
         $pivot = $roles[0]->pivot;
@@ -76,9 +76,9 @@ public function testEagerLoading()
     {
         $roles = Role::with('projects')->get();
 
-        $this->assertEquals([71], $roles[0]->projects->pluck('id')->all());
-        $this->assertEquals([71, 73], $roles[1]->projects->pluck('id')->all());
-        $this->assertEquals([73], $roles[2]->projects->pluck('id')->all());
+        $this->assertEquals([91], $roles[0]->projects->pluck('id')->all());
+        $this->assertEquals([91, 93], $roles[1]->projects->pluck('id')->all());
+        $this->assertEquals([93], $roles[2]->projects->pluck('id')->all());
         $this->assertEquals([], $roles[3]->projects->pluck('id')->all());
     }
 
@@ -90,9 +90,9 @@ public function testEagerLoadingWithObjects()
 
         $roles = Role::with('projects2')->get();
 
-        $this->assertEquals([71], $roles[0]->projects2->pluck('id')->all());
-        $this->assertEquals([71, 73], $roles[1]->projects2->pluck('id')->all());
-        $this->assertEquals([73], $roles[2]->projects2->pluck('id')->all());
+        $this->assertEquals([91], $roles[0]->projects2->pluck('id')->all());
+        $this->assertEquals([91, 93], $roles[1]->projects2->pluck('id')->all());
+        $this->assertEquals([93], $roles[2]->projects2->pluck('id')->all());
         $this->assertEquals([], $roles[3]->projects2->pluck('id')->all());
         $pivot = $roles[1]->projects2[0]->pivot;
         $this->assertInstanceOf(Pivot::class, $pivot);
@@ -148,7 +148,7 @@ public function testExistenceQueryWithReverseRelationship()
     {
         $projects = Project::has('roles')->get();
 
-        $this->assertEquals([71, 73], $projects->pluck('id')->all());
+        $this->assertEquals([91, 93], $projects->pluck('id')->all());
     }
 
     public function testExistenceQueryWithReverseRelationshipAndObjects()
@@ -159,6 +159,6 @@ public function testExistenceQueryWithReverseRelationshipAndObjects()
 
         $projects = Project::has('roles2')->get();
 
-        $this->assertEquals([71, 73], $projects->pluck('id')->all());
+        $this->assertEquals([91, 93], $projects->pluck('id')->all());
     }
 }

tests/Models/Permission.php

@@ -6,11 +6,9 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
-use Staudenmeir\EloquentJsonRelations\HasJsonRelationships;
 
 class Permission extends Model
 {
-    use HasJsonRelationships;
     use HasRelationships;
 
     public $timestamps = false;

tests/TestCase.php

@@ -213,15 +213,15 @@ protected function seed(): void
         Permission::create(['id' => 85, 'role_id' => 4]);
 
         Project::create([
-             'id' => 71,
+             'id' => 91,
              'user_id' => 21,
          ]);
         Project::create([
-             'id' => 72,
+             'id' => 92,
              'user_id' => 22,
          ]);
         Project::create([
-             'id' => 73,
+             'id' => 93,
              'user_id' => 23,
          ]);