Skip to content

Commit 368327b

Browse files
authored
Json converter (#167)
* JsonConverter ref removed * Useless default options removed
1 parent 55c351e commit 368327b

29 files changed

+67
-124
lines changed

src/Bundle/JoseFramework/Controller/JWKSetControllerFactory.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818

1919
class JWKSetControllerFactory
2020
{
21+
/**
22+
* @var JsonConverter|\Jose\Component\Core\Util\JsonConverter
23+
*/
2124
private $jsonConverter;
2225

23-
public function __construct(JsonConverter $jsonConverter)
26+
public function __construct(?JsonConverter $jsonConverter = null)
2427
{
25-
$this->jsonConverter = $jsonConverter;
28+
$this->jsonConverter = $jsonConverter ?? new \Jose\Component\Core\Util\JsonConverter();
2629
}
2730

2831
public function create(JWKSet $jwkset, int $maxAge): JWKSetController

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
1919
use Jose\Component\Core\Converter\JsonConverter;
2020
use Jose\Component\Core\Converter\StandardConverter;
21+
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
2122
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
2223
use Symfony\Component\Config\FileLocator;
2324
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -46,19 +47,23 @@ public function load(array $config, ContainerBuilder $container)
4647
$loader->load('dev_services.yml');
4748
}
4849

49-
$container->setAlias(JsonConverter::class, $config['json_converter']);
50+
if (null !== $config['json_converter']) {
51+
$container->setAlias(JsonConverter::class, $config['json_converter']);
52+
}
5053
if (StandardConverter::class === $config['json_converter']) {
5154
$loader->load('json_converter.yml');
5255
}
5356
}
5457

5558
public function getNodeDefinition(NodeDefinition $node)
5659
{
60+
/* @var ArrayNodeDefinition $node */
5761
$node
5862
->children()
5963
->scalarNode('json_converter')
60-
->defaultValue(StandardConverter::class)
64+
->defaultNull()
6165
->info('Converter used to encode and decode JSON objects (JWT payloads, keys, key sets...).')
66+
->setDeprecated('This option is deprecated in v1.3 and will be removed in v2.0.')
6267
->end()
6368
->end();
6469
}

src/Bundle/JoseFramework/Resources/config/jku_source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ services:
77
Jose\Component\KeyManagement\JKUFactory:
88
public: true
99
arguments:
10-
- '@Jose\Component\Core\Converter\JsonConverter'
10+
- null
1111
- '@jose.http_client'
1212
- '@jose.request_factory'
1313

1414
Jose\Component\KeyManagement\X5UFactory:
1515
public: true
1616
arguments:
17-
- '@Jose\Component\Core\Converter\JsonConverter'
17+
- null
1818
- '@jose.http_client'
1919
- '@jose.request_factory'

src/Bundle/JoseFramework/Tests/TestBundle/Converter/CustomJsonConverter.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/Bundle/JoseFramework/Tests/TestBundle/Resources/config/services.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ services:
44
autoconfigure: true
55
public: true
66

7-
Jose\Bundle\JoseFramework\Tests\TestBundle\Converter\CustomJsonConverter: ~
87
Jose\Bundle\JoseFramework\Tests\TestBundle\Checker\CustomChecker:
98
public: false
109
tags:

src/Bundle/JoseFramework/Tests/config/config_test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ services:
2020
Jose\Bundle\JoseFramework\Tests\TestBundle\MessageFactory: ~
2121

2222
jose:
23-
json_converter: 'Jose\Bundle\JoseFramework\Tests\TestBundle\Converter\CustomJsonConverter'
2423
jku_factory:
2524
enabled: true
2625
client: 'httplug.client.mock'

src/Component/Console/AddKeyIntoKeysetCommand.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222

2323
final class AddKeyIntoKeysetCommand extends ObjectOutputCommand
2424
{
25-
/**
26-
* KeyAnalyzerCommand constructor.
27-
*/
28-
public function __construct(JsonConverter $jsonConverter, string $name = null)
25+
public function __construct(?JsonConverter $jsonConverter, string $name = null)
2926
{
3027
parent::__construct($jsonConverter, $name);
3128
}

src/Component/Console/JKULoaderCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class JKULoaderCommand extends ObjectOutputCommand
2929
/**
3030
* JKULoaderCommand constructor.
3131
*/
32-
public function __construct(JKUFactory $jkuFactory, JsonConverter $jsonConverter, ?string $name = null)
32+
public function __construct(JKUFactory $jkuFactory, ?JsonConverter $jsonConverter, ?string $name = null)
3333
{
3434
$this->jkuFactory = $jkuFactory;
3535
parent::__construct($jsonConverter, $name);

src/Component/Console/KeyAnalyzerCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ final class KeyAnalyzerCommand extends Command
3030
private $analyzerManager;
3131

3232
/**
33-
* @var JsonConverter
33+
* @var JsonConverter|\Jose\Component\Core\Util\JsonConverter|null
3434
*/
3535
private $jsonConverter;
3636

3737
/**
3838
* KeyAnalyzerCommand constructor.
3939
*/
40-
public function __construct(KeyAnalyzerManager $analyzerManager, JsonConverter $jsonConverter, string $name = null)
40+
public function __construct(KeyAnalyzerManager $analyzerManager, ?JsonConverter $jsonConverter, string $name = null)
4141
{
4242
parent::__construct($name);
4343
$this->analyzerManager = $analyzerManager;
44-
$this->jsonConverter = $jsonConverter;
44+
$this->jsonConverter = $jsonConverter ?? new \Jose\Component\Core\Util\JsonConverter();
4545
}
4646

4747
protected function configure()

src/Component/Console/KeysetAnalyzerCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ final class KeysetAnalyzerCommand extends Command
3030
private $analyzerManager;
3131

3232
/**
33-
* @var JsonConverter
33+
* @var JsonConverter|\Jose\Component\Core\Util\JsonConverter|null
3434
*/
3535
private $jsonConverter;
3636

3737
/**
3838
* KeyAnalyzerCommand constructor.
3939
*/
40-
public function __construct(KeyAnalyzerManager $analyzerManager, JsonConverter $jsonConverter, string $name = null)
40+
public function __construct(KeyAnalyzerManager $analyzerManager, ?JsonConverter $jsonConverter, string $name = null)
4141
{
4242
parent::__construct($name);
4343
$this->analyzerManager = $analyzerManager;
44-
$this->jsonConverter = $jsonConverter;
44+
$this->jsonConverter = $jsonConverter ?? new \Jose\Component\Core\Util\JsonConverter();
4545
}
4646

4747
protected function configure()

0 commit comments

Comments
 (0)