Merge branch '0.11' into 0.12

Author: Jeremiah VALERIE

src/CacheWarmer/CompileCacheWarmer.php

@@ -9,33 +9,43 @@
 
 class CompileCacheWarmer implements CacheWarmerInterface
 {
-    /** @var TypeGenerator */
     private $typeGenerator;
 
-    public function __construct(TypeGenerator $typeGenerator)
+    private $compiled;
+
+    /**
+     * CompileCacheWarmer constructor.
+     *
+     * @param TypeGenerator $typeGenerator
+     * @param bool          $compiled
+     */
+    public function __construct(TypeGenerator $typeGenerator, $compiled = true)
     {
         $this->typeGenerator = $typeGenerator;
+        $this->compiled = $compiled;
     }
 
     /**
      * {@inheritdoc}
      */
     public function isOptional()
     {
-        return false;
+        return !$this->compiled;
     }
 
     /**
      * {@inheritdoc}
      */
     public function warmUp($cacheDir): void
     {
-        // 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);
+        if ($this->compiled) {
+            // 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);
         }
-        $this->typeGenerator->compile(TypeGenerator::MODE_WRITE | TypeGenerator::MODE_OVERRIDE);
-        $this->typeGenerator->setBaseCacheDir($baseCacheDir);
     }
 }

src/DependencyInjection/Configuration.php

@@ -125,7 +125,7 @@ private function definitionsSection()
                 ->scalarNode('cache_dir')->defaultNull()->end()
                 ->scalarNode('cache_dir_permissions')->defaultNull()->end()
                 ->booleanNode('use_classloader_listener')->defaultTrue()->end()
-                ->booleanNode('auto_compile')->defaultTrue()->end()
+                ->scalarNode('auto_compile')->defaultTrue()->end()
                 ->booleanNode('show_debug_info')->info('Show some performance stats in extensions')->defaultFalse()->end()
                 ->booleanNode('config_validation')->defaultValue($this->debug)->end()
                 ->append($this->definitionsSchemaSection())

src/DependencyInjection/OverblogGraphQLExtension.php

@@ -78,14 +78,15 @@ private function loadConfigFiles(ContainerBuilder $container): void
 
     private function setCompilerCacheWarmer(array $config, ContainerBuilder $container): void
     {
-        if ($config['definitions']['auto_compile']) {
-            $definition = $container->setDefinition(
-                CompileCacheWarmer::class,
-                new Definition(CompileCacheWarmer::class)
-            );
-            $definition->setArguments([new Reference($this->getAlias().'.cache_compiler')]);
-            $definition->addTag('kernel.cache_warmer', ['priority' => 50]);
-        }
+        $definition = $container->setDefinition(
+            CompileCacheWarmer::class,
+            new Definition(CompileCacheWarmer::class)
+        );
+        $definition->setArguments([
+            new Reference($this->getAlias().'.cache_compiler'),
+            $config['definitions']['auto_compile'],
+        ]);
+        $definition->addTag('kernel.cache_warmer', ['priority' => 50]);
     }
 
     private function setClassLoaderListener(array $config, ContainerBuilder $container): void