Merge branch '5.4' into 6.3

* 5.4:
  [FrameworkBundle] Always use buildDir as `ConfigBuilderGenerator` outputDir

CacheWarmer/ConfigBuilderCacheWarmer.php

@@ -42,7 +42,7 @@ public function __construct(KernelInterface $kernel, LoggerInterface $logger = n
      */
     public function warmUp(string $cacheDir): array
     {
-        $generator = new ConfigBuilderGenerator($cacheDir);
+        $generator = new ConfigBuilderGenerator($this->kernel->getBuildDir());
 
         foreach ($this->kernel->getBundles() as $bundle) {
             $extension = $bundle->getContainerExtension();

Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\ConfigBuilderCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\Kernel;
+
+class ConfigBuilderCacheWarmerTest extends TestCase
+{
+    private $varDir;
+
+    protected function setUp(): void
+    {
+        $this->varDir = sys_get_temp_dir().'/'.uniqid();
+        $fs = new Filesystem();
+        $fs->mkdir($this->varDir);
+    }
+
+    protected function tearDown(): void
+    {
+        $fs = new Filesystem();
+        $fs->remove($this->varDir);
+        unset($this->varDir);
+    }
+
+    public function testBuildDirIsUsedAsConfigBuilderOutputDir()
+    {
+        $kernel = new class($this->varDir) extends Kernel {
+            private $varDir;
+
+            public function __construct(string $varDir)
+            {
+                parent::__construct('test', false);
+
+                $this->varDir = $varDir;
+            }
+
+            public function registerBundles(): iterable
+            {
+                yield new FrameworkBundle();
+            }
+
+            public function getBuildDir(): string
+            {
+                return $this->varDir.'/build';
+            }
+
+            public function getCacheDir(): string
+            {
+                return $this->varDir.'/cache';
+            }
+
+            public function registerContainerConfiguration(LoaderInterface $loader)
+            {
+            }
+        };
+        $kernel->boot();
+
+        $warmer = new ConfigBuilderCacheWarmer($kernel);
+        $warmer->warmUp($kernel->getCacheDir());
+
+        self::assertDirectoryExists($kernel->getBuildDir().'/Symfony');
+        self::assertDirectoryDoesNotExist($kernel->getCacheDir().'/Symfony');
+    }
+}