Merge branch '7.1' into 7.2

OskarStark · OskarStark · commit 41a647ac4e95 · 2024-11-19T22:33:20.000+01:00
* 7.1:
  Fix isGranted to decide
diff --git a/security/impersonating_user.rst b/security/impersonating_user.rst
@@ -394,12 +394,12 @@ logic you want::
             }
 
             // you can still check for ROLE_ALLOWED_TO_SWITCH
-            if ($this->accessDecisionManager->isGranted($token, ['ROLE_ALLOWED_TO_SWITCH'])) {
+            if ($this->accessDecisionManager->decide($token, ['ROLE_ALLOWED_TO_SWITCH'])) {
                 return true;
             }
 
             // check for any roles you want
-            if ($this->accessDecisionManager->isGranted($token, ['ROLE_TECH_SUPPORT'])) {
+            if ($this->accessDecisionManager->decide($token, ['ROLE_TECH_SUPPORT'])) {
                 return true;
             }
 
diff --git a/security/voters.rst b/security/voters.rst
@@ -261,7 +261,7 @@ with ``ROLE_SUPER_ADMIN``::
             // ...
 
             // ROLE_SUPER_ADMIN can do anything! The power!
-            if ($this->accessDecisionManager->isGranted($token, ['ROLE_SUPER_ADMIN'])) {
+            if ($this->accessDecisionManager->decide($token, ['ROLE_SUPER_ADMIN'])) {
                 return true;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -394,12 +394,12 @@ logic you want::`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`// you can still check for ROLE_ALLOWED_TO_SWITCH`
`397`		`- if ($this->accessDecisionManager->isGranted($token, ['ROLE_ALLOWED_TO_SWITCH'])) {`
	`397`	`+ if ($this->accessDecisionManager->decide($token, ['ROLE_ALLOWED_TO_SWITCH'])) {`
`398`	`398`	`return true;`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`// check for any roles you want`
`402`		`- if ($this->accessDecisionManager->isGranted($token, ['ROLE_TECH_SUPPORT'])) {`
	`402`	`+ if ($this->accessDecisionManager->decide($token, ['ROLE_TECH_SUPPORT'])) {`
`403`	`403`	`return true;`
`404`	`404`	`}`
`405`	`405`
Original file line number	Diff line number	Diff line change
@@ -261,7 +261,7 @@ with ``ROLE_SUPER_ADMIN``::
`261`	`261`	`// ...`
`262`	`262`
`263`	`263`	`// ROLE_SUPER_ADMIN can do anything! The power!`
`264`		`- if ($this->accessDecisionManager->isGranted($token, ['ROLE_SUPER_ADMIN'])) {`
	`264`	`+ if ($this->accessDecisionManager->decide($token, ['ROLE_SUPER_ADMIN'])) {`
`265`	`265`	`return true;`
`266`	`266`	`}`
`267`	`267`