Skip to content

Commit 80361f4

Browse files
SpomkySpomky
authored
Deps/remove useless checks (#511)
* Remove useless verifications * Tests on PHP 8.2 and 8.3
1 parent c601529 commit 80361f4

File tree

9 files changed

+863
-948
lines changed

9 files changed

+863
-948
lines changed

‎.github/workflows/integrate.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
- "ubuntu-latest"
5656
php-version:
5757
- "8.1"
58+
- "8.2"
59+
- "8.3"
5860
dependencies:
5961
- "lowest"
6062
- "highest"

‎phpstan-baseline.neon

Lines changed: 860 additions & 855 deletions
Large diffs are not rendered by default.

‎src/Bundle/DependencyInjection/Source/Checker/CheckerSource.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
use Jose\Bundle\JoseFramework\DependencyInjection\Compiler\HeaderCheckerCompilerPass;
99
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
1010
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
11-
use Jose\Component\Checker\ClaimCheckerManagerFactory;
12-
use Jose\Component\Checker\HeaderCheckerManagerFactory;
1311
use Jose\Component\Checker\TokenTypeSupport;
1412
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1513
use Symfony\Component\Config\FileLocator;
@@ -38,9 +36,6 @@ public function name(): string
3836

3937
public function load(array $configs, ContainerBuilder $container): void
4038
{
41-
if (! $this->isEnabled()) {
42-
return;
43-
}
4439
$container->registerForAutoconfiguration(TokenTypeSupport::class)->addTag('jose.checker.token_type');
4540
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
4641
$loader->load('checkers.php');
@@ -55,9 +50,6 @@ public function load(array $configs, ContainerBuilder $container): void
5550

5651
public function getNodeDefinition(NodeDefinition $node): void
5752
{
58-
if (! $this->isEnabled()) {
59-
return;
60-
}
6153
$node->children()
6254
->scalarNode('clock')
6355
->defaultValue('jose.internal_clock')
@@ -79,9 +71,6 @@ public function getNodeDefinition(NodeDefinition $node): void
7971

8072
public function prepend(ContainerBuilder $container, array $config): array
8173
{
82-
if (! $this->isEnabled()) {
83-
return [];
84-
}
8574
$result = [];
8675
foreach ($this->sources as $source) {
8776
$prepend = $source->prepend($container, $config);
@@ -100,9 +89,4 @@ public function getCompilerPasses(): array
10089
{
10190
return [new ClaimCheckerCompilerPass(), new HeaderCheckerCompilerPass()];
10291
}
103-
104-
private function isEnabled(): bool
105-
{
106-
return class_exists(HeaderCheckerManagerFactory::class) && class_exists(ClaimCheckerManagerFactory::class);
107-
}
10892
}

‎src/Bundle/DependencyInjection/Source/Console/ConsoleSource.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\Console;
66

77
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
8-
use Jose\Component\Console\EcKeyGeneratorCommand;
98
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
109
use Symfony\Component\Config\FileLocator;
1110
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -20,9 +19,6 @@ public function name(): string
2019

2120
public function load(array $configs, ContainerBuilder $container): void
2221
{
23-
if (! $this->isEnabled()) {
24-
return;
25-
}
2622
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
2723
$loader->load('commands.php');
2824
}
@@ -35,9 +31,4 @@ public function prepend(ContainerBuilder $container, array $config): array
3531
{
3632
return [];
3733
}
38-
39-
private function isEnabled(): bool
40-
{
41-
return class_exists(EcKeyGeneratorCommand::class);
42-
}
4334
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHES;
1919
use Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2AESKW;
2020
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSA;
21-
use Jose\Component\Encryption\JWEBuilderFactory;
22-
use Jose\Component\Encryption\JWEDecrypterFactory;
2321
use Jose\Component\Encryption\Serializer\JWESerializer as JWESerializerAlias;
2422
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
2523
use Symfony\Component\Config\FileLocator;
@@ -49,9 +47,6 @@ public function name(): string
4947

5048
public function load(array $configs, ContainerBuilder $container): void
5149
{
52-
if (! $this->isEnabled()) {
53-
return;
54-
}
5550
$container->registerForAutoconfiguration(JWESerializerAlias::class)->addTag('jose.jwe.serializer');
5651
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
5752
$loader->load('jwe_services.php');
@@ -74,9 +69,6 @@ public function load(array $configs, ContainerBuilder $container): void
7469

7570
public function getNodeDefinition(NodeDefinition $node): void
7671
{
77-
if (! $this->isEnabled()) {
78-
return;
79-
}
8072
$childNode = $node->children()
8173
->arrayNode($this->name())
8274
->addDefaultsIfNotSet()
@@ -90,9 +82,6 @@ public function getNodeDefinition(NodeDefinition $node): void
9082

9183
public function prepend(ContainerBuilder $container, array $config): array
9284
{
93-
if (! $this->isEnabled()) {
94-
return [];
95-
}
9685
$result = [];
9786
foreach ($this->sources as $source) {
9887
$prepend = $source->prepend($container, $config);
@@ -131,9 +120,4 @@ private function getAlgorithmsFiles(): array
131120

132121
return $list;
133122
}
134-
135-
private function isEnabled(): bool
136-
{
137-
return class_exists(JWEBuilderFactory::class) && class_exists(JWEDecrypterFactory::class);
138-
}
139123
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement;
66

77
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
8-
use Jose\Component\Console\JKULoaderCommand;
98
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
109
use Symfony\Component\Config\FileLocator;
1110
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -23,9 +22,7 @@ public function load(array $configs, ContainerBuilder $container): void
2322
if ($configs[$this->name()]['enabled'] === true) {
2423
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
2524
$loader->load('jku_source.php');
26-
if (class_exists(JKULoaderCommand::class)) {
27-
$loader->load('jku_commands.php');
28-
}
25+
$loader->load('jku_commands.php');
2926
$container->setAlias('jose.http_client', $configs[$this->name()]['client']);
3027
$container->setAlias('jose.request_factory', $configs[$this->name()]['request_factory']);
3128
}

‎src/Bundle/DependencyInjection/Source/KeyManagement/KeyManagementSource.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
1212
use Jose\Component\KeyManagement\Analyzer\KeyAnalyzer;
1313
use Jose\Component\KeyManagement\Analyzer\KeysetAnalyzer;
14-
use Jose\Component\KeyManagement\JWKFactory;
1514
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1615
use Symfony\Component\Config\FileLocator;
1716
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -38,9 +37,6 @@ public function name(): string
3837

3938
public function load(array $configs, ContainerBuilder $container): void
4039
{
41-
if (! $this->isEnabled()) {
42-
return;
43-
}
4440
$container->registerForAutoconfiguration(KeyAnalyzer::class)->addTag('jose.key_analyzer');
4541
$container->registerForAutoconfiguration(KeysetAnalyzer::class)->addTag('jose.keyset_analyzer');
4642
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
@@ -55,19 +51,13 @@ public function load(array $configs, ContainerBuilder $container): void
5551

5652
public function getNodeDefinition(NodeDefinition $node): void
5753
{
58-
if (! $this->isEnabled()) {
59-
return;
60-
}
6154
foreach ($this->sources as $source) {
6255
$source->getNodeDefinition($node);
6356
}
6457
}
6558

6659
public function prepend(ContainerBuilder $container, array $config): array
6760
{
68-
if (! $this->isEnabled()) {
69-
return [];
70-
}
7161
$result = [];
7262
foreach ($this->sources as $source) {
7363
$prepend = $source->prepend($container, $config);
@@ -90,9 +80,4 @@ public function getCompilerPasses(): array
9080
new KeySetControllerCompilerPass(),
9181
];
9282
}
93-
94-
private function isEnabled(): bool
95-
{
96-
return class_exists(JWKFactory::class);
97-
}
9883
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\NestedToken;
66

77
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
8-
use Jose\Component\NestedToken\NestedTokenBuilder as JoseNestedTokenBuilder;
9-
use Jose\Component\NestedToken\NestedTokenLoader as JoseNestedTokenLoader;
108
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
119
use Symfony\Component\Config\FileLocator;
1210
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -33,9 +31,6 @@ public function name(): string
3331

3432
public function load(array $configs, ContainerBuilder $container): void
3533
{
36-
if (! $this->isEnabled()) {
37-
return;
38-
}
3934
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
4035
$loader->load('nested_token.php');
4136

@@ -48,9 +43,6 @@ public function load(array $configs, ContainerBuilder $container): void
4843

4944
public function getNodeDefinition(NodeDefinition $node): void
5045
{
51-
if (! $this->isEnabled()) {
52-
return;
53-
}
5446
$childNode = $node->children()
5547
->arrayNode($this->name())
5648
->treatNullLike([])
@@ -63,9 +55,6 @@ public function getNodeDefinition(NodeDefinition $node): void
6355

6456
public function prepend(ContainerBuilder $container, array $config): array
6557
{
66-
if (! $this->isEnabled()) {
67-
return [];
68-
}
6958
$result = [];
7059
foreach ($this->sources as $source) {
7160
$prepend = $source->prepend($container, $config);
@@ -76,10 +65,4 @@ public function prepend(ContainerBuilder $container, array $config): array
7665

7766
return $result;
7867
}
79-
80-
private function isEnabled(): bool
81-
{
82-
return class_exists(JoseNestedTokenBuilder::class)
83-
&& class_exists(JoseNestedTokenLoader::class);
84-
}
8568
}

‎src/Bundle/DependencyInjection/Source/Signature/SignatureSource.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
use Jose\Component\Signature\Algorithm\HS1;
1414
use Jose\Component\Signature\Algorithm\None;
1515
use Jose\Component\Signature\Algorithm\RSAPSS;
16-
use Jose\Component\Signature\JWSBuilderFactory;
17-
use Jose\Component\Signature\JWSVerifierFactory;
1816
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1917
use Symfony\Component\Config\FileLocator;
2018
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -43,9 +41,6 @@ public function name(): string
4341

4442
public function load(array $configs, ContainerBuilder $container): void
4543
{
46-
if (! $this->isEnabled()) {
47-
return;
48-
}
4944
$container->registerForAutoconfiguration(\Jose\Component\Signature\Serializer\JWSSerializer::class)->addTag(
5045
'jose.jws.serializer'
5146
);
@@ -69,9 +64,6 @@ public function load(array $configs, ContainerBuilder $container): void
6964

7065
public function getNodeDefinition(NodeDefinition $node): void
7166
{
72-
if (! $this->isEnabled()) {
73-
return;
74-
}
7567
$childNode = $node->children()
7668
->arrayNode($this->name())
7769
->addDefaultsIfNotSet()
@@ -85,9 +77,6 @@ public function getNodeDefinition(NodeDefinition $node): void
8577

8678
public function prepend(ContainerBuilder $container, array $config): array
8779
{
88-
if (! $this->isEnabled()) {
89-
return [];
90-
}
9180
$result = [];
9281
foreach ($this->sources as $source) {
9382
$prepend = $source->prepend($container, $config);
@@ -123,9 +112,4 @@ private function getAlgorithmsFiles(): array
123112

124113
return $algorithms;
125114
}
126-
127-
private function isEnabled(): bool
128-
{
129-
return class_exists(JWSBuilderFactory::class) && class_exists(JWSVerifierFactory::class);
130-
}
131115
}

0 commit comments

Comments
 (0)