Merge branch '4.4' into 5.4

fabpot · fabpot · commit ed2fc179c854 · 2022-07-20T13:34:24.000+02:00
* 4.4:
  Fix CS
diff --git a/Authorization/AccessDecisionManager.php b/Authorization/AccessDecisionManager.php
@@ -89,7 +89,7 @@ public function __construct(iterable $voters = [], /* AccessDecisionStrategyInte
      *
      * {@inheritdoc}
      */
-    public function decide(TokenInterface $token, array $attributes, $object = null/*, bool $allowMultipleAttributes = false*/)
+    public function decide(TokenInterface $token, array $attributes, $object = null/* , bool $allowMultipleAttributes = false */)
     {
         $allowMultipleAttributes = 3 < \func_num_args() && func_get_arg(3);
 
diff --git a/Authorization/TraceableAccessDecisionManager.php b/Authorization/TraceableAccessDecisionManager.php
@@ -51,7 +51,7 @@ public function __construct(AccessDecisionManagerInterface $manager)
      *
      * @param bool $allowMultipleAttributes Whether to allow passing multiple values to the $attributes array
      */
-    public function decide(TokenInterface $token, array $attributes, $object = null/*, bool $allowMultipleAttributes = false*/): bool
+    public function decide(TokenInterface $token, array $attributes, $object = null/* , bool $allowMultipleAttributes = false */): bool
     {
         $currentDecisionLog = [
             'attributes' => $attributes,

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function __construct(iterable $voters = [], /* AccessDecisionStrategyInte`
`89`	`89`	`*`
`90`	`90`	`* {@inheritdoc}`
`91`	`91`	`*/`
`92`		`- public function decide(TokenInterface $token, array $attributes, $object = null/, bool $allowMultipleAttributes = false/)`
	`92`	`+ public function decide(TokenInterface $token, array $attributes, $object = null/* , bool $allowMultipleAttributes = false */)`
`93`	`93`	`{`
`94`	`94`	`$allowMultipleAttributes = 3 < \func_num_args() && func_get_arg(3);`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(AccessDecisionManagerInterface $manager)`
`51`	`51`	`*`
`52`	`52`	`* @param bool $allowMultipleAttributes Whether to allow passing multiple values to the $attributes array`
`53`	`53`	`*/`
`54`		`- public function decide(TokenInterface $token, array $attributes, $object = null/, bool $allowMultipleAttributes = false/): bool`
	`54`	`+ public function decide(TokenInterface $token, array $attributes, $object = null/* , bool $allowMultipleAttributes = false */): bool`
`55`	`55`	`{`
`56`	`56`	`$currentDecisionLog = [`
`57`	`57`	`'attributes' => $attributes,`