Merge pull request #386 from mcg-web/fix-generated-type-class-loader

Fix (#385) generated type class loader

Author: mcg-web

src/Definition/Builder/TypeFactory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Definition\Builder;
+
+use GraphQL\Type\Definition\Type;
+use Overblog\GraphQLBundle\Definition\ConfigProcessor;
+use Overblog\GraphQLBundle\Definition\GlobalVariables;
+
+final class TypeFactory
+{
+    /** @var ConfigProcessor */
+    private $configProcessor;
+    /** @var GlobalVariables */
+    private $globalVariables;
+
+    public function __construct(ConfigProcessor $configProcessor, GlobalVariables $globalVariables)
+    {
+        $this->configProcessor = $configProcessor;
+        $this->globalVariables = $globalVariables;
+    }
+
+    /**
+     * @param string $class
+     *
+     * @return Type
+     */
+    public function create($class)
+    {
+        return new $class($this->configProcessor, $this->globalVariables);
+    }
+}

src/DependencyInjection/Compiler/ConfigTypesPass.php

@@ -2,8 +2,7 @@
 
 namespace Overblog\GraphQLBundle\DependencyInjection\Compiler;
 
-use Overblog\GraphQLBundle\Definition\ConfigProcessor;
-use Overblog\GraphQLBundle\Definition\GlobalVariables;
+use GraphQL\Type\Definition\Type;
 use Overblog\GraphQLBundle\Generator\TypeGenerator;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -25,9 +24,10 @@ public function process(ContainerBuilder $container)
 
     private function setTypeServiceDefinition(ContainerBuilder $container, $class, $alias)
     {
-        $definition = $container->setDefinition($class, new Definition($class));
+        $definition = $container->setDefinition($class, new Definition(Type::class));
+        $definition->setFactory([new Reference('overblog_graphql.type_factory'), 'create']);
         $definition->setPublic(false);
-        $definition->setArguments([new Reference(ConfigProcessor::class), new Reference(GlobalVariables::class)]);
+        $definition->setArguments([$class]);
         $definition->addTag(TypeTaggedServiceMappingPass::TAG_NAME, ['alias' => $alias, 'generated' => true]);
     }
 }

src/Resources/config/services.yml

@@ -35,6 +35,13 @@ services:
             - "@overblog_graphql.type_resolver"
             - false
 
+    overblog_graphql.type_factory:
+        class: Overblog\GraphQLBundle\Definition\Builder\TypeFactory
+        public: false
+        arguments:
+            - '@Overblog\GraphQLBundle\Definition\ConfigProcessor'
+            - '@Overblog\GraphQLBundle\Definition\GlobalVariables'
+
     overblog_graphql.type_resolver:
         class: Overblog\GraphQLBundle\Resolver\TypeResolver
         public: true
@@ -121,7 +128,7 @@ services:
             - "@overblog_graphql.request_parser"
             - "%overblog_graphql.handle_cors%"
             - "%overblog_graphql.batching_method%"
-            
+
     Overblog\GraphQLBundle\Controller\GraphController:
         public: true
         alias: 'overblog_graphql.controller.graphql'