fix: normalizing of deeply nested relations of the same parent

Author: alexzarbn

src/Drivers/Standard/RelationsResolver.php

@@ -208,11 +208,10 @@ protected function normalizeRequestedRelations(array $requestedRelations): array
 
                 $normalizedNestedRelations = $this->normalizeRequestedRelations([$nestedRelation]);
 
-                if (!array_key_exists($parentOfNestedRelation, $normalizedRelations)) {
-                    $normalizedRelations[$parentOfNestedRelation] = $normalizedNestedRelations;
-                } else {
-                    $normalizedRelations[$parentOfNestedRelation] = array_merge($normalizedRelations[$parentOfNestedRelation], $normalizedNestedRelations);
-                }
+                $normalizedRelations[$parentOfNestedRelation] = array_merge_recursive(
+                    Arr::get($normalizedRelations, $parentOfNestedRelation, []),
+                    $normalizedNestedRelations
+                );
             } elseif (!array_key_exists($requestedRelation, $normalizedRelations)) {
                 $normalizedRelations[$requestedRelation] = [];
             }

tests/Unit/Drivers/Standard/RelationsResolverTest.php

@@ -83,6 +83,7 @@ public function guarding_entity_nested_relations()
 
         $team = new Team(['name' => 'test team']);
         $team->setRelation('users', collect([new User(['name' => 'team user'])]));
+        $team->setRelation('company', new Company(['name' => 'test company']));
 
         $editor = new User(['name' => 'editor user']);
         $editor->setRelation('team', $team);
@@ -92,13 +93,14 @@ public function guarding_entity_nested_relations()
             'editors' => collect([$editor])
         ]);
 
-        $relationsResolver = new RelationsResolver(['user', 'editors.team'], []);
-        $guardedPost = $relationsResolver->guardRelations($post, ['user', 'editors.team']);
+        $relationsResolver = new RelationsResolver(['user', 'editors.team.users', 'editors.team.company'], []);
+        $guardedPost = $relationsResolver->guardRelations($post, ['user',  'editors.team.users', 'editors.team.company']);
 
         self::assertArrayHasKey('user', $guardedPost->getRelations());
         self::assertArrayHasKey('editors', $guardedPost->getRelations());
         self::assertArrayHasKey('team', $guardedPost->getRelation('editors')->first()->getRelations());
-        self::assertArrayNotHasKey('users', $guardedPost->getRelation('editors')->first()->team->getRelations());
+        self::assertArrayHasKey('users', $guardedPost->getRelation('editors')->first()->team->getRelations());
+        self::assertArrayHasKey('company', $guardedPost->getRelation('editors')->first()->team->getRelations());
     }
 
     /** @test */