fix bundle configuration

axtiva · Mar 27, 2022 · e8df6fd · e8df6fd
1 parent 606e63c
commit e8df6fd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,16 +28,21 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->append($this->schemaFile())
                 ->append($this->enablePreload())
                 ->append($this->defaultResolver())
-                ->append($this->addRequiredScalar(
+                ->append($this->addScalar(
                     'namespace',
                     'App\GraphQL',
                     'Root namespace for generated code'
+                )->isRequired())
+                ->append($this->addScalar(
+                    'template_language_version',
+                    '7.4',
+                    'PHP version of templates for php code'
                 ))
-                ->append($this->addRequiredScalar(
+                ->append($this->addScalar(
                     'dir',
                     '%kernel.project_dir%/src/GraphQL/',
                     'Root dir for generated code'
-                ))
+                )->isRequired())
             ->end();
 
         return $treeBuilder;
@@ -104,7 +109,7 @@ private function defaultResolver(): ScalarNodeDefinition
         return $node;
     }
 
-    private function addRequiredScalar(string $name, $default = null, string $info = null): ScalarNodeDefinition
+    private function addScalar(string $name, $default = null, string $info = null): ScalarNodeDefinition
     {
         $builder = new TreeBuilder($name, 'scalar');
 
@@ -119,10 +124,6 @@ private function addRequiredScalar(string $name, $default = null, string $info =
             $node->defaultValue($default);
         }
 
-        $node
-            ->isRequired()
-        ->end();
-
         return $node;
     }
 }
diff --git a/src/DependencyInjection/FlexibleGraphqlExtension.php b/src/DependencyInjection/FlexibleGraphqlExtension.php
@@ -156,16 +156,16 @@ private function registerConfigGenerator(array $config, ContainerBuilder $contai
     {
         $container->register(CodeGeneratorConfigInterface::class)
             ->setClass(CodeGeneratorConfig::class)
-            ->setArgument('$namespace', $config['namespace'])
-            ->setArgument('$dir', $config['dir']);
+            ->setArgument('$dir', $config['dir'])
+            ->setArgument('$phpVersion', $config['template_language_version'])
+            ->setArgument('$namespace', $config['namespace']);
     }
 
     private function registerTypeRegistryGenerator(array $config, ContainerBuilder $container): void
     {
         $container->register(TypeRegistryGeneratorBuilderInterface::class)
             ->setClass(TypeRegistryGeneratorBuilder::class)
-            ->setArgument('$namespace', $config['namespace'])
-            ->setArgument('$dir', $config['dir']);
+            ->setArgument('$config', new Reference(CodeGeneratorConfigInterface::class));
         $container->setAlias(
             'flexible_graphql.type_registry_generator.builder',
             TypeRegistryGeneratorBuilderInterface::class
@@ -176,8 +176,7 @@ private function registerCodeGenerator(array $config, ContainerBuilder $containe
     {
         $codeGenerator = $container->register(CodeGeneratorBuilderInterface::class)
             ->setClass(CodeGeneratorBuilder::class)
-            ->setArgument('$namespace', $config['namespace'])
-            ->setArgument('$dir', $config['dir']);
+            ->setArgument('$config', new Reference(CodeGeneratorConfigInterface::class));
 
         if ($config['schema_type'] === Configuration::SCHEMA_TYPE_FEDERATION) {
             $container->register(FieldResolverGeneratorConfigInterface::class)

diff --git a/src/Resources/config/flexible_graphql.yaml b/src/Resources/config/flexible_graphql.yaml
@@ -5,3 +5,4 @@ flexible_graphql:
   schema_files: '%kernel.project_dir%/config/graphql/*.graphql'
   enable_preload: false
   default_resolver: flexible_graphql.default_resolver
+  template_language_version: '7.4'