Simplified access decision creation

florentdestremau · nicolas-grekas · commit e97da9a9fd5f · 2025-08-29T10:55:40.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -55,16 +55,14 @@ public function isGranted(mixed $role, mixed $object = null, ?string $field = nu
         }
     }
 
-    public function accessDecision(mixed $role, mixed $object = null, ?string $field = null, ?AccessDecision $accessDecision = null): AccessDecision
+    public function accessDecision(mixed $role, mixed $object = null, ?string $field = null): AccessDecision
     {
-        $accessDecision = $accessDecision ?? new AccessDecision();
-
+        $accessDecision = new AccessDecision();
         $this->isGranted($role, $object, $field, $accessDecision);
 
         return $accessDecision;
     }
 
-
     public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null, ?AccessDecision $accessDecision = null): bool
     {
         if (null === $this->securityChecker) {
@@ -90,10 +88,9 @@ public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $s
         }
     }
 
-    public function accessDecisionForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null, ?AccessDecision $accessDecision = null): AccessDecision
+    public function accessDecisionForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null): AccessDecision
     {
-        $accessDecision = $accessDecision ?? new AccessDecision();
-
+        $accessDecision = new AccessDecision();
         $this->isGrantedForUser($user, $attribute, $subject, $field, $accessDecision);
 
         return $accessDecision;
diff --git a/src/Symfony/Bundle/SecurityBundle/Security.php b/src/Symfony/Bundle/SecurityBundle/Security.php
@@ -65,9 +65,9 @@ public function isGranted(mixed $attributes, mixed $subject = null, ?AccessDecis
             ->isGranted($attributes, $subject, $accessDecision);
     }
 
-    public function accessDecision(mixed $attributes, mixed $subject = null, ?AccessDecision $accessDecision = null): AccessDecision
+    public function accessDecision(mixed $attributes, mixed $subject = null): AccessDecision
     {
-        $accessDecision = $accessDecision ?? new AccessDecision();
+        $accessDecision = new AccessDecision();
         $this->isGranted($attributes, $subject, $accessDecision);
 
         return $accessDecision;
@@ -84,15 +84,14 @@ public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $s
             ->isGrantedForUser($user, $attribute, $subject, $accessDecision);
     }
 
-    public function accessDecisionForUser(UserInterface $user, mixed $attributes, mixed $subject = null, ?AccessDecision $accessDecision = null): AccessDecision
+    public function accessDecisionForUser(UserInterface $user, mixed $attributes, mixed $subject = null): AccessDecision
     {
-        $accessDecision = $accessDecision ?? new AccessDecision();
+        $accessDecision = new AccessDecision();
         $this->isGrantedForUser($user, $attributes, $subject, $accessDecision);
 
         return $accessDecision;
     }
 
-
     public function getToken(): ?TokenInterface
     {
         return $this->container->get('security.token_storage')->getToken();

Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,14 @@ public function isGranted(mixed $role, mixed $object = null, ?string $field = nu`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function accessDecision(mixed $role, mixed $object = null, ?string $field = null, ?AccessDecision $accessDecision = null): AccessDecision`
	`58`	`+ public function accessDecision(mixed $role, mixed $object = null, ?string $field = null): AccessDecision`
`59`	`59`	`{`
`60`		`- $accessDecision = $accessDecision ?? new AccessDecision();`
`61`		`-`
	`60`	`+ $accessDecision = new AccessDecision();`
`62`	`61`	`$this->isGranted($role, $object, $field, $accessDecision);`
`63`	`62`
`64`	`63`	`return $accessDecision;`
`65`	`64`	`}`
`66`	`65`
`67`		`-`
`68`	`66`	`public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null, ?AccessDecision $accessDecision = null): bool`
`69`	`67`	`{`
`70`	`68`	`if (null === $this->securityChecker) {`
`@@ -90,10 +88,9 @@ public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $s`
`90`	`88`	`}`
`91`	`89`	`}`
`92`	`90`
`93`		`- public function accessDecisionForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null, ?AccessDecision $accessDecision = null): AccessDecision`
	`91`	`+ public function accessDecisionForUser(UserInterface $user, mixed $attribute, mixed $subject = null, ?string $field = null): AccessDecision`
`94`	`92`	`{`
`95`		`- $accessDecision = $accessDecision ?? new AccessDecision();`
`96`		`-`
	`93`	`+ $accessDecision = new AccessDecision();`
`97`	`94`	`$this->isGrantedForUser($user, $attribute, $subject, $field, $accessDecision);`
`98`	`95`
`99`	`96`	`return $accessDecision;`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ public function isGranted(mixed $attributes, mixed $subject = null, ?AccessDecis`
`65`	`65`	`->isGranted($attributes, $subject, $accessDecision);`
`66`	`66`	`}`
`67`	`67`
`68`		`- public function accessDecision(mixed $attributes, mixed $subject = null, ?AccessDecision $accessDecision = null): AccessDecision`
	`68`	`+ public function accessDecision(mixed $attributes, mixed $subject = null): AccessDecision`
`69`	`69`	`{`
`70`		`- $accessDecision = $accessDecision ?? new AccessDecision();`
	`70`	`+ $accessDecision = new AccessDecision();`
`71`	`71`	`$this->isGranted($attributes, $subject, $accessDecision);`
`72`	`72`
`73`	`73`	`return $accessDecision;`
`@@ -84,15 +84,14 @@ public function isGrantedForUser(UserInterface $user, mixed $attribute, mixed $s`
`84`	`84`	`->isGrantedForUser($user, $attribute, $subject, $accessDecision);`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function accessDecisionForUser(UserInterface $user, mixed $attributes, mixed $subject = null, ?AccessDecision $accessDecision = null): AccessDecision`
	`87`	`+ public function accessDecisionForUser(UserInterface $user, mixed $attributes, mixed $subject = null): AccessDecision`
`88`	`88`	`{`
`89`		`- $accessDecision = $accessDecision ?? new AccessDecision();`
	`89`	`+ $accessDecision = new AccessDecision();`
`90`	`90`	`$this->isGrantedForUser($user, $attributes, $subject, $accessDecision);`
`91`	`91`
`92`	`92`	`return $accessDecision;`
`93`	`93`	`}`
`94`	`94`
`95`		`-`
`96`	`95`	`public function getToken(): ?TokenInterface`
`97`	`96`	`{`
`98`	`97`	`return $this->container->get('security.token_storage')->getToken();`