Commit92ba4e8

committed

[FrameworkBundle] Provide$buildDir when runningCacheWarmer to build read-only resources

Signed-off-by: Quentin Devos <4972091+Okhoshi@users.noreply.github.com>

1 parent3466f84 commit92ba4e8Copy full SHA for 92ba4e8

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ CHANGELOG`
`29`	`29`	`* Add support for relative URLs in BrowserKit's redirect assertion`
`30`	`30`	`* Change BrowserKitAssertionsTrait::getClient() to be protected`
`31`	`31`	* Deprecate the`framework.asset_mapper.provider` config option
	`32`	+* Provide`$buildDir` when running`CacheWarmer` to build read-only resources
`32`	`33`
`33`	`34`	`6.3`
`34`	`35`	`---`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,13 @@ public function __construct(KernelInterface $kernel, LoggerInterface $logger = n`
`40`	`40`	`/**`
`41`	`41`	`* @return string[]`
`42`	`42`	`*/`
`43`		`-publicfunctionwarmUp(string$cacheDir):array`
	`43`	`+publicfunctionwarmUp(string$cacheDir, ?string$buildDir =null):array`
`44`	`44`	`{`
`45`		`-$generator =newConfigBuilderGenerator($this->kernel->getBuildDir());`
	`45`	`+if ($buildDir ===null) {`
	`46`	`+return [];`
	`47`	`+ }`
	`48`	`+`
	`49`	`+$generator =newConfigBuilderGenerator($buildDir);`
`46`	`50`
`47`	`51`	`foreach ($this->kernel->getBundles()as$bundle) {`
`48`	`52`	`$extension =$bundle->getContainerExtension();`
`@@ -79,6 +83,6 @@ private function dumpExtension(ExtensionInterface $extension, ConfigBuilderGener`
`79`	`83`
`80`	`84`	`publicfunctionisOptional():bool`
`81`	`85`	`{`
`82`		`-returntrue;`
	`86`	`+returnfalse;`
`83`	`87`	`}`
`84`	`88`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ private function warmupOptionals(string $cacheDir, string $warmupDir, SymfonySty`
`245`	`245`	`$warmer =$kernel->getContainer()->get('cache_warmer');`
`246`	`246`	`// non optional warmers already ran during container compilation`
`247`	`247`	`$warmer->enableOnlyOptionalWarmers();`
`248`		`-$preload = (array)$warmer->warmUp($cacheDir,$io);`
	`248`	`+$preload = (array)$warmer->warmUp($cacheDir,null,$io);`
`249`	`249`
`250`	`250`	`if ($preload &&file_exists($preloadFile =$warmupDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {`
`251`	`251`	`Preloader::append($preloadFile,$preload);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`66`	`66`	`$this->cacheWarmer->enableOptionalWarmers();`
`67`	`67`	`}`
`68`	`68`
`69`		`-$preload =$this->cacheWarmer->warmUp($cacheDir =$kernel->getContainer()->getParameter('kernel.cache_dir'));`
	`69`	`+$preload =$this->cacheWarmer->warmUp($kernel->getContainer()->getParameter('kernel.cache_dir'));`
`70`	`70`
`71`		`-if ($preload &&file_exists($preloadFile =$cacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {`
	`71`	`+if ($preload &&file_exists($preloadFile =$kernel->getContainer()->getParameter('kernel.build_dir').'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {`
`72`	`72`	`Preloader::append($preloadFile,$preload);`
`73`	`73`	`}`
`74`	`74`

Comments

(0)