bug #36283 [Security] forward multiple attributes voting flag (xabbuh)

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
-------

1b7ec67b73 forward multiple attributes voting flag
This commit is contained in:
Nicolas Grekas 2020-03-31 19:42:22 +02:00
commit 6f25ce57c3

View File

@ -47,8 +47,10 @@ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
/** /**
* {@inheritdoc} * {@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 = [ $currentDecisionLog = [
'attributes' => $attributes, 'attributes' => $attributes,
@ -58,7 +60,7 @@ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
$this->currentLog[] = &$currentDecisionLog; $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; $currentDecisionLog['result'] = $result;