Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions Resolver/Config/FieldsConfigSolution.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,12 @@ private function filterResultUsingAccess($result, $expression, $values)
$checkAccess = $this->checkAccessCallback($expression, $values);

switch (true) {
case is_array($result) || $result instanceof \ArrayAccess:
$result = array_filter(
array_map(
function ($object) use ($checkAccess) {
return $checkAccess($object) ? $object : null;
},
$result
)
case is_array($result):
$result = array_map(
function ($object) use ($checkAccess) {
return $checkAccess($object) ? $object : null;
},
$result
);
break;

Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Security/AccessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private function expectedFailedUserRoles()
return [
'data' => [
'user' => [
'roles' => [],
'roles' => [0 => null],
],
],
];
Expand Down
2 changes: 2 additions & 0 deletions Tests/Resolver/Config/FieldsConfigSolutionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public function testResolveAccessAndWrapResolveCallbackWithArrayAndAccessDeniedT
'tata',
'titi',
'tata',
null,
null,
],
$callback(
[
Expand Down