Merge branch '0.10' into 0.11

Author: Jeremiah VALERIE

CacheWarmer/CompileCacheWarmer.php

@@ -28,6 +28,12 @@ public function isOptional()
      */
     public function warmUp($cacheDir)
     {
+        // use warm up cache dir if type generator cache dir not already explicitly declare
+        $baseCacheDir = $this->typeGenerator->getBaseCacheDir();
+        if (null === $this->typeGenerator->getCacheDir(false)) {
+            $this->typeGenerator->setBaseCacheDir($cacheDir);
+        }
         $this->typeGenerator->compile(TypeGenerator::MODE_WRITE | TypeGenerator::MODE_OVERRIDE);
+        $this->typeGenerator->setBaseCacheDir($baseCacheDir);
     }
 }

DependencyInjection/Configuration.php

@@ -111,7 +111,7 @@ private function definitionsSection()
             ->children()
                 ->variableNode('default_resolver')->defaultValue([Resolver::class, 'defaultResolveFn'])->end()
                 ->scalarNode('class_namespace')->defaultValue('Overblog\\GraphQLBundle\\__DEFINITIONS__')->end()
-                ->scalarNode('cache_dir')->defaultValue($this->cacheDir.'/overblog/graphql-bundle/__definitions__')->end()
+                ->scalarNode('cache_dir')->defaultNull()->end()
                 ->booleanNode('use_classloader_listener')->defaultTrue()->end()
                 ->booleanNode('auto_compile')->defaultTrue()->end()
                 ->booleanNode('show_debug_info')->info('Show some performance stats in extensions')->defaultFalse()->end()

Generator/TypeGenerator.php

@@ -23,6 +23,8 @@ class TypeGenerator extends BaseTypeGenerator
 
     private $useClassMap;
 
+    private $baseCacheDir;
+
     private static $classMapLoaded = false;
 
     public function __construct(
@@ -31,25 +33,50 @@ public function __construct(
         $cacheDir,
         array $configs,
         $useClassMap = true,
-        callable $configProcessor = null)
+        callable $configProcessor = null,
+        $baseCacheDir = null
+    )
     {
         $this->setCacheDir($cacheDir);
         $this->configProcessor = null === $configProcessor ? static::DEFAULT_CONFIG_PROCESSOR : $configProcessor;
         $this->configs = $configs;
         $this->useClassMap = $useClassMap;
+        $this->baseCacheDir = $baseCacheDir;
+
         parent::__construct($classNamespace, $skeletonDirs);
     }
 
     /**
-     * @return string
+     * @return string|null
+     */
+    public function getBaseCacheDir()
+    {
+        return $this->baseCacheDir;
+    }
+
+    /**
+     * @param string|null $baseCacheDir
      */
-    public function getCacheDir()
+    public function setBaseCacheDir($baseCacheDir)
     {
-        return $this->cacheDir;
+        $this->baseCacheDir = $baseCacheDir;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCacheDir(/*bool $useDefault = true*/)
+    {
+        $useDefault = func_num_args() > 0 ? func_get_arg(0) : true;
+        if ($useDefault) {
+            return $this->cacheDir ?: $this->baseCacheDir.'/overblog/graphql-bundle/__definitions__';
+        } else {
+            return $this->cacheDir;
+        }
     }
 
     /**
-     * @param string $cacheDir
+     * @param string|null $cacheDir
      *
      * @return $this
      */

Resources/config/services.yml

@@ -86,6 +86,8 @@ services:
             - "%overblog_graphql.cache_dir%"
             - "%overblog_graphql_types.config%"
             - "%overblog_graphql.use_classloader_listener%"
+            - ~
+            - "%kernel.cache_dir%"
         calls:
             - ['addUseStatement', ['Overblog\GraphQLBundle\Definition\ConfigProcessor']]
             - ['addUseStatement', ['Overblog\GraphQLBundle\Definition\LazyConfig']]