[HttpKernel] Disable container inlining when legacy inlining has been used

nicolas-grekas · nicolas-grekas · commit aeb76ecf646a · 2017-11-21T15:09:33.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -120,7 +120,7 @@ public function dump(array $options = array())
             'namespace' => '',
             'as_files' => false,
             'debug' => true,
-            'hot_path_tag' => null,
+            'hot_path_tag' => 'container.hot_path',
             'inline_class_loader_parameter' => 'container.dumper.inline_class_loader',
         ), $options);
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -812,13 +812,17 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $dumper->setProxyDumper(new ProxyDumper(substr(hash('sha256', $cache->getPath()), 0, 7)));
         }
 
+        if ($this->loadClassCache || class_exists(ClassCollectionLoader::class, false)) {
+            // if legacy inlining has been used, disable container inlining
+            $this->container->getParameter('container.dumper.inline_class_loader', false);
+        }
+
         $content = $dumper->dump(array(
             'class' => $class,
             'base_class' => $baseClass,
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
-            'hot_path_tag' => !$this->loadClassCache ? 'container.hot_path' : null,
         ));
 
         $rootCode = array_pop($content);
