Merge pull request #12 from moufmouf/master

Adapting bundle for v4.0

Author: moufmouf

DependencyInjection/GraphqliteCompilerPass.php

@@ -23,13 +23,15 @@
 use TheCodingMachine\GraphQLite\AnnotationReader;
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
-use TheCodingMachine\Graphqlite\Bundle\Mappers\ContainerFetcherTypeMapper;
 use TheCodingMachine\Graphqlite\Bundle\QueryProviders\ControllerQueryProvider;
+use TheCodingMachine\GraphQLite\FieldsBuilder;
 use TheCodingMachine\GraphQLite\FieldsBuilderFactory;
 use TheCodingMachine\GraphQLite\InputTypeGenerator;
 use TheCodingMachine\GraphQLite\InputTypeUtils;
+use TheCodingMachine\GraphQLite\Mappers\CompositeTypeMapper;
 use TheCodingMachine\GraphQLite\Mappers\GlobTypeMapper;
 use TheCodingMachine\GraphQLite\Mappers\RecursiveTypeMapperInterface;
+use TheCodingMachine\GraphQLite\Mappers\Root\CompositeRootTypeMapper;
 use TheCodingMachine\GraphQLite\Mappers\StaticTypeMapper;
 use TheCodingMachine\GraphQLite\NamingStrategy;
 use TheCodingMachine\GraphQLite\TypeGenerator;
@@ -130,8 +132,7 @@ public function process(ContainerBuilder $container)
                 $queryProvider->setPrivate(true);
                 $queryProvider->setFactory([self::class, 'createQueryProvider']);
                 $queryProvider->addArgument(new Reference($id));
-                $queryProvider->addArgument(new Reference(FieldsBuilderFactory::class));
-                $queryProvider->addArgument(new Reference(RecursiveTypeMapperInterface::class));
+                $queryProvider->addArgument(new Reference(FieldsBuilder::class));
                 $queryProvider->addTag('graphql.queryprovider');
                 $container->setDefinition($controllerIdentifier, $queryProvider);
             }
@@ -174,14 +175,22 @@ public function process(ContainerBuilder $container)
             $definition = $container->getDefinition(StaticTypeMapper::class);
             $definition->addMethodCall('setNotMappedTypes', [$customNotMappedTypes]);
         }
+
+        // Register type mappers
+        $typeMapperServices = $container->findTaggedServiceIds('graphql.type_mapper');
+        $compositeTypeMapper = $container->getDefinition(CompositeTypeMapper::class);
+        foreach ($typeMapperServices as $id => $tags) {
+            // add the transport service to the TransportChain service
+            $compositeTypeMapper->addMethodCall('addTypeMapper', [new Reference($id)]);
+        }
     }
 
     /**
      * @param object $controller
      */
-    public static function createQueryProvider($controller, FieldsBuilderFactory $fieldsBuilderFactory, RecursiveTypeMapperInterface $recursiveTypeMapper): ControllerQueryProvider
+    public static function createQueryProvider($controller, FieldsBuilder $fieldsBuilder): ControllerQueryProvider
     {
-        return new ControllerQueryProvider($controller, $fieldsBuilderFactory->buildFieldsBuilder($recursiveTypeMapper));
+        return new ControllerQueryProvider($controller, $fieldsBuilder);
     }
 
     /**

Mappers/ContainerFetcherTypeMapper.php

@@ -23,7 +23,21 @@
 
         <service id="TheCodingMachine\GraphQLite\QueryProviderInterface" alias="TheCodingMachine\GraphQLite\AggregateQueryProvider" />
 
-        <service id="TheCodingMachine\GraphQLite\FieldsBuilderFactory" public="true" />
+        <service id="TheCodingMachine\GraphQLite\Mappers\Root\CompositeRootTypeMapper">
+            <argument type="tagged" tag="graphql.root_type_mapper" />
+        </service>
+
+        <service id="TheCodingMachine\GraphQLite\Mappers\Root\RootTypeMapperInterface" alias="TheCodingMachine\GraphQLite\Mappers\Root\CompositeRootTypeMapper" />
+
+        <service id="TheCodingMachine\GraphQLite\Mappers\Root\MyCLabsEnumTypeMapper">
+            <tag name="graphql.root_type_mapper" />
+        </service>
+
+        <service id="TheCodingMachine\GraphQLite\Mappers\Root\BaseTypeMapper">
+            <tag name="graphql.root_type_mapper" />
+        </service>
+
+        <service id="TheCodingMachine\GraphQLite\FieldsBuilder" public="true" />
 
         <service id="TheCodingMachine\GraphQLite\AnnotationReader" >
             <argument key="$mode">%graphqlite.annotations.error_mode%</argument>
@@ -71,15 +85,6 @@
             </call>
         </service>
 
-        <!-- <service id="TheCodingMachine\Graphqlite\Bundle\Mappers\ContainerFetcherTypeMapper">
-            <argument type="service" id="service_container" />
-            <argument type="collection" />
-            <argument type="collection" />
-            <argument type="collection" />
-
-            <tag name="graphql.type_mapper"/>
-        </service> -->
-
         <service id="TheCodingMachine\GraphQLite\Mappers\StaticTypeMapper">
             <tag name="graphql.type_mapper"/>
         </service>

Resources/config/container/graphqlite.xml

@@ -17,7 +17,7 @@
   ],
   "require" : {
     "php" : ">=7.1",
-    "thecodingmachine/graphqlite" : "~3.0.0",
+    "thecodingmachine/graphqlite" : "~4.0.0",
     "symfony/framework-bundle": "^4.1.9",
     "doctrine/annotations": "^1.6",
     "doctrine/cache": "^1.8",
@@ -34,7 +34,7 @@
     "beberlei/porpaginas": "^1.2"
   },
   "scripts": {
-    "phpstan": "phpstan analyse GraphqliteBundle.php DependencyInjection/ Controller/ Mappers/ Resources/ Security/ -c phpstan.neon --level=7 --no-progress"
+    "phpstan": "phpstan analyse GraphqliteBundle.php DependencyInjection/ Controller/ Resources/ Security/ -c phpstan.neon --level=7 --no-progress"
   },
   "suggest": {
     "symfony/security-bundle": "To use @Logged or @Right annotations"
@@ -46,7 +46,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "3.0.x-dev"
+      "dev-master": "4.0.x-dev"
     }
   },
   "minimum-stability": "dev",

composer.json

@@ -1,6 +1,5 @@
 parameters:
     ignoreErrors:
         - "#Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition::children\\(\\)#"
-        - "#Access to an undefined property GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\OutputType::\\$name.#"
 #includes:
 #    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon