Skip to content

Commit 0ad5388

Browse files
SpomkySpomky
authored
Fix inconsistencies in last deprecation notices (#542)
Fix inconsistencies in last deprecation notices
1 parent 290507d commit 0ad5388

File tree

54 files changed

+374
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+374
-527
lines changed

‎performance/JWE/EncryptionBench.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ abstract class EncryptionBench
4848
{
4949
private AlgorithmManager $algorithmsManager;
5050

51-
private CompressionMethodManager $compressionMethodsManager;
52-
5351
private JWESerializerManager $serializerManager;
5452

5553
public function init(): void
@@ -96,7 +94,7 @@ public function init(): void
9694
*/
9795
public function encryption(array $params): void
9896
{
99-
$jweBuilder = new JWEBuilder($this->getAlgorithmsManager(), $this->getCompressionMethodsManager());
97+
$jweBuilder = new JWEBuilder($this->getAlgorithmsManager());
10098
$jweBuilder
10199
->withPayload($params['payload'])
102100
->withAAD($this->getAAD())
@@ -113,7 +111,7 @@ public function encryption(array $params): void
113111
*/
114112
public function decryption(array $params): void
115113
{
116-
$jweLoader = new JWEDecrypter($this->getAlgorithmsManager(), $this->getCompressionMethodsManager());
114+
$jweLoader = new JWEDecrypter($this->getAlgorithmsManager());
117115
$jwe = $this->serializerManager->unserialize($params['input']);
118116
$keyset = JWKSet::createFromKeyData($params['recipient_keys']);
119117
$jweLoader->decryptUsingKeySet($jwe, $keyset, 0);
@@ -138,9 +136,4 @@ private function getAlgorithmsManager(): AlgorithmManager
138136
{
139137
return $this->algorithmsManager;
140138
}
141-
142-
private function getCompressionMethodsManager(): CompressionMethodManager
143-
{
144-
return $this->compressionMethodsManager;
145-
}
146139
}

‎phpstan-baseline.neon

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ parameters:
751751
path: src/Bundle/Helper/ConfigurationHelper.php
752752

753753
-
754-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Helper\\\\ConfigurationHelper\\:\\:addJWEBuilder\\(\\) has parameter \\$keyEncryptionAlgorithm with no value type specified in iterable type array\\.$#"
754+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Helper\\\\ConfigurationHelper\\:\\:addJWEBuilder\\(\\) has parameter \\$encryptionAlgorithm with no value type specified in iterable type array\\.$#"
755755
count: 1
756756
path: src/Bundle/Helper/ConfigurationHelper.php
757757

@@ -771,7 +771,7 @@ parameters:
771771
path: src/Bundle/Helper/ConfigurationHelper.php
772772

773773
-
774-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Helper\\\\ConfigurationHelper\\:\\:addJWEDecrypter\\(\\) has parameter \\$keyEncryptionAlgorithm with no value type specified in iterable type array\\.$#"
774+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Helper\\\\ConfigurationHelper\\:\\:addJWEDecrypter\\(\\) has parameter \\$encryptionAlgorithm with no value type specified in iterable type array\\.$#"
775775
count: 1
776776
path: src/Bundle/Helper/ConfigurationHelper.php
777777

@@ -1095,21 +1095,6 @@ parameters:
10951095
count: 1
10961096
path: src/Bundle/Services/JWEDecrypter.php
10971097

1098-
-
1099-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWEDecrypterFactory\\:\\:create\\(\\) has parameter \\$compressionMethods with no value type specified in iterable type array\\.$#"
1100-
count: 1
1101-
path: src/Bundle/Services/JWEDecrypterFactory.php
1102-
1103-
-
1104-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWEDecrypterFactory\\:\\:create\\(\\) has parameter \\$contentEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1105-
count: 1
1106-
path: src/Bundle/Services/JWEDecrypterFactory.php
1107-
1108-
-
1109-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWEDecrypterFactory\\:\\:create\\(\\) has parameter \\$keyEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1110-
count: 1
1111-
path: src/Bundle/Services/JWEDecrypterFactory.php
1112-
11131098
-
11141099
message: """
11151100
#^Parameter \\$compressionMethodManagerFactory of method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWEDecrypterFactory\\:\\:__construct\\(\\) has typehint with deprecated class Jose\\\\Component\\\\Encryption\\\\Compression\\\\CompressionMethodManagerFactory\\:
@@ -1123,31 +1108,6 @@ parameters:
11231108
count: 1
11241109
path: src/Bundle/Services/JWELoader.php
11251110

1126-
-
1127-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$compressionMethods with no value type specified in iterable type array\\.$#"
1128-
count: 1
1129-
path: src/Bundle/Services/JWELoaderFactory.php
1130-
1131-
-
1132-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$contentEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1133-
count: 1
1134-
path: src/Bundle/Services/JWELoaderFactory.php
1135-
1136-
-
1137-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$headerCheckers with no value type specified in iterable type array\\.$#"
1138-
count: 1
1139-
path: src/Bundle/Services/JWELoaderFactory.php
1140-
1141-
-
1142-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$keyEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1143-
count: 1
1144-
path: src/Bundle/Services/JWELoaderFactory.php
1145-
1146-
-
1147-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$serializers with no value type specified in iterable type array\\.$#"
1148-
count: 1
1149-
path: src/Bundle/Services/JWELoaderFactory.php
1150-
11511111
-
11521112
message: "#^Parameter \\#4 \\$signature of class Jose\\\\Bundle\\\\JoseFramework\\\\Event\\\\JWSLoadingSuccessEvent constructor expects int, int\\|null given\\.$#"
11531113
count: 1
@@ -1189,17 +1149,17 @@ parameters:
11891149
path: src/Bundle/Services/NestedTokenBuilderFactory.php
11901150

11911151
-
1192-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$jwe_serializers with no value type specified in iterable type array\\.$#"
1152+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$encryptionAlgorithms with no value type specified in iterable type array\\.$#"
11931153
count: 1
11941154
path: src/Bundle/Services/NestedTokenBuilderFactory.php
11951155

11961156
-
1197-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$jws_serializers with no value type specified in iterable type array\\.$#"
1157+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$jwe_serializers with no value type specified in iterable type array\\.$#"
11981158
count: 1
11991159
path: src/Bundle/Services/NestedTokenBuilderFactory.php
12001160

12011161
-
1202-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$keyEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1162+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenBuilderFactory\\:\\:create\\(\\) has parameter \\$jws_serializers with no value type specified in iterable type array\\.$#"
12031163
count: 1
12041164
path: src/Bundle/Services/NestedTokenBuilderFactory.php
12051165

@@ -1224,27 +1184,27 @@ parameters:
12241184
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12251185

12261186
-
1227-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jweHeaderCheckers with no value type specified in iterable type array\\.$#"
1187+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$encryptionAlgorithms with no value type specified in iterable type array\\.$#"
12281188
count: 1
12291189
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12301190

12311191
-
1232-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jweSerializers with no value type specified in iterable type array\\.$#"
1192+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jweHeaderCheckers with no value type specified in iterable type array\\.$#"
12331193
count: 1
12341194
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12351195

12361196
-
1237-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jwsHeaderCheckers with no value type specified in iterable type array\\.$#"
1197+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jweSerializers with no value type specified in iterable type array\\.$#"
12381198
count: 1
12391199
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12401200

12411201
-
1242-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jwsSerializers with no value type specified in iterable type array\\.$#"
1202+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jwsHeaderCheckers with no value type specified in iterable type array\\.$#"
12431203
count: 1
12441204
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12451205

12461206
-
1247-
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$keyEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1207+
message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Services\\\\NestedTokenLoaderFactory\\:\\:create\\(\\) has parameter \\$jwsSerializers with no value type specified in iterable type array\\.$#"
12481208
count: 1
12491209
path: src/Bundle/Services/NestedTokenLoaderFactory.php
12501210

@@ -1779,12 +1739,12 @@ parameters:
17791739
path: src/Library/Encryption/JWELoaderFactory.php
17801740

17811741
-
1782-
message: "#^Method Jose\\\\Component\\\\Encryption\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$headerCheckers with no value type specified in iterable type array\\.$#"
1742+
message: "#^Method Jose\\\\Component\\\\Encryption\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$encryptionAlgorithms with no value type specified in iterable type array\\.$#"
17831743
count: 1
17841744
path: src/Library/Encryption/JWELoaderFactory.php
17851745

17861746
-
1787-
message: "#^Method Jose\\\\Component\\\\Encryption\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$keyEncryptionAlgorithms with no value type specified in iterable type array\\.$#"
1747+
message: "#^Method Jose\\\\Component\\\\Encryption\\\\JWELoaderFactory\\:\\:create\\(\\) has parameter \\$headerCheckers with no value type specified in iterable type array\\.$#"
17881748
count: 1
17891749
path: src/Library/Encryption/JWELoaderFactory.php
17901750

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,18 @@ public function getNodeDefinition(NodeDefinition $node): void
3333
->arrayNode('content_encryption_algorithms')
3434
->info('A list of supported content encryption algorithms.')
3535
->useAttributeAsKey('name')
36-
->isRequired()
37-
->requiresAtLeastOneElement()
36+
->treatNullLike([])
37+
->treatFalseLike([])
38+
->defaultValue([])
3839
->scalarPrototype()
3940
->end()
4041
->end()
4142
->arrayNode('compression_methods')
4243
->info('A list of supported compression methods.')
4344
->useAttributeAsKey('name')
44-
->defaultValue(['DEF'])
45+
->treatNullLike([])
46+
->treatFalseLike([])
47+
->defaultValue([])
4548
->scalarPrototype()
4649
->end()
4750
->end()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function load(array $configs, ContainerBuilder $container): void
2626
->setFactory([new Reference(JWEBuilderFactory::class), 'create'])
2727
->setArguments([
2828
$itemConfig['key_encryption_algorithms'],
29-
$itemConfig['content_encryption_algorithms'],
30-
$itemConfig['compression_methods'],
29+
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
30+
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3131
])
3232
->addTag('jose.jwe_builder')
3333
->setPublic($itemConfig['is_public']);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function load(array $configs, ContainerBuilder $container): void
2626
->setFactory([new Reference(JWEDecrypterFactory::class), 'create'])
2727
->setArguments([
2828
$itemConfig['key_encryption_algorithms'],
29-
$itemConfig['content_encryption_algorithms'],
30-
$itemConfig['compression_methods'],
29+
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
30+
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3131
])
3232
->addTag('jose.jwe_decrypter')
3333
->setPublic($itemConfig['is_public']);

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function load(array $configs, ContainerBuilder $container): void
2929
->setArguments([
3030
$itemConfig['serializers'],
3131
$itemConfig['key_encryption_algorithms'],
32-
$itemConfig['content_encryption_algorithms'],
33-
$itemConfig['compression_methods'],
32+
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
33+
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3434
$itemConfig['header_checkers'],
3535
])
3636
->addTag('jose.jwe_loader')
@@ -67,14 +67,18 @@ public function getNodeDefinition(NodeDefinition $node): void
6767
->arrayNode('content_encryption_algorithms')
6868
->info('A list of key encryption algorithm aliases.')
6969
->useAttributeAsKey('name')
70-
->isRequired()
70+
->treatNullLike([])
71+
->treatFalseLike([])
72+
->defaultValue([])
7173
->scalarPrototype()
7274
->end()
7375
->end()
7476
->arrayNode('compression_methods')
7577
->info('A list of compression method aliases.')
7678
->useAttributeAsKey('name')
77-
->defaultValue(['DEF'])
79+
->treatNullLike([])
80+
->treatFalseLike([])
81+
->defaultValue([])
7882
->scalarPrototype()
7983
->end()
8084
->end()

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function load(array $configs, ContainerBuilder $container): void
2929
->setArguments([
3030
$itemConfig['jwe_serializers'],
3131
$itemConfig['key_encryption_algorithms'],
32-
$itemConfig['content_encryption_algorithms'],
33-
$itemConfig['compression_methods'],
32+
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
33+
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3434
$itemConfig['jws_serializers'],
3535
$itemConfig['signature_algorithms'],
3636
])
@@ -74,14 +74,18 @@ public function getNodeDefinition(NodeDefinition $node): void
7474
->arrayNode('content_encryption_algorithms')
7575
->info('A list of key encryption algorithm aliases.')
7676
->useAttributeAsKey('name')
77-
->isRequired()
77+
->treatNullLike([])
78+
->treatFalseLike([])
79+
->defaultValue([])
7880
->scalarPrototype()
7981
->end()
8082
->end()
8183
->arrayNode('compression_methods')
8284
->info('A list of compression method aliases.')
8385
->useAttributeAsKey('name')
84-
->defaultValue(['DEF'])
86+
->treatNullLike([])
87+
->treatFalseLike([])
88+
->defaultValue([])
8589
->scalarPrototype()
8690
->end()
8791
->end()

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function load(array $configs, ContainerBuilder $container): void
2929
->setArguments([
3030
$itemConfig['jwe_serializers'],
3131
$itemConfig['key_encryption_algorithms'],
32-
$itemConfig['content_encryption_algorithms'],
33-
$itemConfig['compression_methods'],
32+
$itemConfig['content_encryption_algorithms'] === [] ? null : $itemConfig['content_encryption_algorithms'],
33+
$itemConfig['compression_methods'] === [] ? null : $itemConfig['compression_methods'],
3434
$itemConfig['jwe_header_checkers'],
3535
$itemConfig['jws_serializers'],
3636
$itemConfig['signature_algorithms'],
@@ -76,14 +76,18 @@ public function getNodeDefinition(NodeDefinition $node): void
7676
->arrayNode('content_encryption_algorithms')
7777
->info('A list of key encryption algorithm aliases.')
7878
->useAttributeAsKey('name')
79-
->isRequired()
79+
->treatNullLike([])
80+
->treatFalseLike([])
81+
->defaultValue([])
8082
->scalarPrototype()
8183
->end()
8284
->end()
8385
->arrayNode('compression_methods')
8486
->info('A list of compression method aliases.')
8587
->useAttributeAsKey('name')
86-
->defaultValue(['DEF'])
88+
->treatNullLike([])
89+
->treatFalseLike([])
90+
->defaultValue([])
8791
->scalarPrototype()
8892
->end()
8993
->end()

0 commit comments

Comments
 (0)