bug #57554 [FrameworkBundle] Fix warming up routes (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 58319793e220 · 2024-06-28T09:32:28.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [FrameworkBundle] Fix warming up routes | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT Follows #52962 and builds on the semantics of #57553. Commits ------- cc918e9 [FrameworkBundle] Fix warming up routes
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -69,7 +69,7 @@ public function getRouteCollection(): RouteCollection
             $this->collection->addResource(new ContainerParametersResource($this->collectedParameters));
 
             try {
-                $containerFile = ($this->paramFetcher)('kernel.cache_dir').'/'.($this->paramFetcher)('kernel.container_class').'.php';
+                $containerFile = ($this->paramFetcher)('kernel.build_dir').'/'.($this->paramFetcher)('kernel.container_class').'.php';
                 if (file_exists($containerFile)) {
                     $this->collection->addResource(new FileResource($containerFile));
                 } else {
@@ -84,14 +84,12 @@ public function getRouteCollection(): RouteCollection
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
-        if (!$buildDir) {
-            return [];
+        if (null === $currentDir = $this->getOption('cache_dir')) {
+            return []; // skip warmUp when router doesn't use cache
         }
 
-        $currentDir = $this->getOption('cache_dir');
-
-        // force cache generation in build_dir
-        $this->setOption('cache_dir', $buildDir);
+        // force cache generation
+        $this->setOption('cache_dir', $buildDir ?? $cacheDir);
         $this->getMatcher();
         $this->getGenerator();
 
