[framework-bundle] enable "inline_factories", disable "inline_class_loader" when PHP 7.4 preloading is used

nicolas-grekas · nicolas-grekas · commit 998b214c6db2 · 2019-11-15T14:19:43.000+01:00
diff --git a/symfony/framework-bundle/4.2/src/Kernel.php b/symfony/framework-bundle/4.2/src/Kernel.php
@@ -33,7 +33,8 @@ public function getProjectDir(): string
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', true);
+        $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || !ini_get('opcache.preload'));
+        $container->setParameter('container.dumper.inline_factories', true);
         $confDir = $this->getProjectDir().'/config';
 
         $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public function getProjectDir(): string`
`33`	`33`	`protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void`
`34`	`34`	`{`
`35`	`35`	`$container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));`
`36`		`- $container->setParameter('container.dumper.inline_class_loader', true);`
	`36`	`+ $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 \|\| !ini_get('opcache.preload'));`
	`37`	`+ $container->setParameter('container.dumper.inline_factories', true);`
`37`	`38`	`$confDir = $this->getProjectDir().'/config';`
`38`	`39`
`39`	`40`	`$loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');`