From 835cfd78b4484ac8e181ca7bfc5df35329a7db85 Mon Sep 17 00:00:00 2001 From: Spomky Date: Wed, 14 Mar 2018 12:56:47 +0100 Subject: [PATCH 1/2] YamlFileLoader => PhpFileLoader --- .../Source/Checker/CheckerSource.php | 8 +- .../Source/Console/ConsoleSource.php | 6 +- .../Source/Core/CoreSource.php | 14 +-- .../Source/Encryption/EncryptionSource.php | 13 +-- .../Source/Encryption/NestedToken.php | 6 +- .../Source/KeyManagement/JKUSource.php | 8 +- .../Source/KeyManagement/JWKSetSource.php | 7 +- .../Source/KeyManagement/JWKSource.php | 7 +- .../KeyManagement/KeyManagementSource.php | 12 ++- .../Source/Signature/SignatureSource.php | 11 ++- .../Resources/config/analyzers.php | 37 +++++++ .../Resources/config/analyzers.yml | 31 ------ .../Resources/config/checkers.php | 41 ++++++++ .../Resources/config/checkers.yml | 23 ----- .../Resources/config/commands.php | 46 +++++++++ .../Resources/config/commands.yml | 97 ------------------- .../Resources/config/compression_methods.php | 35 +++++++ .../Resources/config/compression_methods.yml | 15 --- .../Resources/config/dev_services.php | 37 +++++++ .../Resources/config/dev_services.yml | 28 ------ .../config/encryption_algorithms.php | 79 +++++++++++++++ .../config/encryption_algorithms.yml | 82 ---------------- .../Resources/config/env_var.php | 26 +++++ .../Resources/config/env_var.yml | 9 -- .../Resources/config/jku_commands.php | 26 +++++ .../Resources/config/jku_commands.yml | 13 --- .../Resources/config/jku_source.php | 39 ++++++++ .../Resources/config/jku_source.yml | 16 --- .../Resources/config/json_converter.php | 24 +++++ .../Resources/config/json_converter.yml | 7 -- .../Resources/config/jwe_serializers.php | 33 +++++++ .../Resources/config/jwe_serializers.yml | 16 --- .../Resources/config/jwe_services.php | 34 +++++++ .../Resources/config/jwe_services.yml | 20 ---- .../Resources/config/jwk_factory.php | 26 +++++ .../Resources/config/jwk_factory.yml | 7 -- .../Resources/config/jwk_services.php | 27 ++++++ .../Resources/config/jwk_services.yml | 10 -- .../Resources/config/jwk_sources.php | 50 ++++++++++ .../Resources/config/jwk_sources.yml | 36 ------- .../Resources/config/jwkset_sources.php | 35 +++++++ .../Resources/config/jwkset_sources.yml | 16 --- .../Resources/config/jws_serializers.php | 31 ++++++ .../Resources/config/jws_serializers.yml | 16 --- .../Resources/config/jws_services.php | 30 ++++++ .../Resources/config/jws_services.yml | 18 ---- .../Resources/config/nested_token.php | 28 ++++++ .../Resources/config/nested_token.yml | 8 -- .../Resources/config/services.php | 24 +++++ .../Resources/config/services.yml | 7 -- .../Resources/config/signature_algorithms.php | 57 +++++++++++ .../Resources/config/signature_algorithms.yml | 53 ---------- 52 files changed, 816 insertions(+), 569 deletions(-) create mode 100644 src/Bundle/JoseFramework/Resources/config/analyzers.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/analyzers.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/checkers.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/checkers.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/commands.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/commands.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/compression_methods.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/compression_methods.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/dev_services.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/dev_services.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/encryption_algorithms.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/env_var.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/env_var.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jku_commands.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jku_commands.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jku_source.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jku_source.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/json_converter.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/json_converter.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwe_serializers.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwe_serializers.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwe_services.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwe_services.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_factory.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_factory.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_services.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_services.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_sources.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwk_sources.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jwkset_sources.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jwkset_sources.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jws_serializers.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jws_serializers.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/jws_services.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/jws_services.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/nested_token.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/nested_token.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/services.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/services.yml create mode 100644 src/Bundle/JoseFramework/Resources/config/signature_algorithms.php delete mode 100644 src/Bundle/JoseFramework/Resources/config/signature_algorithms.yml diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/CheckerSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/CheckerSource.php index 23aca042..3a1099b5 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/CheckerSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Checker/CheckerSource.php @@ -18,11 +18,12 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses; use Jose\Component\Checker\ClaimCheckerManagerFactory; use Jose\Component\Checker\HeaderCheckerManagerFactory; +use Jose\Component\Checker\TokenTypeSupport; use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class CheckerSource implements SourceWithCompilerPasses { @@ -58,8 +59,9 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('checkers.yml'); + $container->registerForAutoconfiguration(TokenTypeSupport::class)->addTag('jose.checker.token_type'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('checkers.php'); if (array_key_exists('checkers', $configs)) { foreach ($this->sources as $source) { diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Console/ConsoleSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Console/ConsoleSource.php index 7637c93c..872c4c4b 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Console/ConsoleSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Console/ConsoleSource.php @@ -18,7 +18,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class ConsoleSource implements Source { @@ -38,8 +38,8 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('commands.yml'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('commands.php'); } /** diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Core/CoreSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Core/CoreSource.php index 16153654..644afb2a 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Core/CoreSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Core/CoreSource.php @@ -13,6 +13,7 @@ namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\Core; +use Jose\Bundle\JoseFramework\DataCollector\JoseCollector; use Jose\Bundle\JoseFramework\DependencyInjection\Compiler; use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses; use Jose\Component\Core\Converter\JsonConverter; @@ -22,7 +23,7 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\EnvVarProcessorInterface; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class CoreSource implements SourceWithCompilerPasses { @@ -39,20 +40,21 @@ public function name(): string */ public function load(array $config, ContainerBuilder $container) { - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('services.yml'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('services.php'); if (interface_exists(EnvVarProcessorInterface::class)) { - $loader->load('env_var.yml'); + $loader->load('env_var.php'); } if (true === $container->getParameter('kernel.debug')) { - $loader->load('dev_services.yml'); + $container->registerForAutoconfiguration(JoseCollector::class)->addTag('jose.data_collector'); + $loader->load('dev_services.php'); } $container->setAlias(JsonConverter::class, $config['json_converter']); if (StandardConverter::class === $config['json_converter']) { - $loader->load('json_converter.yml'); + $loader->load('json_converter.php'); } } diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/EncryptionSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/EncryptionSource.php index 4ac966d2..17ec84c8 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/EncryptionSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/EncryptionSource.php @@ -22,7 +22,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class EncryptionSource implements SourceWithCompilerPasses { @@ -60,11 +60,12 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('jwe_services.yml'); - $loader->load('encryption_algorithms.yml'); - $loader->load('jwe_serializers.yml'); - $loader->load('compression_methods.yml'); + $container->registerForAutoconfiguration(\Jose\Component\Encryption\Serializer\JWESerializer::class)->addTag('jose.jwe.serializer'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('jwe_services.php'); + $loader->load('encryption_algorithms.php'); + $loader->load('jwe_serializers.php'); + $loader->load('compression_methods.php'); if (array_key_exists('jwe', $configs)) { foreach ($this->sources as $source) { diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/NestedToken.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/NestedToken.php index c4f5693d..341c9892 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/NestedToken.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/NestedToken.php @@ -20,7 +20,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class NestedToken implements Source { @@ -56,8 +56,8 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('nested_token.yml'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('nested_token.php'); if (array_key_exists('nested_token', $configs)) { foreach ($this->sources as $source) { diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JKUSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JKUSource.php index 7490c343..09fcf5b0 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JKUSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JKUSource.php @@ -18,7 +18,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class JKUSource implements Source { @@ -36,10 +36,10 @@ public function name(): string public function load(array $configs, ContainerBuilder $container) { if (true === $configs[$this->name()]['enabled']) { - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('jku_source.yml'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('jku_source.php'); if (class_exists(JKULoaderCommand::class)) { - $loader->load('jku_commands.yml'); + $loader->load('jku_commands.php'); } $container->setAlias('jose.http_client', $configs[$this->name()]['client']); $container->setAlias('jose.request_factory', $configs[$this->name()]['request_factory']); diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php index ada9849c..606a088f 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php @@ -18,7 +18,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class JWKSetSource implements Source { @@ -99,8 +99,9 @@ private function getJWKSetSources(): array // load bundled adapter factories $tempContainer = new ContainerBuilder(); - $loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('jwkset_sources.yml'); + $tempContainer->registerForAutoconfiguration(JWKSetSourceInterface::class)->addTag('jose.jwkset_source'); + $loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('jwkset_sources.php'); $services = $tempContainer->findTaggedServiceIds('jose.jwkset_source'); $jwkset_sources = []; diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php index 1ddcbf3c..c35f4f00 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php @@ -18,7 +18,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class JWKSource implements Source { @@ -99,8 +99,9 @@ private function getJWKSources(): array // load bundled adapter factories $tempContainer = new ContainerBuilder(); - $loader = new YamlFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('jwk_sources.yml'); + $tempContainer->registerForAutoconfiguration(JWKSourceInterface::class)->addTag('jose.jwk_source'); + $loader = new PhpFileLoader($tempContainer, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('jwk_sources.php'); $services = $tempContainer->findTaggedServiceIds('jose.jwk_source'); $jwkSources = []; foreach (array_keys($services) as $id) { diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/KeyManagementSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/KeyManagementSource.php index 71985bb4..79721621 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/KeyManagementSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/KeyManagementSource.php @@ -18,11 +18,12 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source; use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses; use Jose\Component\KeyManagement\JWKFactory; +use Jose\Component\KeyManagement\KeyAnalyzer\KeyAnalyzer; use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class KeyManagementSource implements SourceWithCompilerPasses { @@ -62,10 +63,11 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('analyzers.yml'); - $loader->load('jwk_factory.yml'); - $loader->load('jwk_services.yml'); + $container->registerForAutoconfiguration(KeyAnalyzer::class)->addTag('jose.key_analyzer'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('analyzers.php'); + $loader->load('jwk_factory.php'); + $loader->load('jwk_services.php'); foreach ($this->sources as $source) { $source->load($configs, $container); diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/SignatureSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/SignatureSource.php index 0b2a4e2f..5b449020 100644 --- a/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/SignatureSource.php +++ b/src/Bundle/JoseFramework/DependencyInjection/Source/Signature/SignatureSource.php @@ -22,7 +22,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; class SignatureSource implements SourceWithCompilerPasses { @@ -60,10 +60,11 @@ public function load(array $configs, ContainerBuilder $container) if (!$this->isEnabled()) { return; } - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); - $loader->load('jws_services.yml'); - $loader->load('jws_serializers.yml'); - $loader->load('signature_algorithms.yml'); + $container->registerForAutoconfiguration(\Jose\Component\Signature\Serializer\JWSSerializer::class)->addTag('jose.jws.serializer'); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config')); + $loader->load('jws_services.php'); + $loader->load('jws_serializers.php'); + $loader->load('signature_algorithms.php'); if (array_key_exists('jws', $configs)) { foreach ($this->sources as $source) { diff --git a/src/Bundle/JoseFramework/Resources/config/analyzers.php b/src/Bundle/JoseFramework/Resources/config/analyzers.php new file mode 100644 index 00000000..7dbf604e --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/analyzers.php @@ -0,0 +1,37 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(KeyAnalyzerManager::class); + $container->set(AlgorithmAnalyzer::class); + $container->set(UsageAnalyzer::class); + $container->set(KeyIdentifierAnalyzer::class); + $container->set(NoneAnalyzer::class); + $container->set(OctAnalyzer::class); + $container->set(RsaAnalyzer::class); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/analyzers.yml b/src/Bundle/JoseFramework/Resources/config/analyzers.yml deleted file mode 100644 index 407417b0..00000000 --- a/src/Bundle/JoseFramework/Resources/config/analyzers.yml +++ /dev/null @@ -1,31 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\KeyManagement\KeyAnalyzer\KeyAnalyzerManager: ~ - - Jose\Component\KeyManagement\KeyAnalyzer\AlgorithmAnalyzer: - tags: - - { name: 'jose.key_analyzer' } - - Jose\Component\KeyManagement\KeyAnalyzer\UsageAnalyzer: - tags: - - { name: 'jose.key_analyzer' } - - Jose\Component\KeyManagement\KeyAnalyzer\KeyIdentifierAnalyzer: - tags: - - { name: 'jose.key_analyzer' } - - Jose\Component\KeyManagement\KeyAnalyzer\NoneAnalyzer: - tags: - - { name: 'jose.key_analyzer' } - - Jose\Component\KeyManagement\KeyAnalyzer\OctAnalyzer: - tags: - - { name: 'jose.key_analyzer' } - - Jose\Component\KeyManagement\KeyAnalyzer\RsaAnalyzer: - tags: - - { name: 'jose.key_analyzer' } diff --git a/src/Bundle/JoseFramework/Resources/config/checkers.php b/src/Bundle/JoseFramework/Resources/config/checkers.php new file mode 100644 index 00000000..082871a6 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/checkers.php @@ -0,0 +1,41 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(HeaderCheckerManagerFactory::class) + ->public(); + $container->set(ClaimCheckerManagerFactory::class) + ->public(); + + $container->set(ExpirationTimeChecker::class) + ->tag('jose.checker.claim', ['alias' => 'exp']); + + $container->set(IssuedAtChecker::class) + ->tag('jose.checker.claim', ['alias' => 'iat']); + + $container->set(NotBeforeChecker::class) + ->tag('jose.checker.claim', ['alias' => 'nbf']); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/checkers.yml b/src/Bundle/JoseFramework/Resources/config/checkers.yml deleted file mode 100644 index d692409e..00000000 --- a/src/Bundle/JoseFramework/Resources/config/checkers.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Checker\HeaderCheckerManagerFactory: - public: true - - Jose\Component\Checker\ClaimCheckerManagerFactory: - public: true - - Jose\Component\Checker\ExpirationTimeChecker: - tags: - - { name: 'jose.checker.claim', alias: 'exp' } - - Jose\Component\Checker\IssuedAtChecker: - tags: - - { name: 'jose.checker.claim', alias: 'iat' } - - Jose\Component\Checker\NotBeforeChecker: - tags: - - { name: 'jose.checker.claim', alias: 'nbf' } diff --git a/src/Bundle/JoseFramework/Resources/config/commands.php b/src/Bundle/JoseFramework/Resources/config/commands.php new file mode 100644 index 00000000..2222a641 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/commands.php @@ -0,0 +1,46 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(Console\EcKeyGeneratorCommand::class); + $container->set(Console\EcKeysetGeneratorCommand::class); + $container->set(Console\OctKeyGeneratorCommand::class); + $container->set(Console\OctKeysetGeneratorCommand::class); + $container->set(Console\OkpKeyGeneratorCommand::class); + $container->set(Console\OkpKeysetGeneratorCommand::class); + $container->set(Console\RsaKeyGeneratorCommand::class); + $container->set(Console\RsaKeysetGeneratorCommand::class); + $container->set(Console\NoneKeyGeneratorCommand::class); + $container->set(Console\SecretKeyGeneratorCommand::class); + $container->set(Console\KeyFileLoaderCommand::class); + $container->set(Console\P12CertificateLoaderCommand::class); + $container->set(Console\X509CertificateLoaderCommand::class); + $container->set(Console\OptimizeRsaKeyCommand::class); + $container->set(Console\KeyAnalyzerCommand::class); + $container->set(Console\KeysetAnalyzerCommand::class); + $container->set(Console\PublicKeyCommand::class); + $container->set(Console\PublicKeysetCommand::class); + $container->set(Console\MergeKeysetCommand::class); + $container->set(Console\RotateKeysetCommand::class); + $container->set(Console\AddKeyIntoKeysetCommand::class); + $container->set(Console\PemConverterCommand::class); + $container->set(Console\GetThumbprintCommand::class); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/commands.yml b/src/Bundle/JoseFramework/Resources/config/commands.yml deleted file mode 100644 index 48ed3a19..00000000 --- a/src/Bundle/JoseFramework/Resources/config/commands.yml +++ /dev/null @@ -1,97 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Console\EcKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\EcKeysetGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\OctKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\OctKeysetGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\OkpKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\OkpKeysetGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\RsaKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\RsaKeysetGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\NoneKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\SecretKeyGeneratorCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\KeyFileLoaderCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\P12CertificateLoaderCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\X509CertificateLoaderCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\OptimizeRsaKeyCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\KeyAnalyzerCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\KeysetAnalyzerCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\PublicKeyCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\PublicKeysetCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\MergeKeysetCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\RotateKeysetCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\AddKeyIntoKeysetCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\PemConverterCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\GetThumbprintCommand: - tags: - - {name: 'console.command'} diff --git a/src/Bundle/JoseFramework/Resources/config/compression_methods.php b/src/Bundle/JoseFramework/Resources/config/compression_methods.php new file mode 100644 index 00000000..da82a734 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/compression_methods.php @@ -0,0 +1,35 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(CompressionMethodManagerFactory::class) + ->public(); + + $container->set(Deflate::class) + ->tag('jose.compression_method', ['alias' => 'DEF']); + $container->set(GZip::class) + ->tag('jose.compression_method', ['alias' => 'GZ']); + $container->set(ZLib::class) + ->tag('jose.compression_method', ['alias' => 'ZLIB']); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/compression_methods.yml b/src/Bundle/JoseFramework/Resources/config/compression_methods.yml deleted file mode 100644 index 5ccc9079..00000000 --- a/src/Bundle/JoseFramework/Resources/config/compression_methods.yml +++ /dev/null @@ -1,15 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Encryption\Compression\Deflate: - tags: - - {'name': 'jose.compression_method', 'alias': 'DEF'} - Jose\Component\Encryption\Compression\GZip: - tags: - - {'name': 'jose.compression_method', 'alias': 'GZ'} - Jose\Component\Encryption\Compression\ZLib: - tags: - - {'name': 'jose.compression_method', 'alias': 'ZLIB'} diff --git a/src/Bundle/JoseFramework/Resources/config/dev_services.php b/src/Bundle/JoseFramework/Resources/config/dev_services.php new file mode 100644 index 00000000..0a23e2e3 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/dev_services.php @@ -0,0 +1,37 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + + $container->set(DataCollector\JoseCollector::class) + ->tag('data_collector', [ + 'template' => '@JoseFramework/data_collector/template.html.twig', + 'id' => 'jose_collector', + ]); + + $container->set(DataCollector\AlgorithmCollector::class); + $container->set(DataCollector\CheckerCollector::class); + $container->set(DataCollector\JWECollector::class); + $container->set(DataCollector\JWSCollector::class); + $container->set(DataCollector\KeyCollector::class); + +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/dev_services.yml b/src/Bundle/JoseFramework/Resources/config/dev_services.yml deleted file mode 100644 index 17d1847c..00000000 --- a/src/Bundle/JoseFramework/Resources/config/dev_services.yml +++ /dev/null @@ -1,28 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Bundle\JoseFramework\DataCollector\JoseCollector: - tags: - - - name: 'data_collector' - template: '@JoseFramework/data_collector/template.html.twig' - id: 'jose_collector' - - Jose\Bundle\JoseFramework\DataCollector\AlgorithmCollector: - tags: - - {name: 'jose.data_collector'} - Jose\Bundle\JoseFramework\DataCollector\CheckerCollector: - tags: - - {name: 'jose.data_collector'} - Jose\Bundle\JoseFramework\DataCollector\JWECollector: - tags: - - {name: 'jose.data_collector'} - Jose\Bundle\JoseFramework\DataCollector\JWSCollector: - tags: - - {name: 'jose.data_collector'} - Jose\Bundle\JoseFramework\DataCollector\KeyCollector: - tags: - - {name: 'jose.data_collector'} diff --git a/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php b/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php new file mode 100644 index 00000000..7183e2fe --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php @@ -0,0 +1,79 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(ContentEncryption\A128CBCHS256::class) + ->tag('jose.algorithm', ['alias' => 'A128CBC-HS256']); + $container->set(ContentEncryption\A192CBCHS384::class) + ->tag('jose.algorithm', ['alias' => 'A192CBC-HS384']); + $container->set(ContentEncryption\A256CBCHS512::class) + ->tag('jose.algorithm', ['alias' => 'A256CBC-HS512']); + + $container->set(ContentEncryption\A128GCM::class) + ->tag('jose.algorithm', ['alias' => 'A128GCM']); + $container->set(ContentEncryption\A192GCM::class) + ->tag('jose.algorithm', ['alias' => 'A192GCM']); + $container->set(ContentEncryption\A256GCM::class) + ->tag('jose.algorithm', ['alias' => 'A256GCM']); + + $container->set(KeyEncryption\A128GCMKW::class) + ->tag('jose.algorithm', ['alias' => 'A128GCMKW']); + $container->set(KeyEncryption\A192GCMKW::class) + ->tag('jose.algorithm', ['alias' => 'A192GCMKW']); + $container->set(KeyEncryption\A256GCMKW::class) + ->tag('jose.algorithm', ['alias' => 'A256GCMKW']); + + $container->set(KeyEncryption\Dir::class) + ->tag('jose.algorithm', ['alias' => 'dir']); + + $container->set(KeyEncryption\ECDHES::class) + ->tag('jose.algorithm', ['alias' => 'ECDH-ES']); + $container->set(KeyEncryption\ECDHESA128KW::class) + ->tag('jose.algorithm', ['alias' => 'ECDH-ES+A128KW']); + $container->set(KeyEncryption\ECDHESA192KW::class) + ->tag('jose.algorithm', ['alias' => 'ECDH-ES+A192KW']); + $container->set(KeyEncryption\ECDHESA256KW::class) + ->tag('jose.algorithm', ['alias' => 'ECDH-ES+A256KW']); + + $container->set(KeyEncryption\A128KW::class) + ->tag('jose.algorithm', ['alias' => 'A128KW']); + $container->set(KeyEncryption\A192KW::class) + ->tag('jose.algorithm', ['alias' => 'A192KW']); + $container->set(KeyEncryption\A256KW::class) + ->tag('jose.algorithm', ['alias' => 'A256KW']); + + $container->set(KeyEncryption\PBES2HS256A128KW::class) + ->tag('jose.algorithm', ['alias' => 'PBES2-HS256+A128KW']); + $container->set(KeyEncryption\PBES2HS384A192KW::class) + ->tag('jose.algorithm', ['alias' => 'PBES2-HS384+A192KW']); + $container->set(KeyEncryption\PBES2HS512A256KW::class) + ->tag('jose.algorithm', ['alias' => 'PBES2-HS512+A256KW']); + + $container->set(KeyEncryption\RSA15::class) + ->tag('jose.algorithm', ['alias' => 'RSA1_5']); + $container->set(KeyEncryption\RSAOAEP::class) + ->tag('jose.algorithm', ['alias' => 'RSA-OAEP']); + $container->set(KeyEncryption\RSAOAEP256::class) + ->tag('jose.algorithm', ['alias' => 'RSA-OAEP-256']); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.yml b/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.yml deleted file mode 100644 index dd4a29b9..00000000 --- a/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.yml +++ /dev/null @@ -1,82 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Encryption\Algorithm\ContentEncryption\A128CBCHS256: - tags: - - {'name': 'jose.algorithm', 'alias': 'A128CBC-HS256'} - Jose\Component\Encryption\Algorithm\ContentEncryption\A192CBCHS384: - tags: - - {'name': 'jose.algorithm', 'alias': 'A192CBC-HS384'} - Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512: - tags: - - {'name': 'jose.algorithm', 'alias': 'A256CBC-HS512'} - - Jose\Component\Encryption\Algorithm\ContentEncryption\A128GCM: - tags: - - {'name': 'jose.algorithm', 'alias': 'A128GCM'} - Jose\Component\Encryption\Algorithm\ContentEncryption\A192GCM: - tags: - - {'name': 'jose.algorithm', 'alias': 'A192GCM'} - Jose\Component\Encryption\Algorithm\ContentEncryption\A256GCM: - tags: - - {'name': 'jose.algorithm', 'alias': 'A256GCM'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\A128GCMKW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A128GCMKW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\A192GCMKW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A192GCMKW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\A256GCMKW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A256GCMKW'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\Dir: - tags: - - {'name': 'jose.algorithm', 'alias': 'dir'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHES: - tags: - - {'name': 'jose.algorithm', 'alias': 'ECDH-ES'} - Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA128KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'ECDH-ES+A128KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA192KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'ECDH-ES+A192KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA256KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'ECDH-ES+A256KW'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\A128KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A128KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\A192KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A192KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\A256KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'A256KW'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS256A128KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'PBES2-HS256+A128KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS384A192KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'PBES2-HS384+A192KW'} - Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS512A256KW: - tags: - - {'name': 'jose.algorithm', 'alias': 'PBES2-HS512+A256KW'} - - Jose\Component\Encryption\Algorithm\KeyEncryption\RSA15: - tags: - - {'name': 'jose.algorithm', 'alias': 'RSA1_5'} - Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP: - tags: - - {'name': 'jose.algorithm', 'alias': 'RSA-OAEP'} - Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP256: - tags: - - {'name': 'jose.algorithm', 'alias': 'RSA-OAEP-256'} diff --git a/src/Bundle/JoseFramework/Resources/config/env_var.php b/src/Bundle/JoseFramework/Resources/config/env_var.php new file mode 100644 index 00000000..a4a0800d --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/env_var.php @@ -0,0 +1,26 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->load( + 'Jose\\Bundle\\JoseFramework\\EnvVarProcessor\\', + '../../EnvVarProcessor' + ); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/env_var.yml b/src/Bundle/JoseFramework/Resources/config/env_var.yml deleted file mode 100644 index 1fe4654e..00000000 --- a/src/Bundle/JoseFramework/Resources/config/env_var.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Bundle\JoseFramework\EnvVarProcessor\: - resource: '../../EnvVarProcessor' - tags: ['container.env_var_processor'] diff --git a/src/Bundle/JoseFramework/Resources/config/jku_commands.php b/src/Bundle/JoseFramework/Resources/config/jku_commands.php new file mode 100644 index 00000000..f6f09e39 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jku_commands.php @@ -0,0 +1,26 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JKULoaderCommand::class); + $container->set(X5ULoaderCommand::class); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/jku_commands.yml b/src/Bundle/JoseFramework/Resources/config/jku_commands.yml deleted file mode 100644 index d3a33780..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jku_commands.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Console\JKULoaderCommand: - tags: - - {name: 'console.command'} - - Jose\Component\Console\X5ULoaderCommand: - tags: - - {name: 'console.command'} diff --git a/src/Bundle/JoseFramework/Resources/config/jku_source.php b/src/Bundle/JoseFramework/Resources/config/jku_source.php new file mode 100644 index 00000000..e2b14948 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jku_source.php @@ -0,0 +1,39 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JKUFactory::class) + ->args([ + ref('Jose\Component\Core\Converter\JsonConverter'), + ref('jose.http_client'), + ref('jose.request_factory'), + ]) + ->public(); + $container->set(X5UFactory::class) + ->args([ + ref('Jose\Component\Core\Converter\JsonConverter'), + ref('jose.http_client'), + ref('jose.request_factory'), + ]) + ->public(); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/jku_source.yml b/src/Bundle/JoseFramework/Resources/config/jku_source.yml deleted file mode 100644 index 776ca20a..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jku_source.yml +++ /dev/null @@ -1,16 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\KeyManagement\JKUFactory: - arguments: - - '@Jose\Component\Core\Converter\JsonConverter' - - '@jose.http_client' - - '@jose.request_factory' - - Jose\Component\KeyManagement\X5UFactory: - - '@Jose\Component\Core\Converter\JsonConverter' - - '@jose.http_client' - - '@jose.request_factory' diff --git a/src/Bundle/JoseFramework/Resources/config/json_converter.php b/src/Bundle/JoseFramework/Resources/config/json_converter.php new file mode 100644 index 00000000..ab3cca8f --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/json_converter.php @@ -0,0 +1,24 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(StandardConverter::class); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/json_converter.yml b/src/Bundle/JoseFramework/Resources/config/json_converter.yml deleted file mode 100644 index 4907699d..00000000 --- a/src/Bundle/JoseFramework/Resources/config/json_converter.yml +++ /dev/null @@ -1,7 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Core\Converter\StandardConverter: ~ diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php b/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php new file mode 100644 index 00000000..efdf4e5d --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php @@ -0,0 +1,33 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JWESerializerManagerFactory::class) + ->public(); + $container->set(CompactSerializer::class); + $container->set(JSONFlattenedSerializer::class); + $container->set(JSONGeneralSerializer::class); +}; + + diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_serializers.yml b/src/Bundle/JoseFramework/Resources/config/jwe_serializers.yml deleted file mode 100644 index da78c445..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwe_serializers.yml +++ /dev/null @@ -1,16 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Encryption\Serializer\JWESerializerManagerFactory: ~ - Jose\Component\Encryption\Serializer\CompactSerializer: - tags: - - {'name': 'jose.jwe.serializer'} - Jose\Component\Encryption\Serializer\JSONFlattenedSerializer: - tags: - - {'name': 'jose.jwe.serializer'} - Jose\Component\Encryption\Serializer\JSONGeneralSerializer: - tags: - - {'name': 'jose.jwe.serializer'} diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_services.php b/src/Bundle/JoseFramework/Resources/config/jwe_services.php new file mode 100644 index 00000000..5512c4d7 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwe_services.php @@ -0,0 +1,34 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JWEBuilderFactory::class) + ->public(); + $container->set(JWEDecrypterFactory::class) + ->public(); + $container->set(JWELoaderFactory::class) + ->public(); + $container->set(JWETokenSupport::class); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_services.yml b/src/Bundle/JoseFramework/Resources/config/jwe_services.yml deleted file mode 100644 index bf4091cc..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwe_services.yml +++ /dev/null @@ -1,20 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Encryption\JWEBuilderFactory: - public: true - - Jose\Component\Encryption\JWEDecrypterFactory: - public: true - - Jose\Component\Encryption\JWELoaderFactory: - public: true - - Jose\Component\Encryption\Compression\CompressionMethodManagerFactory: ~ - - Jose\Component\Encryption\JWETokenSupport: - tags: - - {'name': 'jose.checker.token_type'} diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_factory.php b/src/Bundle/JoseFramework/Resources/config/jwk_factory.php new file mode 100644 index 00000000..d1bb0e2a --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwk_factory.php @@ -0,0 +1,26 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JWKFactory::class) + ->public(); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_factory.yml b/src/Bundle/JoseFramework/Resources/config/jwk_factory.yml deleted file mode 100644 index b1ee660d..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwk_factory.yml +++ /dev/null @@ -1,7 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\KeyManagement\JWKFactory: ~ diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_services.php b/src/Bundle/JoseFramework/Resources/config/jwk_services.php new file mode 100644 index 00000000..7f363df2 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwk_services.php @@ -0,0 +1,27 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(JWKSetControllerFactory::class); + $container->set(JWKSetLoader::class) + ->tag('routing.loader'); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_services.yml b/src/Bundle/JoseFramework/Resources/config/jwk_services.yml deleted file mode 100644 index 2223b492..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwk_services.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Bundle\JoseFramework\Controller\JWKSetControllerFactory: ~ - Jose\Bundle\JoseFramework\Routing\JWKSetLoader: - tags: - - {'name': 'routing.loader'} diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_sources.php b/src/Bundle/JoseFramework/Resources/config/jwk_sources.php new file mode 100644 index 00000000..a9b3c137 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwk_sources.php @@ -0,0 +1,50 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set('jose.jwk_source.keyfile') + ->class(JWKSource\KeyFile::class) + ->tag('jose.jwk_source' ); + + $container->set('jose.jwk_source.certificatefile') + ->class(JWKSource\CertificateFile::class) + ->tag('jose.jwk_source'); + + $container->set('jose.jwk_source.values') + ->class(JWKSource\Values::class) + ->tag('jose.jwk_source'); + + $container->set('jose.jwk_source.secret') + ->class(JWKSource\Secret::class) + ->tag('jose.jwk_source'); + + $container->set('jose.jwk_source.jwk') + ->class(JWKSource\JWK::class) + ->tag('jose.jwk_source'); + + $container->set('jose.jwk_source.x5c') + ->class(JWKSource\X5C::class) + ->tag('jose.jwk_source'); + + $container->set('jose.jwk_source.jwkset') + ->class(JWKSource\JWKSet::class) + ->tag('jose.jwk_source'); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_sources.yml b/src/Bundle/JoseFramework/Resources/config/jwk_sources.yml deleted file mode 100644 index dc66352a..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwk_sources.yml +++ /dev/null @@ -1,36 +0,0 @@ -services: - jose.jwk_source.keyfile: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\KeyFile' - tags: - - {'name': 'jose.jwk_source' } - jose.jwk_source.certificatefile: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\CertificateFile' - tags: - - {'name': 'jose.jwk_source'} - jose.jwk_source.values: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\Values' - tags: - - {'name': 'jose.jwk_source'} - jose.jwk_source.secret: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\Secret' - tags: - - {'name': 'jose.jwk_source'} - jose.jwk_source.jwk: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\JWK' - tags: - - {'name': 'jose.jwk_source'} - jose.jwk_source.x5c: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\X5C' - tags: - - {'name': 'jose.jwk_source'} - jose.jwk_source.jwkset: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource\JWKSet' - tags: - - {'name': 'jose.jwk_source'} diff --git a/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php b/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php new file mode 100644 index 00000000..06045164 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php @@ -0,0 +1,35 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set('jose.jwk_set_source.jwkset') + ->class(JWKSetSource\JWKSet::class) + ->tag('jose.jwkset_source'); + + $container->set('jose.jwk_set_source.jku') + ->class(JWKSetSource\JKU::class) + ->tag('jose.jwkset_source'); + + $container->set('jose.jwk_set_source.x5u') + ->class(JWKSetSource\X5U::class) + ->tag('jose.jwkset_source'); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/jwkset_sources.yml b/src/Bundle/JoseFramework/Resources/config/jwkset_sources.yml deleted file mode 100644 index 6a5ecb17..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jwkset_sources.yml +++ /dev/null @@ -1,16 +0,0 @@ -services: - jose.jwk_set_source.jwkset: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource\JWKSet' - tags: - - {'name': 'jose.jwkset_source'} - jose.jwk_set_source.jku: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource\JKU' - tags: - - {'name': 'jose.jwkset_source'} - jose.jwk_set_source.x5u: - public: false - class: 'Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource\X5U' - tags: - - {'name': 'jose.jwkset_source'} diff --git a/src/Bundle/JoseFramework/Resources/config/jws_serializers.php b/src/Bundle/JoseFramework/Resources/config/jws_serializers.php new file mode 100644 index 00000000..704ee9d9 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jws_serializers.php @@ -0,0 +1,31 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + + $container->set(Serializer\JWSSerializerManagerFactory::class) + ->public(); + + $container->set(Serializer\CompactSerializer::class); + $container->set(Serializer\JSONFlattenedSerializer::class); + $container->set(Serializer\JSONGeneralSerializer::class); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/jws_serializers.yml b/src/Bundle/JoseFramework/Resources/config/jws_serializers.yml deleted file mode 100644 index dab4d0e7..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jws_serializers.yml +++ /dev/null @@ -1,16 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Signature\Serializer\JWSSerializerManagerFactory: ~ - Jose\Component\Signature\Serializer\CompactSerializer: - tags: - - {'name': 'jose.jws.serializer'} - Jose\Component\Signature\Serializer\JSONFlattenedSerializer: - tags: - - {'name': 'jose.jws.serializer'} - Jose\Component\Signature\Serializer\JSONGeneralSerializer: - tags: - - {'name': 'jose.jws.serializer'} diff --git a/src/Bundle/JoseFramework/Resources/config/jws_services.php b/src/Bundle/JoseFramework/Resources/config/jws_services.php new file mode 100644 index 00000000..048d5c01 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/jws_services.php @@ -0,0 +1,30 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(Signature\JWSBuilderFactory::class) + ->public(); + $container->set(Signature\JWSVerifierFactory::class) + ->public(); + $container->set(Signature\JWSLoaderFactory::class) + ->public(); + $container->set(Signature\JWSTokenSupport::class); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/jws_services.yml b/src/Bundle/JoseFramework/Resources/config/jws_services.yml deleted file mode 100644 index 3f46f6c5..00000000 --- a/src/Bundle/JoseFramework/Resources/config/jws_services.yml +++ /dev/null @@ -1,18 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Signature\JWSBuilderFactory: - public: true - - Jose\Component\Signature\JWSVerifierFactory: - public: true - - Jose\Component\Signature\JWSLoaderFactory: - public: true - - Jose\Component\Signature\JWSTokenSupport: - tags: - - {'name': 'jose.checker.token_type'} diff --git a/src/Bundle/JoseFramework/Resources/config/nested_token.php b/src/Bundle/JoseFramework/Resources/config/nested_token.php new file mode 100644 index 00000000..c6cfc723 --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/nested_token.php @@ -0,0 +1,28 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(NestedTokenLoaderFactory::class) + ->public(); + $container->set(NestedTokenBuilderFactory::class) + ->public(); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/nested_token.yml b/src/Bundle/JoseFramework/Resources/config/nested_token.yml deleted file mode 100644 index 76b3d1f0..00000000 --- a/src/Bundle/JoseFramework/Resources/config/nested_token.yml +++ /dev/null @@ -1,8 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: true - - Jose\Component\Encryption\NestedTokenLoaderFactory: ~ - Jose\Component\Encryption\NestedTokenBuilderFactory: ~ diff --git a/src/Bundle/JoseFramework/Resources/config/services.php b/src/Bundle/JoseFramework/Resources/config/services.php new file mode 100644 index 00000000..e03da1af --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/services.php @@ -0,0 +1,24 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(AlgorithmManagerFactory::class); +}; diff --git a/src/Bundle/JoseFramework/Resources/config/services.yml b/src/Bundle/JoseFramework/Resources/config/services.yml deleted file mode 100644 index 423df508..00000000 --- a/src/Bundle/JoseFramework/Resources/config/services.yml +++ /dev/null @@ -1,7 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Core\AlgorithmManagerFactory: ~ diff --git a/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php b/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php new file mode 100644 index 00000000..10ca7bfb --- /dev/null +++ b/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php @@ -0,0 +1,57 @@ +services()->defaults() + ->private() + ->autoconfigure() + ->autowire(); + + $container->set(Algorithm\ES256::class) + ->tag('jose.algorithm', ['alias' => 'ES256']); + $container->set(Algorithm\ES384::class) + ->tag('jose.algorithm', ['alias' => 'ES384']); + $container->set(Algorithm\ES512::class) + ->tag('jose.algorithm', ['alias' => 'ES512']); + + $container->set(Algorithm\RS256::class) + ->tag('jose.algorithm', ['alias' => 'RS256']); + $container->set(Algorithm\RS384::class) + ->tag('jose.algorithm', ['alias' => 'RS384']); + $container->set(Algorithm\RS512::class) + ->tag('jose.algorithm', ['alias' => 'RS512']); + + $container->set(Algorithm\PS256::class) + ->tag('jose.algorithm', ['alias' => 'PS256']); + $container->set(Algorithm\PS384::class) + ->tag('jose.algorithm', ['alias' => 'PS384']); + $container->set(Algorithm\PS512::class) + ->tag('jose.algorithm', ['alias' => 'PS512']); + + $container->set(Algorithm\HS256::class) + ->tag('jose.algorithm', ['alias' => 'HS256']); + $container->set(Algorithm\HS384::class) + ->tag('jose.algorithm', ['alias' => 'HS384']); + $container->set(Algorithm\HS512::class) + ->tag('jose.algorithm', ['alias' => 'HS512']); + + $container->set(Algorithm\EdDSA::class) + ->tag('jose.algorithm', ['alias' => 'EdDSA']); + + $container->set(Algorithm\None::class) + ->tag('jose.algorithm', ['alias' => 'none']); +}; + diff --git a/src/Bundle/JoseFramework/Resources/config/signature_algorithms.yml b/src/Bundle/JoseFramework/Resources/config/signature_algorithms.yml deleted file mode 100644 index 617cdc53..00000000 --- a/src/Bundle/JoseFramework/Resources/config/signature_algorithms.yml +++ /dev/null @@ -1,53 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - Jose\Component\Signature\Algorithm\ES256: - tags: - - {'name': 'jose.algorithm', 'alias': 'ES256'} - Jose\Component\Signature\Algorithm\ES384: - tags: - - {'name': 'jose.algorithm', 'alias': 'ES384'} - Jose\Component\Signature\Algorithm\ES512: - tags: - - {'name': 'jose.algorithm', 'alias': 'ES512'} - - Jose\Component\Signature\Algorithm\RS256: - tags: - - {'name': 'jose.algorithm', 'alias': 'RS256'} - Jose\Component\Signature\Algorithm\RS384: - tags: - - {'name': 'jose.algorithm', 'alias': 'RS384'} - Jose\Component\Signature\Algorithm\RS512: - tags: - - {'name': 'jose.algorithm', 'alias': 'RS512'} - - Jose\Component\Signature\Algorithm\PS256: - tags: - - {'name': 'jose.algorithm', 'alias': 'PS256'} - Jose\Component\Signature\Algorithm\PS384: - tags: - - {'name': 'jose.algorithm', 'alias': 'PS384'} - Jose\Component\Signature\Algorithm\PS512: - tags: - - {'name': 'jose.algorithm', 'alias': 'PS512'} - - Jose\Component\Signature\Algorithm\HS256: - tags: - - {'name': 'jose.algorithm', 'alias': 'HS256'} - Jose\Component\Signature\Algorithm\HS384: - tags: - - {'name': 'jose.algorithm', 'alias': 'HS384'} - Jose\Component\Signature\Algorithm\HS512: - tags: - - {'name': 'jose.algorithm', 'alias': 'HS512'} - - Jose\Component\Signature\Algorithm\EdDSA: - tags: - - {'name': 'jose.algorithm', 'alias': 'EdDSA'} - - Jose\Component\Signature\Algorithm\None: - tags: - - {'name': 'jose.algorithm', 'alias': 'none'} From eb9189838b7be1667b90ae61af497b01b599d1a2 Mon Sep 17 00:00:00 2001 From: Spomky Date: Wed, 14 Mar 2018 12:57:57 +0100 Subject: [PATCH 2/2] Apply fixes from StyleCI (#103) [ci skip] [skip ci] --- src/Bundle/JoseFramework/Resources/config/analyzers.php | 9 ++++----- src/Bundle/JoseFramework/Resources/config/checkers.php | 7 +++---- src/Bundle/JoseFramework/Resources/config/commands.php | 4 ++-- .../Resources/config/compression_methods.php | 4 ++-- .../JoseFramework/Resources/config/dev_services.php | 7 ++----- .../Resources/config/encryption_algorithms.php | 6 ++---- src/Bundle/JoseFramework/Resources/config/env_var.php | 2 +- .../JoseFramework/Resources/config/jku_commands.php | 4 ++-- src/Bundle/JoseFramework/Resources/config/jku_source.php | 4 ++-- .../JoseFramework/Resources/config/json_converter.php | 4 ++-- .../JoseFramework/Resources/config/jwe_serializers.php | 8 +++----- .../JoseFramework/Resources/config/jwe_services.php | 5 ++--- .../JoseFramework/Resources/config/jwk_factory.php | 5 ++--- .../JoseFramework/Resources/config/jwk_services.php | 4 ++-- .../JoseFramework/Resources/config/jwk_sources.php | 6 +++--- .../JoseFramework/Resources/config/jwkset_sources.php | 5 ++--- .../JoseFramework/Resources/config/jws_serializers.php | 6 ++---- .../JoseFramework/Resources/config/jws_services.php | 4 ++-- .../JoseFramework/Resources/config/nested_token.php | 6 +++--- src/Bundle/JoseFramework/Resources/config/services.php | 4 ++-- .../Resources/config/signature_algorithms.php | 5 ++--- 21 files changed, 47 insertions(+), 62 deletions(-) diff --git a/src/Bundle/JoseFramework/Resources/config/analyzers.php b/src/Bundle/JoseFramework/Resources/config/analyzers.php index 7dbf604e..f413522b 100644 --- a/src/Bundle/JoseFramework/Resources/config/analyzers.php +++ b/src/Bundle/JoseFramework/Resources/config/analyzers.php @@ -5,20 +5,20 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -use Jose\Component\KeyManagement\KeyAnalyzer\KeyAnalyzerManager; use Jose\Component\KeyManagement\KeyAnalyzer\AlgorithmAnalyzer; -use Jose\Component\KeyManagement\KeyAnalyzer\UsageAnalyzer; +use Jose\Component\KeyManagement\KeyAnalyzer\KeyAnalyzerManager; use Jose\Component\KeyManagement\KeyAnalyzer\KeyIdentifierAnalyzer; use Jose\Component\KeyManagement\KeyAnalyzer\NoneAnalyzer; use Jose\Component\KeyManagement\KeyAnalyzer\OctAnalyzer; use Jose\Component\KeyManagement\KeyAnalyzer\RsaAnalyzer; +use Jose\Component\KeyManagement\KeyAnalyzer\UsageAnalyzer; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -34,4 +34,3 @@ $container->set(OctAnalyzer::class); $container->set(RsaAnalyzer::class); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/checkers.php b/src/Bundle/JoseFramework/Resources/config/checkers.php index 082871a6..74fb5aad 100644 --- a/src/Bundle/JoseFramework/Resources/config/checkers.php +++ b/src/Bundle/JoseFramework/Resources/config/checkers.php @@ -5,18 +5,18 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -use Jose\Component\Checker\HeaderCheckerManagerFactory; use Jose\Component\Checker\ClaimCheckerManagerFactory; use Jose\Component\Checker\ExpirationTimeChecker; +use Jose\Component\Checker\HeaderCheckerManagerFactory; use Jose\Component\Checker\IssuedAtChecker; use Jose\Component\Checker\NotBeforeChecker; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -38,4 +38,3 @@ $container->set(NotBeforeChecker::class) ->tag('jose.checker.claim', ['alias' => 'nbf']); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/commands.php b/src/Bundle/JoseFramework/Resources/config/commands.php index 2222a641..0e79fa72 100644 --- a/src/Bundle/JoseFramework/Resources/config/commands.php +++ b/src/Bundle/JoseFramework/Resources/config/commands.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Console; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/compression_methods.php b/src/Bundle/JoseFramework/Resources/config/compression_methods.php index da82a734..89bd35f1 100644 --- a/src/Bundle/JoseFramework/Resources/config/compression_methods.php +++ b/src/Bundle/JoseFramework/Resources/config/compression_methods.php @@ -5,17 +5,17 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Encryption\Compression\CompressionMethodManagerFactory; use Jose\Component\Encryption\Compression\Deflate; use Jose\Component\Encryption\Compression\GZip; use Jose\Component\Encryption\Compression\ZLib; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/dev_services.php b/src/Bundle/JoseFramework/Resources/config/dev_services.php index 0a23e2e3..a9f4de74 100644 --- a/src/Bundle/JoseFramework/Resources/config/dev_services.php +++ b/src/Bundle/JoseFramework/Resources/config/dev_services.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Bundle\JoseFramework\DataCollector; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -20,7 +20,6 @@ ->autoconfigure() ->autowire(); - $container->set(DataCollector\JoseCollector::class) ->tag('data_collector', [ 'template' => '@JoseFramework/data_collector/template.html.twig', @@ -32,6 +31,4 @@ $container->set(DataCollector\JWECollector::class); $container->set(DataCollector\JWSCollector::class); $container->set(DataCollector\KeyCollector::class); - }; - diff --git a/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php b/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php index 7183e2fe..f2163543 100644 --- a/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php +++ b/src/Bundle/JoseFramework/Resources/config/encryption_algorithms.php @@ -5,16 +5,15 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Encryption\Algorithm\ContentEncryption; use Jose\Component\Encryption\Algorithm\KeyEncryption; - +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -76,4 +75,3 @@ $container->set(KeyEncryption\RSAOAEP256::class) ->tag('jose.algorithm', ['alias' => 'RSA-OAEP-256']); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/env_var.php b/src/Bundle/JoseFramework/Resources/config/env_var.php index a4a0800d..5875a421 100644 --- a/src/Bundle/JoseFramework/Resources/config/env_var.php +++ b/src/Bundle/JoseFramework/Resources/config/env_var.php @@ -5,7 +5,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. diff --git a/src/Bundle/JoseFramework/Resources/config/jku_commands.php b/src/Bundle/JoseFramework/Resources/config/jku_commands.php index f6f09e39..6bf0e76b 100644 --- a/src/Bundle/JoseFramework/Resources/config/jku_commands.php +++ b/src/Bundle/JoseFramework/Resources/config/jku_commands.php @@ -5,15 +5,15 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Console\JKULoaderCommand; use Jose\Component\Console\X5ULoaderCommand; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/jku_source.php b/src/Bundle/JoseFramework/Resources/config/jku_source.php index e2b14948..226a7bfb 100644 --- a/src/Bundle/JoseFramework/Resources/config/jku_source.php +++ b/src/Bundle/JoseFramework/Resources/config/jku_source.php @@ -5,15 +5,15 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\KeyManagement\JKUFactory; use Jose\Component\KeyManagement\X5UFactory; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use function Symfony\Component\DependencyInjection\Loader\Configurator\ref; return function (ContainerConfigurator $container) { diff --git a/src/Bundle/JoseFramework/Resources/config/json_converter.php b/src/Bundle/JoseFramework/Resources/config/json_converter.php index ab3cca8f..9d63858b 100644 --- a/src/Bundle/JoseFramework/Resources/config/json_converter.php +++ b/src/Bundle/JoseFramework/Resources/config/json_converter.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Core\Converter\StandardConverter; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php b/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php index efdf4e5d..22a1c8e2 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php +++ b/src/Bundle/JoseFramework/Resources/config/jwe_serializers.php @@ -5,17 +5,17 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; use Jose\Component\Encryption\Serializer\CompactSerializer; use Jose\Component\Encryption\Serializer\JSONFlattenedSerializer; use Jose\Component\Encryption\Serializer\JSONGeneralSerializer; +use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -29,5 +29,3 @@ $container->set(JSONFlattenedSerializer::class); $container->set(JSONGeneralSerializer::class); }; - - diff --git a/src/Bundle/JoseFramework/Resources/config/jwe_services.php b/src/Bundle/JoseFramework/Resources/config/jwe_services.php index 5512c4d7..6e29112e 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwe_services.php +++ b/src/Bundle/JoseFramework/Resources/config/jwe_services.php @@ -5,17 +5,17 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Encryption\JWEBuilderFactory; use Jose\Component\Encryption\JWEDecrypterFactory; use Jose\Component\Encryption\JWELoaderFactory; use Jose\Component\Encryption\JWETokenSupport; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -31,4 +31,3 @@ ->public(); $container->set(JWETokenSupport::class); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_factory.php b/src/Bundle/JoseFramework/Resources/config/jwk_factory.php index d1bb0e2a..0111d39a 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwk_factory.php +++ b/src/Bundle/JoseFramework/Resources/config/jwk_factory.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\KeyManagement\JWKFactory; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -23,4 +23,3 @@ $container->set(JWKFactory::class) ->public(); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_services.php b/src/Bundle/JoseFramework/Resources/config/jwk_services.php index 7f363df2..6d577314 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwk_services.php +++ b/src/Bundle/JoseFramework/Resources/config/jwk_services.php @@ -5,15 +5,15 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Bundle\JoseFramework\Controller\JWKSetControllerFactory; use Jose\Bundle\JoseFramework\Routing\JWKSetLoader; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/jwk_sources.php b/src/Bundle/JoseFramework/Resources/config/jwk_sources.php index a9b3c137..a089c12c 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwk_sources.php +++ b/src/Bundle/JoseFramework/Resources/config/jwk_sources.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSource; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -22,7 +22,7 @@ $container->set('jose.jwk_source.keyfile') ->class(JWKSource\KeyFile::class) - ->tag('jose.jwk_source' ); + ->tag('jose.jwk_source'); $container->set('jose.jwk_source.certificatefile') ->class(JWKSource\CertificateFile::class) diff --git a/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php b/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php index 06045164..8417b3a8 100644 --- a/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php +++ b/src/Bundle/JoseFramework/Resources/config/jwkset_sources.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -32,4 +32,3 @@ ->class(JWKSetSource\X5U::class) ->tag('jose.jwkset_source'); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/jws_serializers.php b/src/Bundle/JoseFramework/Resources/config/jws_serializers.php index 704ee9d9..41e9acc2 100644 --- a/src/Bundle/JoseFramework/Resources/config/jws_serializers.php +++ b/src/Bundle/JoseFramework/Resources/config/jws_serializers.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Signature\Serializer; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -20,7 +20,6 @@ ->autoconfigure() ->autowire(); - $container->set(Serializer\JWSSerializerManagerFactory::class) ->public(); @@ -28,4 +27,3 @@ $container->set(Serializer\JSONFlattenedSerializer::class); $container->set(Serializer\JSONGeneralSerializer::class); }; - diff --git a/src/Bundle/JoseFramework/Resources/config/jws_services.php b/src/Bundle/JoseFramework/Resources/config/jws_services.php index 048d5c01..45a8574d 100644 --- a/src/Bundle/JoseFramework/Resources/config/jws_services.php +++ b/src/Bundle/JoseFramework/Resources/config/jws_services.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Signature; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/nested_token.php b/src/Bundle/JoseFramework/Resources/config/nested_token.php index c6cfc723..506be657 100644 --- a/src/Bundle/JoseFramework/Resources/config/nested_token.php +++ b/src/Bundle/JoseFramework/Resources/config/nested_token.php @@ -5,15 +5,15 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -use Jose\Component\Encryption\NestedTokenLoaderFactory; use Jose\Component\Encryption\NestedTokenBuilderFactory; +use Jose\Component\Encryption\NestedTokenLoaderFactory; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/services.php b/src/Bundle/JoseFramework/Resources/config/services.php index e03da1af..fd6cbf35 100644 --- a/src/Bundle/JoseFramework/Resources/config/services.php +++ b/src/Bundle/JoseFramework/Resources/config/services.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Core\AlgorithmManagerFactory; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() diff --git a/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php b/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php index 10ca7bfb..689a9be2 100644 --- a/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php +++ b/src/Bundle/JoseFramework/Resources/config/signature_algorithms.php @@ -5,14 +5,14 @@ /* * The MIT License (MIT) * - * Copyright (c) 2018 Spomky-Labs + * Copyright (c) 2014-2018 Spomky-Labs * * This software may be modified and distributed under the terms * of the MIT license. See the LICENSE file for details. */ -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Jose\Component\Signature\Algorithm; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { $container = $container->services()->defaults() @@ -54,4 +54,3 @@ $container->set(Algorithm\None::class) ->tag('jose.algorithm', ['alias' => 'none']); }; -