Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit a929d4d8349a · 2025-08-18T11:42:54.000+02:00
* 6.4:
  remove deprecated nullable option from primary key columns
  specific fix to avoid 'outag' when inflecting 'outages'
  [Process] Enhance hasSystemCallBeenInterrupted function for non-english locale
  [FrameworkBundle] Make `cache:warmup` warm up read-only caches
diff --git a/Command/CacheWarmupCommand.php b/Command/CacheWarmupCommand.php
@@ -69,9 +69,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $kernel->warmUp($cacheDir);
         }
 
-        $preload = $this->cacheWarmer->warmUp($cacheDir);
-
         $buildDir = $kernel->getContainer()->getParameter('kernel.build_dir');
+
+        $preload = $this->cacheWarmer->warmUp($cacheDir, $buildDir);
+
         if ($preload && $cacheDir === $buildDir && file_exists($preloadFile = $buildDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
             Preloader::append($preloadFile, $preload);
         }

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