Clarified single attribute to isGranted() a bit more

wouterj · wouterj · commit 3e7a36f7ed34 · 2019-10-22T23:52:44.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -44,7 +44,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
      *
      * @throws AuthenticationCredentialsNotFoundException when the token storage has no authentication token
      */
-    final public function isGranted($attributes, $subject = null): bool
+    final public function isGranted($attribute, $subject = null): bool
     {
         if (null === ($token = $this->tokenStorage->getToken())) {
             throw new AuthenticationCredentialsNotFoundException('The token storage contains no authentication token. One possible reason may be that there is no firewall configured for this URL.');
@@ -54,10 +54,10 @@ final public function isGranted($attributes, $subject = null): bool
             $this->tokenStorage->setToken($token = $this->authenticationManager->authenticate($token));
         }
 
-        if (\is_array($attributes)) {
+        if (\is_array($attribute)) {
             throw new InvalidArgumentException(sprintf('Passing an array of Security attributes to %s() is not supported.', __METHOD__));
         }
 
-        return $this->accessDecisionManager->decide($token, [$attributes], $subject);
+        return $this->accessDecisionManager->decide($token, [$attribute], $subject);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationCheckerInterface.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationCheckerInterface.php
@@ -21,10 +21,10 @@ interface AuthorizationCheckerInterface
     /**
      * Checks if the attributes are granted against the current authentication token and optionally supplied subject.
      *
-     * @param mixed $attributes
-     * @param mixed $subject
+     * @param string $attribute
+     * @param mixed  $subject
      *
      * @return bool
      */
-    public function isGranted($attributes, $subject = null);
+    public function isGranted($attribute, $subject = null);
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM`
`44`	`44`	`*`
`45`	`45`	`* @throws AuthenticationCredentialsNotFoundException when the token storage has no authentication token`
`46`	`46`	`*/`
`47`		`- final public function isGranted($attributes, $subject = null): bool`
	`47`	`+ final public function isGranted($attribute, $subject = null): bool`
`48`	`48`	`{`
`49`	`49`	`if (null === ($token = $this->tokenStorage->getToken())) {`
`50`	`50`	`throw new AuthenticationCredentialsNotFoundException('The token storage contains no authentication token. One possible reason may be that there is no firewall configured for this URL.');`
`@@ -54,10 +54,10 @@ final public function isGranted($attributes, $subject = null): bool`
`54`	`54`	`$this->tokenStorage->setToken($token = $this->authenticationManager->authenticate($token));`
`55`	`55`	`}`
`56`	`56`
`57`		`- if (\is_array($attributes)) {`
	`57`	`+ if (\is_array($attribute)) {`
`58`	`58`	`throw new InvalidArgumentException(sprintf('Passing an array of Security attributes to %s() is not supported.', __METHOD__));`
`59`	`59`	`}`
`60`	`60`
`61`		`- return $this->accessDecisionManager->decide($token, [$attributes], $subject);`
	`61`	`+ return $this->accessDecisionManager->decide($token, [$attribute], $subject);`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ interface AuthorizationCheckerInterface`
`21`	`21`	`/**`
`22`	`22`	`* Checks if the attributes are granted against the current authentication token and optionally supplied subject.`
`23`	`23`	`*`
`24`		`- * @param mixed $attributes`
`25`		`- * @param mixed $subject`
	`24`	`+ * @param string $attribute`
	`25`	`+ * @param mixed $subject`
`26`	`26`	`*`
`27`	`27`	`* @return bool`
`28`	`28`	`*/`
`29`		`- public function isGranted($attributes, $subject = null);`
	`29`	`+ public function isGranted($attribute, $subject = null);`
`30`	`30`	`}`