Skip to content

Commit c735fa2

Browse files
committed
[FrameworkBundle] Fix config builder with extensions extended in build()
1 parent 8306a88 commit c735fa2

File tree

2 files changed

+358
-11
lines changed

2 files changed

+358
-11
lines changed

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
2222
use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
2323
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
24+
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
2425
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
26+
use Symfony\Component\HttpKernel\Kernel;
2527
use Symfony\Component\HttpKernel\KernelInterface;
2628

2729
/**
@@ -47,14 +49,29 @@ public function __construct(KernelInterface $kernel, ?LoggerInterface $logger =
4749
*/
4850
public function warmUp(string $cacheDir)
4951
{
50-
$generator = new ConfigBuilderGenerator($this->kernel->getBuildDir());
52+
if ($this->kernel instanceof Kernel) {
53+
/** @var ContainerBuilder $container */
54+
$container = \Closure::bind(function (Kernel $kernel) {
55+
$containerBuilder = $kernel->getContainerBuilder();
56+
$kernel->prepareContainer($containerBuilder);
57+
58+
return $containerBuilder;
59+
}, null, $this->kernel)($this->kernel);
5160

52-
foreach ($this->kernel->getBundles() as $bundle) {
53-
$extension = $bundle->getContainerExtension();
54-
if (null === $extension) {
55-
continue;
61+
$extensions = $container->getExtensions();
62+
} else {
63+
$extensions = [];
64+
foreach ($this->kernel->getBundles() as $bundle) {
65+
$extension = $bundle->getContainerExtension();
66+
if (null !== $extension) {
67+
$extensions[] = $extension;
68+
}
5669
}
70+
}
71+
72+
$generator = new ConfigBuilderGenerator($this->kernel->getBuildDir());
5773

74+
foreach ($extensions as $extension) {
5875
try {
5976
$this->dumpExtension($extension, $generator);
6077
} catch (\Exception $e) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy