From 186dc781431dbf10076ea3800159144946c99bf3 Mon Sep 17 00:00:00 2001 From: Maarten de Boer Date: Thu, 27 May 2021 23:56:54 +0200 Subject: [PATCH] Register aliases for arguments --- .../DependencyInjection/Source/AbstractSource.php | 1 + .../DependencyInjection/Source/Checker/ClaimChecker.php | 1 + .../DependencyInjection/Source/Checker/HeaderChecker.php | 1 + .../DependencyInjection/Source/Encryption/JWEBuilder.php | 1 + .../DependencyInjection/Source/Encryption/JWEDecrypter.php | 1 + .../DependencyInjection/Source/Encryption/JWELoader.php | 1 + .../DependencyInjection/Source/Encryption/JWESerializer.php | 1 + .../Source/KeyManagement/JWKUriSource.php | 5 +++++ .../Source/NestedToken/NestedTokenBuilder.php | 1 + .../Source/NestedToken/NestedTokenLoader.php | 1 + .../DependencyInjection/Source/Signature/JWSBuilder.php | 1 + .../DependencyInjection/Source/Signature/JWSLoader.php | 1 + .../DependencyInjection/Source/Signature/JWSSerializer.php | 1 + .../DependencyInjection/Source/Signature/JWSVerifier.php | 1 + 14 files changed, 18 insertions(+) diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/AbstractSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/AbstractSource.php index 06c6c35a..1677b228 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/AbstractSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/AbstractSource.php @@ -28,6 +28,7 @@ public function create(ContainerBuilder $container, string $type, string $name, $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, $definition->getClass(), $name.' '.$type); } public function addConfiguration(NodeDefinition $node): void diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/ClaimChecker.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/ClaimChecker.php index 539e91dc..12a2e853 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/ClaimChecker.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/ClaimChecker.php @@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, ClaimCheckerManager::class, $name.'ClaimCheckerManager'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/HeaderChecker.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/HeaderChecker.php index 18badf83..bf61b0cf 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/HeaderChecker.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/HeaderChecker.php @@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, HeaderCheckerManager::class, $name.'HeaderCheckerManager'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEBuilder.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEBuilder.php index d69c616a..df195bb4 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEBuilder.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEBuilder.php @@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWEBuilderService::class, $name.'JweBuilder'); } } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEDecrypter.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEDecrypter.php index 9ccc1e91..cca733c6 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEDecrypter.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWEDecrypter.php @@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWEDecrypterService::class, $name.'JweDecrypter'); } } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWELoader.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWELoader.php index 63d5aea2..4317b0bf 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWELoader.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWELoader.php @@ -50,6 +50,7 @@ public function load(array $configs, ContainerBuilder $container): void } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWELoaderService::class, $name.'JweLoader'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWESerializer.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWESerializer.php index 4dad6bea..168b883a 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWESerializer.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/JWESerializer.php @@ -43,6 +43,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWESerializerManager::class, $name.'JweSerializer'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKUriSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKUriSource.php index ad5ac534..d98ec16f 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKUriSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKUriSource.php @@ -42,6 +42,11 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument( + $service_id, + JWKSetController::class, + $name.'JwkSetController' + ); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php b/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php index 39797263..b3f9a70b 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php @@ -49,6 +49,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, self::class, $name.'NestedTokenBuilder'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenLoader.php b/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenLoader.php index 5662a093..0951f95f 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenLoader.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenLoader.php @@ -51,6 +51,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, self::class, $name.'NestedTokenLoader'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSBuilder.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSBuilder.php index c1f4535e..bf3eee1a 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSBuilder.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSBuilder.php @@ -41,6 +41,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWSBuilderService::class, $name.'JwsBuilder'); } } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSLoader.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSLoader.php index 61f0f343..290f2214 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSLoader.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSLoader.php @@ -48,6 +48,7 @@ public function load(array $configs, ContainerBuilder $container): void } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWSLoaderService::class, $name.'JwsLoader'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSSerializer.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSSerializer.php index 9280be9f..2a609d68 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSSerializer.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSSerializer.php @@ -43,6 +43,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWSSerializerManager::class, $name.'JwsSerializer'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSVerifier.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSVerifier.php index ecd011e3..ecf5cb5e 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSVerifier.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/JWSVerifier.php @@ -43,6 +43,7 @@ public function load(array $configs, ContainerBuilder $container): void $definition->addTag($id, $attributes); } $container->setDefinition($service_id, $definition); + $container->registerAliasForArgument($service_id, JWSVerifierService::class, $name.'JwsVerifier'); } } }