Skip to content

Commit b2be12f

Browse files
committed
Remove deprecated request factory and compression methods
The request factory service alias and node have been removed from the JKUSource from the DependencyInjection. In addition, the compression method manager and deflate compression method have been removed from EncryptionBench. The message for cases with no compression methods has been updated to indicate there is no data available in the serialization_modes.html.twig file.
1 parent a202dff commit b2be12f

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

performance/JWE/EncryptionBench.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSA15;
3131
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP;
3232
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP256;
33-
use Jose\Component\Encryption\Compression\CompressionMethodManager;
34-
use Jose\Component\Encryption\Compression\Deflate;
3533
use Jose\Component\Encryption\JWEBuilder;
3634
use Jose\Component\Encryption\JWEDecrypter;
3735
use Jose\Component\Encryption\Serializer\CompactSerializer;
@@ -80,7 +78,6 @@ public function init(): void
8078
new A192GCM(),
8179
new A256GCM(),
8280
]);
83-
$this->compressionMethodsManager = new CompressionMethodManager([new Deflate()]);
8481
$this->serializerManager = new JWESerializerManager([
8582
new CompactSerializer(),
8683
new JSONFlattenedSerializer(),

src/Bundle/DependencyInjection/Source/KeyManagement/JKUSource.php

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public function load(array $configs, ContainerBuilder $container): void
2727
$loader->load('jku_source.php');
2828
$loader->load('jku_commands.php');
2929
$container->setAlias('jose.http_client', $configs[$this->name()]['client']);
30-
if (isset($configs[$this->name()]['request_factory'])) {
31-
$container->setAlias('jose.request_factory', $configs[$this->name()]['request_factory']);
32-
}
3330
}
3431
}
3532

@@ -38,20 +35,15 @@ public function getNodeDefinition(NodeDefinition $node): void
3835
{
3936
$node->children()
4037
->arrayNode('jku_factory')
41-
->canBeEnabled()
42-
->children()
43-
->scalarNode('client')
44-
->info('HTTP Client used to retrieve key sets.')
45-
->isRequired()
38+
->canBeEnabled()
39+
->children()
40+
->scalarNode('client')
41+
->info('HTTP Client used to retrieve key sets.')
42+
->isRequired()
43+
->end()
44+
->end()
4645
->end()
47-
->scalarNode('request_factory')
48-
->info('The request factory service.')
49-
//->setDeprecated('The "%node%" option is deprecated and will be removed in 4.0.')
50-
->defaultNull()
51-
->end()
52-
->end()
53-
->end()
54-
->end();
46+
->end();
5547
}
5648

5749
#[Override]

src/Bundle/Resources/views/data_collector/tab/jwe/serialization_modes.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% endfor %}
2121
{% else %}
2222
<tr>
23-
<td colspan="2">There is no compression method.</td>
23+
<td colspan="2">There is no data available</td>
2424
</tr>
2525
{% endif %}
2626
</tbody>

0 commit comments

Comments
 (0)