Skip to content

Commit 4917738

Browse files
SpomkySpomky
committed
Merge branch 'v1.1' of https://github.com/web-token/jwt-framework into v1.1
2 parents 5d8388d + dec5104 commit 4917738

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

+463
-791
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
use Symfony\Component\Config\FileLocator;
2424
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2525
use Symfony\Component\DependencyInjection\ContainerBuilder;
26-
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2727

2828
class CheckerSource implements SourceWithCompilerPasses
2929
{
@@ -60,8 +60,8 @@ public function load(array $configs, ContainerBuilder $container)
6060
return;
6161
}
6262
$container->registerForAutoconfiguration(TokenTypeSupport::class)->addTag('jose.checker.token_type');
63-
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
64-
$loader->load('checkers.php');
63+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
64+
$loader->load('checkers.yml');
6565

6666
if (array_key_exists('checkers', $configs)) {
6767
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\PhpFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
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 PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
42-
$loader->load('commands.php');
41+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
42+
$loader->load('commands.yml');
4343
}
4444

4545
/**

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2424
use Symfony\Component\DependencyInjection\ContainerBuilder;
2525
use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
26-
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2727

2828
class CoreSource implements SourceWithCompilerPasses
2929
{
@@ -40,21 +40,21 @@ public function name(): string
4040
*/
4141
public function load(array $config, ContainerBuilder $container)
4242
{
43-
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
44-
$loader->load('services.php');
43+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
44+
$loader->load('services.yml');
4545

4646
if (interface_exists(EnvVarProcessorInterface::class)) {
47-
$loader->load('env_var.php');
47+
$loader->load('env_var.yml');
4848
}
4949

5050
if (true === $container->getParameter('kernel.debug')) {
5151
$container->registerForAutoconfiguration(Collector::class)->addTag('jose.data_collector');
52-
$loader->load('dev_services.php');
52+
$loader->load('dev_services.yml');
5353
}
5454

5555
$container->setAlias(JsonConverter::class, $config['json_converter']);
5656
if (StandardConverter::class === $config['json_converter']) {
57-
$loader->load('json_converter.php');
57+
$loader->load('json_converter.yml');
5858
}
5959
}
6060

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

Lines changed: 6 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\PhpFileLoader;
25+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2626

2727
class EncryptionSource implements SourceWithCompilerPasses
2828
{
@@ -61,11 +61,11 @@ public function load(array $configs, ContainerBuilder $container)
6161
return;
6262
}
6363
$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');
64+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
65+
$loader->load('jwe_services.yml');
66+
$loader->load('encryption_algorithms.yml');
67+
$loader->load('jwe_serializers.yml');
68+
$loader->load('compression_methods.yml');
6969

7070
if (array_key_exists('jwe', $configs)) {
7171
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\PhpFileLoader;
23+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
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 PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
60-
$loader->load('nested_token.php');
59+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
60+
$loader->load('nested_token.yml');
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\PhpFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
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 PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
40-
$loader->load('jku_source.php');
39+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
40+
$loader->load('jku_source.yml');
4141
if (class_exists(JKULoaderCommand::class)) {
42-
$loader->load('jku_commands.php');
42+
$loader->load('jku_commands.yml');
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: 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\PhpFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2222

2323
class JWKSetSource implements Source
2424
{
@@ -100,8 +100,8 @@ private function getJWKSetSources(): array
100100
// load bundled adapter factories
101101
$tempContainer = new ContainerBuilder();
102102
$tempContainer->registerForAutoconfiguration(JWKSetSourceInterface::class)->addTag('jose.jwkset_source');
103-
$loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104-
$loader->load('jwkset_sources.php');
103+
$loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104+
$loader->load('jwkset_sources.yml');
105105

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

‎src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.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\PhpFileLoader;
21+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2222

2323
class JWKSource implements Source
2424
{
@@ -100,8 +100,8 @@ private function getJWKSources(): array
100100
// load bundled adapter factories
101101
$tempContainer = new ContainerBuilder();
102102
$tempContainer->registerForAutoconfiguration(JWKSourceInterface::class)->addTag('jose.jwk_source');
103-
$loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104-
$loader->load('jwk_sources.php');
103+
$loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config'));
104+
$loader->load('jwk_sources.yml');
105105
$services = $tempContainer->findTaggedServiceIds('jose.jwk_source');
106106
$jwkSources = [];
107107
foreach (array_keys($services) as $id) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
use Symfony\Component\Config\FileLocator;
2424
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2525
use Symfony\Component\DependencyInjection\ContainerBuilder;
26-
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2727

2828
class KeyManagementSource implements SourceWithCompilerPasses
2929
{
@@ -64,10 +64,10 @@ public function load(array $configs, ContainerBuilder $container)
6464
return;
6565
}
6666
$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');
67+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
68+
$loader->load('analyzers.yml');
69+
$loader->load('jwk_factory.yml');
70+
$loader->load('jwk_services.yml');
7171

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

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

Lines changed: 5 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\PhpFileLoader;
25+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2626

2727
class SignatureSource implements SourceWithCompilerPasses
2828
{
@@ -61,10 +61,10 @@ public function load(array $configs, ContainerBuilder $container)
6161
return;
6262
}
6363
$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');
64+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
65+
$loader->load('jws_services.yml');
66+
$loader->load('jws_serializers.yml');
67+
$loader->load('signature_algorithms.yml');
6868

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

0 commit comments

Comments
 (0)