Remove deprecated resolver_maps configuration option

Author: ruudk

UPGRADE.md

@@ -9,6 +9,7 @@ UPGRADE FROM 0.14 to 1.0
 * Removed deprecated `args` from `Field`
 * Removed deprecated `builders` from `Type`
 * Removed deprecated `values` from `Enum`
+* Removed deprecated `resolver_maps` configuration option
 
 UPGRADE FROM 0.13 to 0.14
 =========================

src/DependencyInjection/Compiler/ResolverMapTaggedServiceMappingPass.php

@@ -4,6 +4,7 @@
 
 namespace Overblog\GraphQLBundle\DependencyInjection\Compiler;
 
+use Overblog\GraphQLBundle\DependencyInjection\Configuration;
 use Overblog\GraphQLBundle\EventListener\TypeDecoratorListener;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -27,9 +28,7 @@ public function process(ContainerBuilder $container): void
         $resolverMapsSortedBySchema = [];
         $typeDecoratorListenerDefinition = $container->getDefinition(TypeDecoratorListener::class);
 
-        /** @var array $resolverMapsBySchemas */
-        $resolverMapsBySchemas = $container->getParameter('overblog_graphql.resolver_maps');
-
+        $resolverMapsBySchemas = array_fill_keys($container->getParameter(Configuration::NAME.'.schemas'), []);
         foreach ($container->findTaggedServiceIds(self::SERVICE_TAG, true) as $serviceId => $tags) {
             foreach ($tags as $tag) {
                 if (!isset($tag['schema'])) {
@@ -64,7 +63,5 @@ public function process(ContainerBuilder $container): void
                 $resolverMaps,
             ]);
         }
-
-        $container->getParameterBag()->remove('overblog_graphql.resolver_maps');
     }
 }

src/DependencyInjection/Configuration.php

@@ -19,7 +19,6 @@
 use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\HttpKernel\Kernel;
 use function array_keys;
 use function is_array;
 use function is_int;
@@ -205,16 +204,6 @@ private function definitionsSchemaSection(): ArrayNodeDefinition
         /** @var ArrayNodeDefinition $node */
         $node = $builder->getRootNode();
 
-        if (Kernel::VERSION_ID >= 50100) {
-            $deprecatedArgs = [
-                'overblog/graphql-bundle',
-                '0.13',
-                'The "%path%.%node%" configuration is deprecated and will be removed in 1.0. Add the "overblog_graphql.resolver_map" tag to the services instead.',
-            ];
-        } else {
-            $deprecatedArgs = ['The "%path%.%node%" configuration is deprecated since version 0.13 and will be removed in 1.0. Add the "overblog_graphql.resolver_map" tag to the services instead.'];
-        }
-
         // @phpstan-ignore-next-line
         $node
             ->beforeNormalization()
@@ -228,11 +217,6 @@ private function definitionsSchemaSection(): ArrayNodeDefinition
                     ->scalarNode('query')->defaultNull()->end()
                     ->scalarNode('mutation')->defaultNull()->end()
                     ->scalarNode('subscription')->defaultNull()->end()
-                    ->arrayNode('resolver_maps')
-                        ->defaultValue([])
-                        ->prototype('scalar')->end()
-                        ->setDeprecated(...$deprecatedArgs)
-                    ->end()
                     ->arrayNode('types')
                         ->defaultValue([])
                         ->prototype('scalar')->end()

src/DependencyInjection/OverblogGraphQLExtension.php

@@ -30,7 +30,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use function array_fill_keys;
 use function realpath;
 use function sprintf;
 
@@ -57,6 +56,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->registerForAutoconfiguration($container);
         $this->setDefaultFieldResolver($config, $container);
 
+        $container->setParameter($this->getAlias().'.schemas', array_keys($config['definitions']['schema']));
         $container->setParameter($this->getAlias().'.config', $config);
         $container->setParameter($this->getAlias().'.resources_dir', realpath(__DIR__.'/../Resources'));
     }
@@ -232,7 +232,6 @@ private function setSchemaArguments(array $config, ContainerBuilder $container):
         }
 
         $executorDefinition = $container->getDefinition(Executor::class);
-        $resolverMapsBySchema = [];
 
         foreach ($config['definitions']['schema'] as $schemaName => $schemaConfig) {
             // builder
@@ -252,11 +251,7 @@ private function setSchemaArguments(array $config, ContainerBuilder $container):
             $definition->setFactory([new Reference($schemaBuilderID), 'call']);
 
             $executorDefinition->addMethodCall('addSchemaBuilder', [$schemaName, new Reference($schemaBuilderID)]);
-
-            $resolverMapsBySchema[$schemaName] = array_fill_keys($schemaConfig['resolver_maps'], 0);
         }
-
-        $container->setParameter(sprintf('%s.resolver_maps', $this->getAlias()), $resolverMapsBySchema);
     }
 
     private function setServicesAliases(array $config, ContainerBuilder $container): void

tests/DependencyInjection/Compiler/ResolverMapTaggedServiceMappingPassTest.php

@@ -16,10 +16,7 @@ final class ResolverMapTaggedServiceMappingPassTest extends TestCase
     public function testProcess(): void
     {
         $container = new ContainerBuilder();
-        $container->setParameter('overblog_graphql.resolver_maps', [
-            'foo' => [],
-            'bar' => [],
-        ]);
+        $container->setParameter('overblog_graphql.schemas', ['foo', 'bar']);
 
         $container->register(TypeDecoratorListener::class);
         $container->register('App\\GraphQl\\Resolver\\ResolverMap1')
@@ -64,7 +61,7 @@ public function testProcess(): void
     public function testProcessThrowsIfSchemaAttributeIsNotDefinedOnTag(): void
     {
         $container = new ContainerBuilder();
-        $container->setParameter('overblog_graphql.resolver_maps', []);
+        $container->setParameter('overblog_graphql.schemas', ['foo', 'bar']);
 
         $container->register(TypeDecoratorListener::class);
         $container->register('App\\GraphQl\\Resolver\\ResolverMap')
@@ -76,44 +73,11 @@ public function testProcessThrowsIfSchemaAttributeIsNotDefinedOnTag(): void
         (new ResolverMapTaggedServiceMappingPass())->process($container);
     }
 
-    public function testProcessWithResolverMapBothTaggedAndInConfigDoesNotAddItTwice(): void
-    {
-        $container = new ContainerBuilder();
-        $container->setParameter('overblog_graphql.resolver_maps', [
-            'foo' => [
-                'App\\GraphQl\\Resolver\\ResolverMap1' => -10,
-                'App\\GraphQl\\Resolver\\ResolverMap2' => 0,
-            ],
-        ]);
-
-        $container->register(TypeDecoratorListener::class);
-        $container->register('App\\GraphQl\\Resolver\\ResolverMap1')
-            ->addTag('overblog_graphql.resolver_map', ['schema' => 'foo', 'priority' => 10]);
-
-        $container->register('App\\GraphQl\\Resolver\\ResolverMap2');
-
-        (new ResolverMapTaggedServiceMappingPass())->process($container);
-
-        $typeDecoratorListenerDefinition = $container->getDefinition(TypeDecoratorListener::class);
-
-        $methodCalls = $typeDecoratorListenerDefinition->getMethodCalls();
-
-        $this->assertCount(1, $methodCalls);
-        $this->assertSame('foo', $methodCalls[0][1][0]);
-        $this->assertEquals([
-            new Reference('App\\GraphQl\\Resolver\\ResolverMap1'),
-            new Reference('App\\GraphQl\\Resolver\\ResolverMap2'),
-        ], $methodCalls[0][1][1]);
-    }
-
     public function testProcessThrowsIfTagReferencesUnknownSchema(): void
     {
         $container = new ContainerBuilder();
         $container->register(TypeDecoratorListener::class);
-        $container->setParameter('overblog_graphql.resolver_maps', [
-            'foo' => [],
-            'bar' => [],
-        ]);
+        $container->setParameter('overblog_graphql.schemas', ['foo', 'bar']);
 
         $container->register('App\\GraphQl\\Resolver\\ResolverMap')
             ->addTag('overblog_graphql.resolver_map', ['schema' => 'baz']);