minor #35447 [Security] suggest a non-deprecated function replacement (xabbuh)

nicolas-grekas · nicolas-grekas · commit c08fabebe7b4 · 2020-01-23T11:58:55.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Security] suggest a non-deprecated function replacement | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35437 | License | MIT | Doc PR | Commits ------- 731730f suggest a non-deprecated function replacement
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -58,7 +58,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA
     public function decide(TokenInterface $token, array $attributes, $object = null)
     {
         if (\count($attributes) > 1) {
-            @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED);
         }
 
         return $this->{$this->strategy}($token, $attributes, $object);
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -56,7 +56,7 @@ final public function isGranted($attributes, $subject = null): bool
         if (!\is_array($attributes)) {
             $attributes = [$attributes];
         } else {
-            @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED);
         }
 
         return $this->accessDecisionManager->decide($token, $attributes, $subject);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA`
`58`	`58`	`public function decide(TokenInterface $token, array $attributes, $object = null)`
`59`	`59`	`{`
`60`	`60`	`if (\count($attributes) > 1) {`
`61`		`- @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED);`
	`61`	`+ @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return $this->{$this->strategy}($token, $attributes, $object);`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ final public function isGranted($attributes, $subject = null): bool`
`56`	`56`	`if (!\is_array($attributes)) {`
`57`	`57`	`$attributes = [$attributes];`
`58`	`58`	`} else {`
`59`		`- @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED);`
	`59`	`+ @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return $this->accessDecisionManager->decide($token, $attributes, $subject);`