Skip to content

Commit f995b68

Browse files
SpomkySpomky
authored
Use of PhpFileLoader instead YamlFileLoader (#104)
* YamlFileLoader => PhpFileLoader
1 parent f6bdacb commit f995b68

Some content is hidden

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

52 files changed

+801
-569
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
1919
use Jose\Component\Checker\ClaimCheckerManagerFactory;
2020
use Jose\Component\Checker\HeaderCheckerManagerFactory;
21+
use Jose\Component\Checker\TokenTypeSupport;
2122
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
2223
use Symfony\Component\Config\FileLocator;
2324
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2425
use Symfony\Component\DependencyInjection\ContainerBuilder;
25-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2627

2728
class CheckerSource implements SourceWithCompilerPasses
2829
{
@@ -58,8 +59,9 @@ public function load(array $configs, ContainerBuilder $container)
5859
if (!$this->isEnabled()) {
5960
return;
6061
}
61-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
62-
$loader->load('checkers.yml');
62+
$container->registerForAutoconfiguration(TokenTypeSupport::class)->addTag('jose.checker.token_type');
63+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
64+
$loader->load('checkers.php');
6365

6466
if (array_key_exists('checkers', $configs)) {
6567
foreach ($this->sources as $source) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1919
use Symfony\Component\Config\FileLocator;
2020
use Symfony\Component\DependencyInjection\ContainerBuilder;
21-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2222

2323
class ConsoleSource implements Source
2424
{
@@ -38,8 +38,8 @@ public function load(array $configs, ContainerBuilder $container)
3838
if (!$this->isEnabled()) {
3939
return;
4040
}
41-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
42-
$loader->load('commands.yml');
41+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
42+
$loader->load('commands.php');
4343
}
4444

4545
/**

‎src/Bundle/JoseFramework/DependencyInjection/Source/Core/CoreSource.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\Core;
1515

16+
use Jose\Bundle\JoseFramework\DataCollector\JoseCollector;
1617
use Jose\Bundle\JoseFramework\DependencyInjection\Compiler;
1718
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
1819
use Jose\Component\Core\Converter\JsonConverter;
@@ -22,7 +23,7 @@
2223
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2324
use Symfony\Component\DependencyInjection\ContainerBuilder;
2425
use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
25-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2627

2728
class CoreSource implements SourceWithCompilerPasses
2829
{
@@ -39,20 +40,21 @@ public function name(): string
3940
*/
4041
public function load(array $config, ContainerBuilder $container)
4142
{
42-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
43-
$loader->load('services.yml');
43+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
44+
$loader->load('services.php');
4445

4546
if (interface_exists(EnvVarProcessorInterface::class)) {
46-
$loader->load('env_var.yml');
47+
$loader->load('env_var.php');
4748
}
4849

4950
if (true === $container->getParameter('kernel.debug')) {
50-
$loader->load('dev_services.yml');
51+
$container->registerForAutoconfiguration(JoseCollector::class)->addTag('jose.data_collector');
52+
$loader->load('dev_services.php');
5153
}
5254

5355
$container->setAlias(JsonConverter::class, $config['json_converter']);
5456
if (StandardConverter::class === $config['json_converter']) {
55-
$loader->load('json_converter.yml');
57+
$loader->load('json_converter.php');
5658
}
5759
}
5860

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Config\FileLocator;
2323
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2424
use Symfony\Component\DependencyInjection\ContainerBuilder;
25-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
25+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2626

2727
class EncryptionSource implements SourceWithCompilerPasses
2828
{
@@ -60,11 +60,12 @@ public function load(array $configs, ContainerBuilder $container)
6060
if (!$this->isEnabled()) {
6161
return;
6262
}
63-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
64-
$loader->load('jwe_services.yml');
65-
$loader->load('encryption_algorithms.yml');
66-
$loader->load('jwe_serializers.yml');
67-
$loader->load('compression_methods.yml');
63+
$container->registerForAutoconfiguration(\Jose\Component\Encryption\Serializer\JWESerializer::class)->addTag('jose.jwe.serializer');
64+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
65+
$loader->load('jwe_services.php');
66+
$loader->load('encryption_algorithms.php');
67+
$loader->load('jwe_serializers.php');
68+
$loader->load('compression_methods.php');
6869

6970
if (array_key_exists('jwe', $configs)) {
7071
foreach ($this->sources as $source) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
2121
use Symfony\Component\Config\FileLocator;
2222
use Symfony\Component\DependencyInjection\ContainerBuilder;
23-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
23+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2424

2525
class NestedToken implements Source
2626
{
@@ -56,8 +56,8 @@ public function load(array $configs, ContainerBuilder $container)
5656
if (!$this->isEnabled()) {
5757
return;
5858
}
59-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
60-
$loader->load('nested_token.yml');
59+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
60+
$loader->load('nested_token.php');
6161

6262
if (array_key_exists('nested_token', $configs)) {
6363
foreach ($this->sources as $source) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1919
use Symfony\Component\Config\FileLocator;
2020
use Symfony\Component\DependencyInjection\ContainerBuilder;
21-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2222

2323
class JKUSource implements Source
2424
{
@@ -36,10 +36,10 @@ public function name(): string
3636
public function load(array $configs, ContainerBuilder $container)
3737
{
3838
if (true === $configs[$this->name()]['enabled']) {
39-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
40-
$loader->load('jku_source.yml');
39+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
40+
$loader->load('jku_source.php');
4141
if (class_exists(JKULoaderCommand::class)) {
42-
$loader->load('jku_commands.yml');
42+
$loader->load('jku_commands.php');
4343
}
4444
$container->setAlias('jose.http_client', $configs[$this->name()]['client']);
4545
$container->setAlias('jose.request_factory', $configs[$this->name()]['request_factory']);

‎src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1919
use Symfony\Component\Config\FileLocator;
2020
use Symfony\Component\DependencyInjection\ContainerBuilder;
21-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2222

2323
class JWKSetSource implements Source
2424
{
@@ -99,8 +99,9 @@ private function getJWKSetSources(): array
9999

100100
// load bundled adapter factories
101101
$tempContainer = new ContainerBuilder();
102-
$loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
103-
$loader->load('jwkset_sources.yml');
102+
$tempContainer->registerForAutoconfiguration(JWKSetSourceInterface::class)->addTag('jose.jwkset_source');
103+
$loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104+
$loader->load('jwkset_sources.php');
104105

105106
$services = $tempContainer->findTaggedServiceIds('jose.jwkset_source');
106107
$jwkset_sources = [];

‎src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1919
use Symfony\Component\Config\FileLocator;
2020
use Symfony\Component\DependencyInjection\ContainerBuilder;
21-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2222

2323
class JWKSource implements Source
2424
{
@@ -99,8 +99,9 @@ private function getJWKSources(): array
9999

100100
// load bundled adapter factories
101101
$tempContainer = new ContainerBuilder();
102-
$loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
103-
$loader->load('jwk_sources.yml');
102+
$tempContainer->registerForAutoconfiguration(JWKSourceInterface::class)->addTag('jose.jwk_source');
103+
$loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104+
$loader->load('jwk_sources.php');
104105
$services = $tempContainer->findTaggedServiceIds('jose.jwk_source');
105106
$jwkSources = [];
106107
foreach (array_keys($services) as $id) {

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
1919
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
2020
use Jose\Component\KeyManagement\JWKFactory;
21+
use Jose\Component\KeyManagement\KeyAnalyzer\KeyAnalyzer;
2122
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
2223
use Symfony\Component\Config\FileLocator;
2324
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2425
use Symfony\Component\DependencyInjection\ContainerBuilder;
25-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2627

2728
class KeyManagementSource implements SourceWithCompilerPasses
2829
{
@@ -62,10 +63,11 @@ public function load(array $configs, ContainerBuilder $container)
6263
if (!$this->isEnabled()) {
6364
return;
6465
}
65-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
66-
$loader->load('analyzers.yml');
67-
$loader->load('jwk_factory.yml');
68-
$loader->load('jwk_services.yml');
66+
$container->registerForAutoconfiguration(KeyAnalyzer::class)->addTag('jose.key_analyzer');
67+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
68+
$loader->load('analyzers.php');
69+
$loader->load('jwk_factory.php');
70+
$loader->load('jwk_services.php');
6971

7072
foreach ($this->sources as $source) {
7173
$source->load($configs, $container);

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Config\FileLocator;
2323
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2424
use Symfony\Component\DependencyInjection\ContainerBuilder;
25-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
25+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2626

2727
class SignatureSource implements SourceWithCompilerPasses
2828
{
@@ -60,10 +60,11 @@ public function load(array $configs, ContainerBuilder $container)
6060
if (!$this->isEnabled()) {
6161
return;
6262
}
63-
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
64-
$loader->load('jws_services.yml');
65-
$loader->load('jws_serializers.yml');
66-
$loader->load('signature_algorithms.yml');
63+
$container->registerForAutoconfiguration(\Jose\Component\Signature\Serializer\JWSSerializer::class)->addTag('jose.jws.serializer');
64+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
65+
$loader->load('jws_services.php');
66+
$loader->load('jws_serializers.php');
67+
$loader->load('signature_algorithms.php');
6768

6869
if (array_key_exists('jws', $configs)) {
6970
foreach ($this->sources as $source) {

0 commit comments

Comments
 (0)