Conflicts resolved

Author: Spomky

src/Bundle/DataCollector/JWECollector.php

@@ -148,9 +148,7 @@ private function collectSupportedJWEBuilders(array &$data): void
         $data['jwe']['jwe_builders'] = [];
         foreach ($this->jweBuilders as $id => $jweBuilder) {
             $data['jwe']['jwe_builders'][$id] = [
-                'key_encryption_algorithms' => $jweBuilder->getKeyEncryptionAlgorithmManager()
-                    ->list(),
-                'content_encryption_algorithms' => $jweBuilder->getContentEncryptionAlgorithmManager()
+                'encryption_algorithms' => $jweBuilder->getKeyEncryptionAlgorithmManager()
                     ->list(),
             ];
         }
@@ -164,9 +162,7 @@ private function collectSupportedJWEDecrypters(array &$data): void
         $data['jwe']['jwe_decrypters'] = [];
         foreach ($this->jweDecrypters as $id => $jweDecrypter) {
             $data['jwe']['jwe_decrypters'][$id] = [
-                'key_encryption_algorithms' => $jweDecrypter->getKeyEncryptionAlgorithmManager()
-                    ->list(),
-                'content_encryption_algorithms' => $jweDecrypter->getContentEncryptionAlgorithmManager()
+                'encryption_algorithms' => $jweDecrypter->getKeyEncryptionAlgorithmManager()
                     ->list(),
             ];
         }
@@ -182,12 +178,9 @@ private function collectSupportedJWELoaders(array &$data): void
             $data['jwe']['jwe_loaders'][$id] = [
                 'serializers' => $jweLoader->getSerializerManager()
                     ->names(),
-                'key_encryption_algorithms' => $jweLoader->getJweDecrypter()
+                'encryption_algorithms' => $jweLoader->getJweDecrypter()
                     ->getKeyEncryptionAlgorithmManager()
                     ->list(),
-                'content_encryption_algorithms' => $jweLoader->getJweDecrypter()
-                    ->getContentEncryptionAlgorithmManager()
-                    ->list(),
             ];
         }
     }

src/Bundle/DependencyInjection/Source/Encryption/JWEBuilder.php

@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $definition = new Definition(JWEBuilderService::class);
             $definition
                 ->setFactory([new Reference(JWEBuilderFactory::class), 'create'])
-                ->setArguments([$itemConfig['key_encryption_algorithms']])
+                ->setArguments([$itemConfig['encryption_algorithms']])
                 ->addTag('jose.jwe_builder')
                 ->setPublic($itemConfig['is_public']);
             foreach ($itemConfig['tags'] as $id => $attributes) {

src/Bundle/DependencyInjection/Source/Encryption/JWEDecrypter.php

@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $definition = new Definition(JWEDecrypterService::class);
             $definition
                 ->setFactory([new Reference(JWEDecrypterFactory::class), 'create'])
-                ->setArguments([$itemConfig['key_encryption_algorithms']])
+                ->setArguments([$itemConfig['encryption_algorithms']])
                 ->addTag('jose.jwe_decrypter')
                 ->setPublic($itemConfig['is_public']);
             foreach ($itemConfig['tags'] as $id => $attributes) {

src/Bundle/DependencyInjection/Source/Encryption/JWELoader.php

@@ -31,7 +31,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->setFactory([new Reference(JWELoaderFactory::class), 'create'])
                 ->setArguments([
                     $itemConfig['serializers'],
-                    $itemConfig['key_encryption_algorithms'],
+                    $itemConfig['encryption_algorithms'],
                     $itemConfig['header_checkers'],
                 ])
                 ->addTag('jose.jwe_loader')

src/Bundle/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php

@@ -31,7 +31,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->setFactory([new Reference(NestedTokenBuilderFactory::class), 'create'])
                 ->setArguments([
                     $itemConfig['jwe_serializers'],
-                    $itemConfig['key_encryption_algorithms'],
+                    $itemConfig['encryption_algorithms'],
                     $itemConfig['jws_serializers'],
                     $itemConfig['signature_algorithms'],
                 ])

src/Bundle/DependencyInjection/Source/NestedToken/NestedTokenLoader.php

@@ -31,7 +31,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->setFactory([new Reference(NestedTokenLoaderFactory::class), 'create'])
                 ->setArguments([
                     $itemConfig['jwe_serializers'],
-                    $itemConfig['key_encryption_algorithms'],
+                    $itemConfig['encryption_algorithms'],
                     $itemConfig['jwe_header_checkers'],
                     $itemConfig['jws_serializers'],
                     $itemConfig['signature_algorithms'],

tests/Bundle/JoseFramework/Functional/Encryption/JWELoaderTest.php

@@ -33,7 +33,7 @@ public static function theWELoaderFactoryCanCreateAJWELoader(): void
         $jweLoaderFactory = $container->get(JWELoaderFactoryAlias::class);
         static::assertInstanceOf(JWELoaderFactoryAlias::class, $jweLoaderFactory);
 
-        $jwe = $jweLoaderFactory->create(['jwe_compact'], ['RSA1_5'], ['A256GCM']);
+        $jwe = $jweLoaderFactory->create(['jwe_compact'], ['RSA1_5', 'A256GCM']);
 
         static::assertSame(['jwe_compact'], $jwe->getSerializerManager()->names());
         static::assertSame(['RSA1_5'], $jwe->getJweDecrypter()->getKeyEncryptionAlgorithmManager()->list());

tests/Bundle/JoseFramework/Functional/Encryption/JweBuilderConfigurationTest.php

@@ -69,7 +69,7 @@ public function theConfigurationIsInvalidIfNotKeyEncryptionAlgorithmIsSet(): voi
                     ],
                 ],
             ],
-            'The child config "key_encryption_algorithms" under "jose.jwe.builders.foo" must be configured:'
+            'The child config "encryption_algorithms" under "jose.jwe.builders.foo" must be configured:'
         );
     }
 
@@ -82,13 +82,13 @@ public function theConfigurationIsInvalidIfTheKeyEncryptionAlgorithmIsEmpty(): v
                     'jwe' => [
                         'builders' => [
                             'foo' => [
-                                'key_encryption_algorithms' => [],
+                                'encryption_algorithms' => [],
                             ],
                         ],
                     ],
                 ],
             ],
-            'The path "jose.jwe.builders.foo.key_encryption_algorithms" should have at least 1 element(s) defined.'
+            'The path "jose.jwe.builders.foo.encryption_algorithms" should have at least 1 element(s) defined.'
         );
     }
 

tests/Bundle/JoseFramework/Functional/Encryption/JweDecrypterConfigurationTest.php

@@ -69,7 +69,7 @@ public function theConfigurationIsInvalidIfNotKeyEncryptionAlgorithmIsSet(): voi
                     ],
                 ],
             ],
-            'The child config "key_encryption_algorithms" under "jose.jwe.decrypters.foo" must be configured:'
+            'The child config "encryption_algorithms" under "jose.jwe.decrypters.foo" must be configured:'
         );
     }
 
@@ -82,13 +82,13 @@ public function theConfigurationIsInvalidIfTheKeyEncryptionAlgorithmIsEmpty(): v
                     'jwe' => [
                         'decrypters' => [
                             'foo' => [
-                                'key_encryption_algorithms' => [],
+                                'encryption_algorithms' => [],
                             ],
                         ],
                     ],
                 ],
             ],
-            'The path "jose.jwe.decrypters.foo.key_encryption_algorithms" should have at least 1 element(s) defined.'
+            'The path "jose.jwe.decrypters.foo.encryption_algorithms" should have at least 1 element(s) defined.'
         );
     }
 

tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderConfigurationTest.php

@@ -91,7 +91,7 @@ public function theConfigurationIsInvalidIfNoKeyEncryptionAlgorithmIsSet(): void
                     ],
                 ],
             ],
-            'The child config "key_encryption_algorithms" under "jose.nested_token.builders.foo" must be configured:'
+            'The child config "encryption_algorithms" under "jose.nested_token.builders.foo" must be configured:'
         );
     }
 
@@ -105,8 +105,7 @@ public function theConfigurationIsInvalidIfNoJwsSerializerIsSet(): void
                         'builders' => [
                             'foo' => [
                                 'signature_algorithms' => ['RS256'],
-                                'key_encryption_algorithms' => ['RSA-OAEP'],
-                                'content_encryption_algorithms' => ['A128GCM'],
+                                'encryption_algorithms' => ['RSA-OAEP', 'A128GCM'],
                             ],
                         ],
                     ],
@@ -126,8 +125,7 @@ public function theConfigurationIsInvalidIfNoJweSerializerIsSet(): void
                         'builders' => [
                             'foo' => [
                                 'signature_algorithms' => ['RS256'],
-                                'key_encryption_algorithms' => ['RSA-OAEP'],
-                                'content_encryption_algorithms' => ['A128GCM'],
+                                'encryption_algorithms' => ['RSA-OAEP', 'A128GCM'],
                                 'jws_serializers' => ['jws_compact'],
                             ],
                         ],
@@ -148,8 +146,7 @@ public function theConfigurationIsValid(): void
                         'builders' => [
                             'foo' => [
                                 'signature_algorithms' => ['RS256'],
-                                'key_encryption_algorithms' => ['RSA-OAEP'],
-                                'content_encryption_algorithms' => ['A128GCM'],
+                                'encryption_algorithms' => ['RSA-OAEP', 'A128GCM'],
                                 'jws_serializers' => ['jws_compact'],
                                 'jwe_serializers' => ['jwe_compact'],
                             ],