Skip to content

Fix sub relations when resource with modifier is included multiple times #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix sub relations when resource with modifier is included multiple times #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b23eb84
Test that first relation modifier wins
rogatty Oct 5, 2022
93f4baa
Add failing test for foo:modifier.bar,foo:modifier.baz
rogatty Oct 5, 2022
10e09e5
Fix sub relations when resource with modifier is included multiple times
rogatty Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ public function parseIncludes($includes): self
// Trim it down to a cool level of recursion
$includeName = $this->trimToAcceptableRecursionLevel($includeName);

if (in_array($includeName, $this->requestedIncludes)) {
continue;
if (!in_array($includeName, $this->requestedIncludes)) {
$this->requestedIncludes[] = $includeName;
}
$this->requestedIncludes[] = $includeName;

// No Params? Bored
if ($allModifiersStr === null) {
Expand All @@ -164,10 +163,16 @@ public function parseIncludes($includes): self
$modifierArr[$modifierName] = explode($this->paramDelimiter, $modifierParamStr);
}

$this->includeParams[$includeName] = $modifierArr;
if (!isset($this->includeParams[$includeName])) {
$this->includeParams[$includeName] = $modifierArr;
}

if ($subRelations) {
$this->requestedIncludes[] = $this->trimToAcceptableRecursionLevel($includeName . '.' . $subRelations);
$subRelationsIncludeName = $this->trimToAcceptableRecursionLevel($includeName . '.' . $subRelations);

if (!in_array($subRelationsIncludeName, $this->requestedIncludes)) {
$this->requestedIncludes[] = $subRelationsIncludeName;
}
}
}

Expand Down
14 changes: 14 additions & 0 deletions test/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,20 @@ public function testParseIncludes()
$this->assertSame(['5', '1'], $params['limit']);
$this->assertSame(['name'], $params['order']);
$this->assertSame(['foo', 'foo.bar', 'baz'], $manager->getRequestedIncludes());

// The first relation modifier wins
$manager->parseIncludes('foo:modifier(1).bar,foo:modifier(2).baz');

$params = $manager->getIncludeParams('foo');

$this->assertInstanceOf('League\Fractal\ParamBag', $params);

$this->assertSame(['1'], $params['modifier']);

// Two sub relations with parent using modifier
$manager->parseIncludes('foo:modifier.bar,foo:modifier.baz');

$this->assertSame(['foo', 'foo.bar', 'foo.baz'], $manager->getRequestedIncludes());
}

public function testParseExcludeSelfie()
Expand Down