Merge pull request #2 from moufmouf/migrating_to_v4

Upgrading to tdbm-graphql v4

Author: moufmouf

.gitignore

@@ -2,4 +2,5 @@
 /composer.lock
 /build
 /var
-/cache
+/cache
+.phpunit.result.cache

.phpunit.result.cache

@@ -8,7 +8,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use TheCodingMachine\Tdbm\GraphQL\GraphQLTypeAnnotator;
 
 class TdbmGraphqlExtension extends Extension
 {
@@ -20,14 +19,7 @@ class TdbmGraphqlExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config/container'));
         $loader->load('tdbmgraphql.xml');
-
-        $definition = $container->getDefinition(GraphQLTypeAnnotator::class);
-        $definition->replaceArgument(0, $config['type_namespace']);
-        $definition->replaceArgument(1, $config['generated_type_namespace']);
     }
 }

DependencyInjection/Configuration.php

@@ -9,10 +9,7 @@
     <services>
         <defaults autowire="true" autoconfigure="true" public="false" />
 
-        <service id="TheCodingMachine\Tdbm\GraphQL\GraphQLTypeAnnotator">
-            <argument></argument> <!-- will be filled in with tdbm-graphql.type_namespace dynamically -->
-            <argument></argument> <!-- will be filled in with tdbm-graphql.generated_type_namespace dynamically -->
-        </service>
+        <service id="TheCodingMachine\Tdbm\GraphQL\GraphQLTypeAnnotator" />
     </services>
 
 </container>

DependencyInjection/TdbmGraphqlExtension.php

@@ -18,9 +18,9 @@
   ],
   "require" : {
     "php" : ">=7.2",
-    "thecodingmachine/graphqlite-bundle": "^3",
+    "thecodingmachine/graphqlite-bundle": "^4",
     "thecodingmachine/tdbm-bundle": "^5.1",
-    "thecodingmachine/tdbm-graphql": "~3.1.0",
+    "thecodingmachine/tdbm-graphql": "~4.0",
     "symfony/framework-bundle": "^4.1.9"
   },
   "require-dev": {
@@ -40,7 +40,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "3.1.x-dev"
+      "dev-master": "4.0.x-dev"
     }
   },
   "minimum-stability": "dev",

Resources/config/container/tdbmgraphql.xml

@@ -1,5 +1,4 @@
-parameters:
-    ignoreErrors:
-        - "#Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition::children\\(\\)#"
+#parameters:
+#    ignoreErrors:
 #includes:
 #    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon