minor #59982 [Security] Fix typos in OIDC methods (valtzu)

fabpot · fabpot · commit c3c37f2ac046 · 2025-03-15T09:32:57.000-07:00
This PR was merged into the 7.3 branch. Discussion ---------- [Security] Fix typos in OIDC methods | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | License | MIT Related to recently merged [OIDC discovery](#54932), the DI is configured to call `enableDiscovery` method but it does not exist – but there is `enabledDiscovery`. Let's drop the extra `d`, and the same for `enabledJweSupport` too. Commits ------- 3d6cc19 Fix typos in OIDC methods
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php
@@ -71,7 +71,7 @@ public function create(ContainerBuilder $container, string $id, array|string $co
                 ->replaceArgument(0, $config['encryption']['keyset']);
 
             $tokenHandlerDefinition->addMethodCall(
-                'enabledJweSupport',
+                'enableJweSupport',
                 [
                     $keyset,
                     $algorithmManager,
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php
@@ -71,14 +71,14 @@ public function __construct(
         }
     }
 
-    public function enabledJweSupport(JWKSet $decryptionKeyset, AlgorithmManager $decryptionAlgorithms, bool $enforceEncryption): void
+    public function enableJweSupport(JWKSet $decryptionKeyset, AlgorithmManager $decryptionAlgorithms, bool $enforceEncryption): void
     {
         $this->decryptionKeyset = $decryptionKeyset;
         $this->decryptionAlgorithms = $decryptionAlgorithms;
         $this->enforceEncryption = $enforceEncryption;
     }
 
-    public function enabledDiscovery(CacheInterface $cache, HttpClientInterface $client, string $oidcConfigurationCacheKey, string $oidcJWKSetCacheKey): void
+    public function enableDiscovery(CacheInterface $cache, HttpClientInterface $client, string $oidcConfigurationCacheKey, string $oidcJWKSetCacheKey): void
     {
         $this->discoveryCache = $cache;
         $this->discoveryClient = $client;
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php
@@ -37,7 +37,7 @@ public function __construct(
     ) {
     }
 
-    public function enabledDiscovery(CacheInterface $cache, string $oidcConfigurationCacheKey): void
+    public function enableDiscovery(CacheInterface $cache, string $oidcConfigurationCacheKey): void
     {
         $this->discoveryCache = $cache;
         $this->oidcConfigurationCacheKey = $oidcConfigurationCacheKey;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function create(ContainerBuilder $container, string $id, array\|string $co`
`71`	`71`	`->replaceArgument(0, $config['encryption']['keyset']);`
`72`	`72`
`73`	`73`	`$tokenHandlerDefinition->addMethodCall(`
`74`		`- 'enabledJweSupport',`
	`74`	`+ 'enableJweSupport',`
`75`	`75`	`[`
`76`	`76`	`$keyset,`
`77`	`77`	`$algorithmManager,`
Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,14 @@ public function __construct(`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- public function enabledJweSupport(JWKSet $decryptionKeyset, AlgorithmManager $decryptionAlgorithms, bool $enforceEncryption): void`
	`74`	`+ public function enableJweSupport(JWKSet $decryptionKeyset, AlgorithmManager $decryptionAlgorithms, bool $enforceEncryption): void`
`75`	`75`	`{`
`76`	`76`	`$this->decryptionKeyset = $decryptionKeyset;`
`77`	`77`	`$this->decryptionAlgorithms = $decryptionAlgorithms;`
`78`	`78`	`$this->enforceEncryption = $enforceEncryption;`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function enabledDiscovery(CacheInterface $cache, HttpClientInterface $client, string $oidcConfigurationCacheKey, string $oidcJWKSetCacheKey): void`
	`81`	`+ public function enableDiscovery(CacheInterface $cache, HttpClientInterface $client, string $oidcConfigurationCacheKey, string $oidcJWKSetCacheKey): void`
`82`	`82`	`{`
`83`	`83`	`$this->discoveryCache = $cache;`
`84`	`84`	`$this->discoveryClient = $client;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(`
`37`	`37`	`) {`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function enabledDiscovery(CacheInterface $cache, string $oidcConfigurationCacheKey): void`
	`40`	`+ public function enableDiscovery(CacheInterface $cache, string $oidcConfigurationCacheKey): void`
`41`	`41`	`{`
`42`	`42`	`$this->discoveryCache = $cache;`
`43`	`43`	`$this->oidcConfigurationCacheKey = $oidcConfigurationCacheKey;`