Skip to content

Commit 8f6318c

Browse files
SpomkySpomky
committed
Conflicts resolved
1 parent 8429eda commit 8f6318c

40 files changed

+133
-874
lines changed

‎phpstan-baseline.neon

Lines changed: 78 additions & 98 deletions
Large diffs are not rendered by default.

‎src/Bundle/DataCollector/JWECollector.php

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Jose\Bundle\JoseFramework\Event\JWEBuiltSuccessEvent;
99
use Jose\Bundle\JoseFramework\Event\JWEDecryptionFailureEvent;
1010
use Jose\Bundle\JoseFramework\Event\JWEDecryptionSuccessEvent;
11-
use Jose\Component\Encryption\Compression\CompressionMethodManagerFactory;
1211
use Jose\Component\Encryption\JWEBuilder;
1312
use Jose\Component\Encryption\JWEDecrypter;
1413
use Jose\Component\Encryption\JWELoader;
@@ -59,7 +58,6 @@ final class JWECollector implements Collector, EventSubscriberInterface
5958
private array $jweLoaders = [];
6059

6160
public function __construct(
62-
private readonly ?CompressionMethodManagerFactory $compressionMethodManagerFactory = null,
6361
private readonly ?JWESerializerManagerFactory $jweSerializerManagerFactory = null
6462
) {
6563
}
@@ -70,7 +68,6 @@ public function __construct(
7068
#[Override]
7169
public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
7270
{
73-
$this->collectSupportedCompressionMethods($data);
7471
$this->collectSupportedJWESerializations($data);
7572
$this->collectSupportedJWEBuilders($data);
7673
$this->collectSupportedJWEDecrypters($data);
@@ -128,22 +125,6 @@ public function catchJweBuiltFailure(JWEBuiltFailureEvent $event): void
128125
$this->jweBuiltFailures[] = $cloner->cloneVar($event);
129126
}
130127

131-
/**
132-
* @param array<string, array<string, mixed>> $data
133-
* @deprecated This method is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
134-
*/
135-
private function collectSupportedCompressionMethods(array &$data): void
136-
{
137-
$data['jwe']['compression_methods'] = [];
138-
if ($this->compressionMethodManagerFactory === null) {
139-
return;
140-
}
141-
$compressionMethods = $this->compressionMethodManagerFactory->all();
142-
foreach ($compressionMethods as $alias => $compressionMethod) {
143-
$data['jwe']['compression_methods'][$alias] = $compressionMethod->name();
144-
}
145-
}
146-
147128
/**
148129
* @param array<string, array<string, mixed>> $data
149130
*/
@@ -171,8 +152,6 @@ private function collectSupportedJWEBuilders(array &$data): void
171152
->list(),
172153
'content_encryption_algorithms' => $jweBuilder->getContentEncryptionAlgorithmManager()
173154
->list(),
174-
'compression_methods' => $jweBuilder->getCompressionMethodManager()
175-
->list(),
176155
];
177156
}
178157
}
@@ -189,8 +168,6 @@ private function collectSupportedJWEDecrypters(array &$data): void
189168
->list(),
190169
'content_encryption_algorithms' => $jweDecrypter->getContentEncryptionAlgorithmManager()
191170
->list(),
192-
'compression_methods' => $jweDecrypter->getCompressionMethodManager()
193-
->list(),
194171
];
195172
}
196173
}
@@ -211,9 +188,6 @@ private function collectSupportedJWELoaders(array &$data): void
211188
'content_encryption_algorithms' => $jweLoader->getJweDecrypter()
212189
->getContentEncryptionAlgorithmManager()
213190
->list(),
214-
'compression_methods' => $jweLoader->getJweDecrypter()
215-
->getCompressionMethodManager()
216-
->list(),
217191
];
218192
}
219193
}

‎src/Bundle/DependencyInjection/Compiler/CompressionMethodCompilerPass.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/Bundle/DependencyInjection/Source/Encryption/AbstractEncryptionSource.php

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,14 @@ public function getNodeDefinition(NodeDefinition $node): void
2424
->info('If true, the service will be public, else private.')
2525
->defaultTrue()
2626
->end()
27-
->arrayNode('key_encryption_algorithms')
27+
->arrayNode('encryption_algorithms')
2828
->info('A list of supported key encryption algorithms.')
2929
->useAttributeAsKey('name')
3030
->isRequired()
3131
->requiresAtLeastOneElement()
3232
->scalarPrototype()
3333
->end()
3434
->end()
35-
->arrayNode('content_encryption_algorithms')
36-
->info('A list of supported content encryption algorithms.')
37-
->useAttributeAsKey('name')
38-
->treatNullLike([])
39-
->treatFalseLike([])
40-
->defaultValue([])
41-
->scalarPrototype()
42-
->end()
43-
->end()
44-
->arrayNode('compression_methods')
45-
->info('A list of supported compression methods.')
46-
->useAttributeAsKey('name')
47-
->treatNullLike([])
48-
->treatFalseLike([])
49-
->defaultValue([])
50-
->scalarPrototype()
51-
->end()
52-
->end()
5335
->arrayNode('tags')
5436
->info('A list of tags to be associated to the service.')
5537
->useAttributeAsKey('name')

‎src/Bundle/DependencyInjection/Source/Encryption/EncryptionSource.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption;
66

7-
use Jose\Bundle\JoseFramework\DependencyInjection\Compiler\CompressionMethodCompilerPass;
87
use Jose\Bundle\JoseFramework\DependencyInjection\Compiler\EncryptionSerializerCompilerPass;
98
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
109
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
@@ -54,7 +53,6 @@ public function load(array $configs, ContainerBuilder $container): void
5453
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
5554
$loader->load('jwe_services.php');
5655
$loader->load('jwe_serializers.php');
57-
$loader->load('compression_methods.php');
5856

5957
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config/Algorithms/'));
6058
foreach ($this->getAlgorithmsFiles() as $class => $file) {
@@ -104,7 +102,7 @@ public function prepend(ContainerBuilder $container, array $config): array
104102
#[Override]
105103
public function getCompilerPasses(): array
106104
{
107-
return [new EncryptionSerializerCompilerPass(), new CompressionMethodCompilerPass()];
105+
return [new EncryptionSerializerCompilerPass()];
108106
}
109107

110108
private function getAlgorithmsFiles(): array

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
2727
$definition = new Definition(JWEBuilderService::class);
2828
$definition
2929
->setFactory([new Reference(JWEBuilderFactory::class), 'create'])
30-
->setArguments([
31-
$itemConfig['key_encryption_algorithms'],
32-
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
33-
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
34-
])
30+
->setArguments([$itemConfig['key_encryption_algorithms']])
3531
->addTag('jose.jwe_builder')
3632
->setPublic($itemConfig['is_public']);
3733
foreach ($itemConfig['tags'] as $id => $attributes) {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
2727
$definition = new Definition(JWEDecrypterService::class);
2828
$definition
2929
->setFactory([new Reference(JWEDecrypterFactory::class), 'create'])
30-
->setArguments([
31-
$itemConfig['key_encryption_algorithms'],
32-
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
33-
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
34-
])
30+
->setArguments([$itemConfig['key_encryption_algorithms']])
3531
->addTag('jose.jwe_decrypter')
3632
->setPublic($itemConfig['is_public']);
3733
foreach ($itemConfig['tags'] as $id => $attributes) {

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public function load(array $configs, ContainerBuilder $container): void
3232
->setArguments([
3333
$itemConfig['serializers'],
3434
$itemConfig['key_encryption_algorithms'],
35-
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
36-
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3735
$itemConfig['header_checkers'],
3836
])
3937
->addTag('jose.jwe_loader')
@@ -61,31 +59,13 @@ public function getNodeDefinition(NodeDefinition $node): void
6159
->info('If true, the service will be public, else private.')
6260
->defaultTrue()
6361
->end()
64-
->arrayNode('key_encryption_algorithms')
62+
->arrayNode('encryption_algorithms')
6563
->info('A list of key encryption algorithm aliases.')
6664
->useAttributeAsKey('name')
6765
->isRequired()
6866
->scalarPrototype()
6967
->end()
7068
->end()
71-
->arrayNode('content_encryption_algorithms')
72-
->info('A list of key encryption algorithm aliases.')
73-
->useAttributeAsKey('name')
74-
->treatNullLike([])
75-
->treatFalseLike([])
76-
->defaultValue([])
77-
->scalarPrototype()
78-
->end()
79-
->end()
80-
->arrayNode('compression_methods')
81-
->info('A list of compression method aliases.')
82-
->useAttributeAsKey('name')
83-
->treatNullLike([])
84-
->treatFalseLike([])
85-
->defaultValue([])
86-
->scalarPrototype()
87-
->end()
88-
->end()
8969
->arrayNode('serializers')
9070
->info('A list of signature serializer aliases.')
9171
->useAttributeAsKey('name')

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public function load(array $configs, ContainerBuilder $container): void
3232
->setArguments([
3333
$itemConfig['jwe_serializers'],
3434
$itemConfig['key_encryption_algorithms'],
35-
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
36-
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3735
$itemConfig['jws_serializers'],
3836
$itemConfig['signature_algorithms'],
3937
])
@@ -68,31 +66,13 @@ public function getNodeDefinition(NodeDefinition $node): void
6866
->scalarPrototype()
6967
->end()
7068
->end()
71-
->arrayNode('key_encryption_algorithms')
69+
->arrayNode('encryption_algorithms')
7270
->info('A list of key encryption algorithm aliases.')
7371
->useAttributeAsKey('name')
7472
->isRequired()
7573
->scalarPrototype()
7674
->end()
7775
->end()
78-
->arrayNode('content_encryption_algorithms')
79-
->info('A list of key encryption algorithm aliases.')
80-
->useAttributeAsKey('name')
81-
->treatNullLike([])
82-
->treatFalseLike([])
83-
->defaultValue([])
84-
->scalarPrototype()
85-
->end()
86-
->end()
87-
->arrayNode('compression_methods')
88-
->info('A list of compression method aliases.')
89-
->useAttributeAsKey('name')
90-
->treatNullLike([])
91-
->treatFalseLike([])
92-
->defaultValue([])
93-
->scalarPrototype()
94-
->end()
95-
->end()
9676
->arrayNode('jws_serializers')
9777
->info('A list of JWS serializer aliases.')
9878
->useAttributeAsKey('name')

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

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public function load(array $configs, ContainerBuilder $container): void
3232
->setArguments([
3333
$itemConfig['jwe_serializers'],
3434
$itemConfig['key_encryption_algorithms'],
35-
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
36-
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3735
$itemConfig['jwe_header_checkers'],
3836
$itemConfig['jws_serializers'],
3937
$itemConfig['signature_algorithms'],
@@ -70,31 +68,13 @@ public function getNodeDefinition(NodeDefinition $node): void
7068
->scalarPrototype()
7169
->end()
7270
->end()
73-
->arrayNode('key_encryption_algorithms')
74-
->info('A list of key encryption algorithm aliases.')
71+
->arrayNode('encryption_algorithms')
72+
->info('A list of encryption algorithm aliases.')
7573
->useAttributeAsKey('name')
7674
->isRequired()
7775
->scalarPrototype()
7876
->end()
7977
->end()
80-
->arrayNode('content_encryption_algorithms')
81-
->info('A list of key encryption algorithm aliases.')
82-
->useAttributeAsKey('name')
83-
->treatNullLike([])
84-
->treatFalseLike([])
85-
->defaultValue([])
86-
->scalarPrototype()
87-
->end()
88-
->end()
89-
->arrayNode('compression_methods')
90-
->info('A list of compression method aliases.')
91-
->useAttributeAsKey('name')
92-
->treatNullLike([])
93-
->treatFalseLike([])
94-
->defaultValue([])
95-
->scalarPrototype()
96-
->end()
97-
->end()
9878
->arrayNode('jws_serializers')
9979
->info('A list of JWS serializer aliases.')
10080
->useAttributeAsKey('name')

0 commit comments

Comments
 (0)