Change accessibility of type generator options

Author: murtukov

src/CacheWarmer/CompileCacheWarmer.php

@@ -35,17 +35,16 @@ public function warmUp($cacheDir)
     {
         if ($this->compiled) {
             // use warm up cache dir if type generator cache dir not already explicitly declared
-            $options = $this->typeGenerator->options;
-            $cacheBaseDir = $options->cacheBaseDir;
+            $cacheBaseDir = $this->typeGenerator->getCacheBaseDir();
 
-            if (null === $options->cacheDir) {
-                $options->cacheBaseDir = $cacheDir;
+            if (null === $this->typeGenerator->getCacheDir()) {
+                $this->typeGenerator->setCacheBaseDir($cacheDir);
             }
 
             $this->typeGenerator->compile(TypeGenerator::MODE_WRITE | TypeGenerator::MODE_OVERRIDE);
 
             if (null !== $cacheBaseDir) {
-                $options->cacheBaseDir = $cacheBaseDir;
+                $this->typeGenerator->setCacheBaseDir($cacheBaseDir);
             }
         }
 

src/Generator/TypeGenerator.php

@@ -27,7 +27,7 @@ class TypeGenerator
     public const GRAPHQL_SERVICES = 'services';
 
     private static bool $classMapLoaded = false;
-    public TypeGeneratorOptions $options;
+    private TypeGeneratorOptions $options;
     private TypeBuilder $typeBuilder;
     private EventDispatcherInterface $dispatcher;
 
@@ -40,7 +40,7 @@ public function __construct(TypeBuilder $typeBuilder, EventDispatcherInterface $
 
     public function compile(int $mode): array
     {
-        $cacheDir = $this->options->getCacheDirOrDefault();
+        $cacheDir = $this->getCacheDirOrDefault();
         $writeMode = $mode & self::MODE_WRITE;
 
         // Configure write mode
@@ -122,8 +122,33 @@ public function loadClasses(bool $forceReload = false): void
         }
     }
 
+    public function getCacheDir(): ?string
+    {
+        return $this->options->cacheDir;
+    }
+
+    public function getCacheDirMask(): int
+    {
+        return $this->options->cacheDirMask;
+    }
+
+    public function getCacheBaseDir(): ?string
+    {
+        return $this->options->cacheBaseDir;
+    }
+
+    public function setCacheBaseDir(string $dir): void
+    {
+        $this->options->cacheBaseDir = $dir;
+    }
+
+    public function getCacheDirOrDefault(): string
+    {
+        return $this->options->cacheDir ?? $this->options->cacheBaseDir.'/overblog/graphql-bundle/__definitions__';
+    }
+
     private function getClassesMap(): string
     {
-        return $this->options->getCacheDirOrDefault().'/__classes.map';
+        return $this->getCacheDirOrDefault().'/__classes.map';
     }
 }

src/Generator/TypeGeneratorOptions.php

@@ -34,9 +34,4 @@ public function __construct(
 
         $this->cacheDirMask = $cacheDirMask;
     }
-
-    public function getCacheDirOrDefault(): string
-    {
-        return $this->cacheDir ?? $this->cacheBaseDir.'/overblog/graphql-bundle/__definitions__';
-    }
 }

tests/Functional/Command/CompileCommandTest.php

@@ -33,7 +33,7 @@ public function setUp(): void
 
         /** @var TypeGenerator $generator */
         $generator = static::$kernel->getContainer()->get('overblog_graphql.cache_compiler');
-        $this->cacheDir = $generator->options->getCacheDirOrDefault();
+        $this->cacheDir = $generator->getCacheDirOrDefault();
         $this->commandTester = new CommandTester($command);
     }
 

tests/Generator/TypeGeneratorTest.php

@@ -24,7 +24,7 @@ public function testCacheDirPermissions(int $expectedMask, ?string $cacheDir, ?i
 
         $options = new TypeGeneratorOptions('App', $cacheDir, [], true, null, $cacheDirMask);
 
-        $mask = (new TypeGenerator($typeBuilder, $eventDispatcher, $options))->options->cacheDirMask;
+        $mask = (new TypeGenerator($typeBuilder, $eventDispatcher, $options))->getCacheDirMask();
 
         $this->assertSame($expectedMask, $mask);
     }