Move the $types argument to TypeGenerator

Author: murtukov

UPGRADE.md

@@ -48,6 +48,7 @@ overrode the service definition, please take into account the new constructor si
 
 ```php
 public function __construct(
+   array $typeConfigs,
    TypeBuilder $typeBuilder,
    EventDispatcherInterface $eventDispatcher,
    TypeGeneratorOptions $options
@@ -61,7 +62,6 @@ with the following constructor signature:
 public function __construct(
     string $namespace,
     ?string $cacheDir,
-    array $types,
     bool $useClassMap = true,
     ?string $cacheBaseDir = null,
     ?int $cacheDirMask = null

src/Generator/TypeGenerator.php

@@ -27,12 +27,18 @@ class TypeGenerator
     public const GRAPHQL_SERVICES = 'services';
 
     private static bool $classMapLoaded = false;
+    private array $typeConfigs;
     private TypeGeneratorOptions $options;
     private TypeBuilder $typeBuilder;
     private EventDispatcherInterface $dispatcher;
 
-    public function __construct(TypeBuilder $typeBuilder, EventDispatcherInterface $dispatcher, TypeGeneratorOptions $options)
-    {
+    public function __construct(
+        array $typeConfigs,
+        TypeBuilder $typeBuilder,
+        EventDispatcherInterface $dispatcher,
+        TypeGeneratorOptions $options
+    ) {
+        $this->typeConfigs = $typeConfigs;
         $this->typeBuilder = $typeBuilder;
         $this->dispatcher = $dispatcher;
         $this->options = $options;
@@ -49,12 +55,9 @@ public function compile(int $mode): array
             $fs->remove($cacheDir);
         }
 
-        // Process configs
-        $types = Processor::process($this->options->types);
-
         // Generate classes
         $classes = [];
-        foreach ($types as $name => $config) {
+        foreach (Processor::process($this->typeConfigs) as $name => $config) {
             $config['config']['name'] ??= $name;
             $config['config']['class_name'] = $config['class_name'];
             $classMap = $this->generateClass($config, $cacheDir, $mode);

src/Generator/TypeGeneratorOptions.php

@@ -6,24 +6,38 @@
 
 class TypeGeneratorOptions
 {
+    /**
+     * PSR-4 namespace for generated GraphQL classes.
+     */
     public string $namespace;
+
+    /**
+     * Relative path to a directory for generated GraphQL classes.
+     * Equals `null` unless explicitly set by user.
+     */
     public ?string $cacheDir;
-    public array $types;
+
+    /**
+     * Permission bitmask for the directory of generated classes.
+     */
     public int $cacheDirMask;
+
     public bool $useClassMap = true;
+
+    /**
+     * Base directory for generated classes.
+     */
     public ?string $cacheBaseDir;
 
     public function __construct(
         string $namespace,
         ?string $cacheDir,
-        array $types,
         bool $useClassMap = true,
         ?string $cacheBaseDir = null,
         ?int $cacheDirMask = null
     ) {
         $this->namespace = $namespace;
         $this->cacheDir = $cacheDir;
-        $this->types = $types;
         $this->useClassMap = $useClassMap;
         $this->cacheBaseDir = $cacheBaseDir;
 

src/Resources/config/services.yaml

@@ -62,14 +62,14 @@ services:
 
     Overblog\GraphQLBundle\Generator\TypeGenerator:
         arguments:
+            - '%overblog_graphql_types.config%'
             - '@Overblog\GraphQLBundle\Generator\TypeBuilder'
             - '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             - !service
                 class: Overblog\GraphQLBundle\Generator\TypeGeneratorOptions
                 arguments:
                     - '%overblog_graphql.class_namespace%'
                     - '%overblog_graphql.cache_dir%'
-                    - '%overblog_graphql_types.config%'
                     - '%overblog_graphql.use_classloader_listener%'
                     - '%kernel.cache_dir%'
                     - '%overblog_graphql.cache_dir_permissions%'

tests/Generator/TypeGeneratorTest.php

@@ -22,9 +22,9 @@ public function testCacheDirPermissions(int $expectedMask, ?string $cacheDir, ?i
         $typeBuilder = $this->createMock(TypeBuilder::class);
         $eventDispatcher = $this->createMock(EventDispatcherInterface::class);
 
-        $options = new TypeGeneratorOptions('App', $cacheDir, [], true, null, $cacheDirMask);
+        $options = new TypeGeneratorOptions('App', $cacheDir, true, null, $cacheDirMask);
 
-        $mask = (new TypeGenerator($typeBuilder, $eventDispatcher, $options))->getCacheDirMask();
+        $mask = (new TypeGenerator([], $typeBuilder, $eventDispatcher, $options))->getCacheDirMask();
 
         $this->assertSame($expectedMask, $mask);
     }
@@ -38,9 +38,9 @@ public function testCompiledEvent(): void
             ->method('dispatch')
             ->with($this->equalTo(new SchemaCompiledEvent()));
 
-        $options = new TypeGeneratorOptions('App', null, []);
+        $options = new TypeGeneratorOptions('App', null);
 
-        (new TypeGenerator($typeBuilder, $eventDispatcher, $options))->compile(TypeGenerator::MODE_DRY_RUN);
+        (new TypeGenerator([], $typeBuilder, $eventDispatcher, $options))->compile(TypeGenerator::MODE_DRY_RUN);
     }
 
     public function getPermissionsProvider(): Generator