minor #61594 [Security] Make UserChainProvider implement AttributesBasedUserProvider (valtzu)

nicolas-grekas · nicolas-grekas · commit 1d6ac7918c9c · 2025-09-03T10:27:58.000+02:00
This PR was merged into the 8.0 branch. Discussion ---------- [Security] Make `UserChainProvider` implement `AttributesBasedUserProvider` | Q | A | ------------- | --- | Branch? | 8.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | License | MIT Related to #61548 Commits ------- 7d9a6d1 [Security] Make `UserChainProvider` implement `AttributesBasedUserProviderInterface`
diff --git a/UPGRADE-8.0.md b/UPGRADE-8.0.md
@@ -387,6 +387,7 @@ Security
  * Add argument `$vote` to `VoterInterface::vote()` and `Voter::voteOnAttribute()`
  * Add argument `$token` to `UserCheckerInterface::checkPostAuth()`
  * Add argument `$attributes` to `UserAuthenticatorInterface::authenticateUser()`
+ * Make `UserChainProvider` implement `AttributesBasedUserProviderInterface`
 
 SecurityBundle
 --------------
diff --git a/src/Symfony/Component/Security/Core/CHANGELOG.md b/src/Symfony/Component/Security/Core/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Add argument `$accessDecision` to `AccessDecisionManagerInterface::decide()` and `AuthorizationCheckerInterface::isGranted()`
  * Add argument `$vote` to `VoterInterface::vote()` and `Voter::voteOnAttribute()`
  * Add argument `$token` to `UserCheckerInterface::checkPostAuth()`
+ * Make `UserChainProvider` implement `AttributesBasedUserProviderInterface`
 
 7.3
 ---
diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php
@@ -22,9 +22,9 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  *
- * @template-implements UserProviderInterface<UserInterface>
+ * @template-implements AttributesBasedUserProviderInterface<UserInterface>
  */
-class ChainUserProvider implements UserProviderInterface, PasswordUpgraderInterface
+class ChainUserProvider implements AttributesBasedUserProviderInterface, PasswordUpgraderInterface
 {
     /**
      * @param iterable<array-key, UserProviderInterface> $providers
@@ -46,12 +46,8 @@ public function getProviders(): array
         return $this->providers;
     }
 
-    /**
-     * @param array $attributes
-     */
-    public function loadUserByIdentifier(string $identifier/* , array $attributes = [] */): UserInterface
+    public function loadUserByIdentifier(string $identifier, array $attributes = []): UserInterface
     {
-        $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];
         foreach ($this->providers as $provider) {
             try {
                 if ($provider instanceof AttributesBasedUserProviderInterface) {

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`24`	`24`	`*`
`25`		`- * @template-implements UserProviderInterface<UserInterface>`
	`25`	`+ * @template-implements AttributesBasedUserProviderInterface<UserInterface>`
`26`	`26`	`*/`
`27`		`-class ChainUserProvider implements UserProviderInterface, PasswordUpgraderInterface`
	`27`	`+class ChainUserProvider implements AttributesBasedUserProviderInterface, PasswordUpgraderInterface`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* @param iterable<array-key, UserProviderInterface> $providers`
`@@ -46,12 +46,8 @@ public function getProviders(): array`
`46`	`46`	`return $this->providers;`
`47`	`47`	`}`
`48`	`48`
`49`		`- /**`
`50`		`- * @param array $attributes`
`51`		`- */`
`52`		`- public function loadUserByIdentifier(string $identifier/* , array $attributes = [] */): UserInterface`
	`49`	`+ public function loadUserByIdentifier(string $identifier, array $attributes = []): UserInterface`
`53`	`50`	`{`
`54`		`- $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];`
`55`	`51`	`foreach ($this->providers as $provider) {`
`56`	`52`	`try {`
`57`	`53`	`if ($provider instanceof AttributesBasedUserProviderInterface) {`