Skip to content

Commit 2047b7e

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix wrong namespaces Fix wrong namespaces Fix the reporting of deprecations in twig:lint forward multiple attributes voting flag bumped Symfony version to 4.4.8 updated VERSION for 4.4.7 updated CHANGELOG for 4.4.7 [Validator] Fixed calling getters before resolving groups [HttpKernel][LoggerDataCollector] Prevent keys collisions in the sanitized logs processing
2 parents 90a6f89 + 79f27fb commit 2047b7e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Authorization/TraceableAccessDecisionManager.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ public function __construct(AccessDecisionManagerInterface $manager)
4747

4848
/**
4949
* {@inheritdoc}
50+
*
51+
* @param bool $allowMultipleAttributes Whether to allow passing multiple values to the $attributes array
5052
*/
51-
public function decide(TokenInterface $token, array $attributes, $object = null): bool
53+
public function decide(TokenInterface $token, array $attributes, $object = null/*, bool $allowMultipleAttributes = false*/): bool
5254
{
5355
$currentDecisionLog = [
5456
'attributes' => $attributes,
@@ -58,7 +60,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
5860

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

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

6365
$currentDecisionLog['result'] = $result;
6466

0 commit comments

Comments
 (0)