Skip to content

Commit

Permalink
bug #36283 [Security] forward multiple attributes voting flag (xabbuh)
Browse files Browse the repository at this point in the history
This PR was merged into the 4.4 branch.

Discussion
----------

[Security] forward multiple attributes voting flag

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #36280
| License       | MIT
| Doc PR        |

Commits
-------

1b7ec67 forward multiple attributes voting flag
  • Loading branch information
nicolas-grekas committed Mar 31, 2020
2 parents a164e22 + 1b7ec67 commit 6f25ce5
Showing 1 changed file with 4 additions and 2 deletions.
Expand Up @@ -47,8 +47,10 @@ public function __construct(AccessDecisionManagerInterface $manager)

/**
* {@inheritdoc}
*
* @param bool $allowMultipleAttributes Whether to allow passing multiple values to the $attributes array
*/
public function decide(TokenInterface $token, array $attributes, $object = null): bool
public function decide(TokenInterface $token, array $attributes, $object = null/*, bool $allowMultipleAttributes = false*/): bool
{
$currentDecisionLog = [
'attributes' => $attributes,
Expand All @@ -58,7 +60,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)

$this->currentLog[] = &$currentDecisionLog;

$result = $this->manager->decide($token, $attributes, $object);
$result = $this->manager->decide($token, $attributes, $object, 3 < \func_num_args() && func_get_arg(3));

$currentDecisionLog['result'] = $result;

Expand Down

0 comments on commit 6f25ce5

Please sign in to comment.