Merge 264d1e5 into 3ce5878

Author: mcg-web

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;

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()
@@ -211,28 +210,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();

DependencyInjection/Configuration.php

@@ -77,6 +77,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');
     }
@@ -110,9 +111,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']);

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

DependencyInjection/OverblogGraphQLTypesExtension.php

@@ -3,7 +3,6 @@
 namespace Overblog\GraphQLBundle;
 
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\AliasedPass;
-use Overblog\GraphQLBundle\DependencyInjection\Compiler\AutoMappingPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\AutowiringTypesPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\ConfigTypesPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\DefinitionConfigProcessorPass;
@@ -28,11 +27,10 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        //ConfigTypesPass and AutoMappingPass must be before TypeTaggedServiceMappingPass
+        //ConfigTypesPass must be before TypeTaggedServiceMappingPass
         $container->addCompilerPass(new GlobalVariablesPass());
         $container->addCompilerPass(new ExpressionFunctionPass());
         $container->addCompilerPass(new DefinitionConfigProcessorPass());
-        $container->addCompilerPass(new AutoMappingPass());
         $container->addCompilerPass(new AliasedPass());
         $container->addCompilerPass(new AutowiringTypesPass());
 

OverblogGraphQLBundle.php

@@ -0,0 +1,13 @@
+services:
+    _defaults:
+        autowire: true
+        public: true
+
+    _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}

Resources/config/graphql_resolvers.yml

@@ -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

Resources/doc/definitions/resolver.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