Merge branch 'v2.2' into mdeboer/autowire-alias

Author: mdeboer

src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenBuilder.php

@@ -15,6 +15,7 @@
 
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
 use Jose\Bundle\JoseFramework\Services\NestedTokenBuilderFactory;
+use Jose\Component\NestedToken\NestedTokenBuilder as NestedTokenBuilderService;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -31,7 +32,7 @@ public function load(array $configs, ContainerBuilder $container): void
     {
         foreach ($configs[$this->name()] as $name => $itemConfig) {
             $service_id = sprintf('jose.nested_token_builder.%s', $name);
-            $definition = new Definition(self::class);
+            $definition = new Definition(NestedTokenBuilderService::class);
             $definition
                 ->setFactory([new Reference(NestedTokenBuilderFactory::class), 'create'])
                 ->setArguments([

src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedTokenLoader.php

@@ -15,6 +15,7 @@
 
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
 use Jose\Bundle\JoseFramework\Services\NestedTokenLoaderFactory;
+use Jose\Component\NestedToken\NestedTokenLoader as NestedTokenLoaderService;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -31,7 +32,7 @@ public function load(array $configs, ContainerBuilder $container): void
     {
         foreach ($configs[$this->name()] as $name => $itemConfig) {
             $service_id = sprintf('jose.nested_token_loader.%s', $name);
-            $definition = new Definition(self::class);
+            $definition = new Definition(NestedTokenLoaderService::class);
             $definition
                 ->setFactory([new Reference(NestedTokenLoaderFactory::class), 'create'])
                 ->setArguments([