Use of PhpFileLoader instead YamlFileLoader

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) {

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');
     }
 
     /**

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');
         }
     }
 

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) {

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) {

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']);

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 = [];

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) {

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);

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) {

src/Bundle/JoseFramework/Resources/config/analyzers.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * The MIT License (MIT)
+ *
+ * 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 Jose\Component\KeyManagement\KeyAnalyzer\AlgorithmAnalyzer;
+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()
+        ->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);
+};

src/Bundle/JoseFramework/Resources/config/checkers.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * The MIT License (MIT)
+ *
+ * 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 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()
+        ->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']);
+};