Remove auto mapping configuration

This has been remove in favor of the Symfony 4+ service configuration.

Author: Jeremiah VALERIE

UPGRADE-0.12.md

@@ -0,0 +1,37 @@
+UPGRADE FROM 0.11 to 0.12
+=======================
+
+# Table of Contents
+
+- [Remove auto mapping configuration](#remove-auto-mapping-configuration)
+
+### Remove auto mapping configuration
+
+ * The AutoMapping configuration entry has been removed in favor of Symfony 4+ service configuration.
+
+ Upgrading:
+ - Delete old configuration.
+ ```diff
+ overblog_graphql:
+ definitions:
+ - auto_mapping: ~
+ ```
+ - use Symfony 4+ service configuration to tag your types, resolvers or mutation.
+ ```yaml
+ # config/graphql.yaml
+ services:
+ _defaults:
+ autowire: true
+ public: true
+ 
+ _instanceof:
+ GraphQL\Type\Definition\Type:
+ tags: ['overblog_graphql.type']
+ Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface:
+ tags: ['overblog_graphql.resolver']
+ Overblog\GraphQLBundle\Definition\Resolver\MutationInterface:
+ tags: ['overblog_graphql.mutation']
+ 
+ App\GraphQL\:
+ resource: ../GraphQL
+ ```

docs/definitions/resolver.md

@@ -132,36 +132,18 @@ class CalcMutation implements MutationInterface, AliasedInterface
 `addition` mutation can be access by using `App\GraphQL\Mutation\CalcMutation::addition` or
 `add` alias.
 
-You can also define custom dirs using the config (Symfony <3.3):
-```yaml
-overblog_graphql:
- definitions:
- auto_mapping:
- directories:
- - "%kernel.root_dir%/src/*Bundle/CustomDir"
- - "%kernel.root_dir%/src/AppBundle/{foo,bar}"
-```
-
-If using Symfony 3.3+ disabling auto mapping can be a solution to leave place to native
-DI `autoconfigure`:
-
-```yaml
-overblog_graphql:
- definitions:
- auto_mapping: false
-```
-
 Here an example of how this can be done with DI `autoconfigure`:
 
 ```yaml
 services:
- App\Mutation\:
- resource: '../src/Mutation'
- tags: ['overblog_graphql.mutation']
- 
- App\Resolver\:
- resource: '../src/Resolver'
- tags: ['overblog_graphql.resolver']
+ _instanceof:
+ Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface:
+ tags: ['overblog_graphql.resolver']
+ Overblog\GraphQLBundle\Definition\Resolver\MutationInterface:
+ tags: ['overblog_graphql.mutation']
+
+ Overblog\GraphQLBundle\GraphQL\Relay\:
+ resource: ../../GraphQL/Relay/{Mutation,Node}
 ```
 
 ## The service way

docs/definitions/type-system/index.md

@@ -68,25 +68,6 @@ Types can be define 3 different ways:
  }
  ```
 
- You can also define custom dirs using config:
- ```yaml
- overblog_graphql:
- definitions:
- auto_mapping:
- directories:
- - "%kernel.root_dir%/src/*Bundle/CustomDir"
- - "%kernel.root_dir%/src/AppBundle/{foo,bar}"
- ```
-
- If using Symfony 3.3+ disabling auto mapping can be a solution to leave place to native
- DI `autoconfigure`:
-
- ```yaml
- overblog_graphql:
- definitions:
- auto_mapping: false
- ```
-
  Here an example of how this can be done with DI `autoconfigure`:
 
  ```yaml

src/DependencyInjection/Compiler/AliasedPass.php

@@ -2,13 +2,22 @@
 
 namespace Overblog\GraphQLBundle\DependencyInjection\Compiler;
 
+use GraphQL\Type\Definition\Type;
 use Overblog\GraphQLBundle\Definition\Resolver\AliasedInterface;
+use Overblog\GraphQLBundle\Definition\Resolver\MutationInterface;
+use Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
 final class AliasedPass implements CompilerPassInterface
 {
+ private const SERVICE_SUBCLASS_TAG_MAPPING = [
+ MutationInterface::class => 'overblog_graphql.mutation',
+ ResolverInterface::class => 'overblog_graphql.resolver',
+ Type::class => TypeTaggedServiceMappingPass::TAG_NAME,
+ ];
+
  /**
  * {@inheritdoc}
  */
@@ -28,7 +37,7 @@ public function process(ContainerBuilder $container)
  private function filterDefinitions($definitions)
  {
  return array_filter($definitions, function (Definition $definition) {
- foreach (AutoMappingPass::SERVICE_SUBCLASS_TAG_MAPPING as $tagName) {
+ foreach (self::SERVICE_SUBCLASS_TAG_MAPPING as $tagName) {
  if ($definition->hasTag($tagName)) {
  return is_subclass_of($definition->getClass(), AliasedInterface::class);
  }
@@ -55,7 +64,7 @@ private function addDefinitionTagsFromAliases(Definition $definition)
  private function guessTagName(Definition $definition)
  {
  $tagName = null;
- foreach (AutoMappingPass::SERVICE_SUBCLASS_TAG_MAPPING as $refClassName => $tag) {
+ foreach (self::SERVICE_SUBCLASS_TAG_MAPPING as $refClassName => $tag) {
  if (is_subclass_of($definition->getClass(), $refClassName)) {
  $tagName = $tag;
  break;

src/DependencyInjection/Compiler/AutoMappingPass.php

@@ -117,7 +117,6 @@ private function definitionsSection()
  ->booleanNode('show_debug_info')->info('Show some performance stats in extensions')->defaultFalse()->end()
  ->booleanNode('config_validation')->defaultValue($this->debug)->end()
  ->append($this->definitionsSchemaSection())
- ->append($this->definitionsAutoMappingSection())
  ->append($this->definitionsMappingsSection())
  ->arrayNode('builders')
  ->children()
@@ -210,28 +209,6 @@ private function definitionsSchemaSection()
  return $node;
  }
 
- private function definitionsAutoMappingSection()
- {
- $builder = new TreeBuilder();
- /** @var ArrayNodeDefinition $node */
- $node = $builder->root('auto_mapping');
- $node
- ->treatFalseLike(['enabled' => false])
- ->treatTrueLike(['enabled' => true])
- ->treatNullLike(['enabled' => true])
- ->addDefaultsIfNotSet()
- ->children()
- ->booleanNode('enabled')->defaultTrue()->end()
- ->arrayNode('directories')
- ->info('List of directories containing GraphQL classes.')
- ->prototype('scalar')->end()
- ->end()
- ->end()
- ->end();
-
- return $node;
- }
-
  private function definitionsMappingsSection()
  {
  $builder = new TreeBuilder();

src/DependencyInjection/Configuration.php

@@ -73,6 +73,7 @@ private function loadConfigFiles(ContainerBuilder $container)
  $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
  $loader->load('services.yml');
  $loader->load('graphql_types.yml');
+ $loader->load('graphql_resolvers.yml');
  $loader->load('expression_language_functions.yml');
  $loader->load('definition_config_processors.yml');
  }
@@ -106,9 +107,6 @@ private function setClassLoaderListener(array $config, ContainerBuilder $contain
 
  private function setDefinitionParameters(array $config, ContainerBuilder $container)
  {
- // auto mapping
- $container->setParameter($this->getAlias().'.auto_mapping.enabled', $config['definitions']['auto_mapping']['enabled']);
- $container->setParameter($this->getAlias().'.auto_mapping.directories', $config['definitions']['auto_mapping']['directories']);
  // generator and config
  $container->setParameter($this->getAlias().'.default_resolver', $config['definitions']['default_resolver']);
  $container->setParameter($this->getAlias().'.class_namespace', $config['definitions']['class_namespace']);

src/DependencyInjection/OverblogGraphQLExtension.php

@@ -42,7 +42,6 @@ class OverblogGraphQLTypesExtension extends Extension
  public function load(array $configs, ContainerBuilder $container)
  {
  $configs = array_filter($configs);
- //$configs = array_filter($configs);
  if (count($configs) > 1) {
  throw new \InvalidArgumentException('Configs type should never contain more than one config to deal with inheritance.');
  }