Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f314f65b7c73 · 2023-10-17T16:15:25.000+02:00
* 6.4:
  [HttpKernel] Fix CacheWarmerAggregateTest
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -96,10 +96,6 @@ public function testWarmupChecksInvalidFiles()
     public function testWarmupPassBuildDir()
     {
         $warmer = $this->createMock(CacheWarmerInterface::class);
-        $warmer
-            ->expects($this->once())
-            ->method('isOptional')
-            ->willReturn(false);
         $warmer
             ->expects($this->once())
             ->method('warmUp')
@@ -110,7 +106,7 @@ public function testWarmupPassBuildDir()
         $aggregate->warmUp('cache_dir', 'build_dir');
     }
 
-    public function testWarmupOnOptionalWarmerDoNotPassBuildDir()
+    public function testWarmupOnOptionalWarmerPassBuildDir()
     {
         $warmer = $this->createMock(CacheWarmerInterface::class);
         $warmer
@@ -120,10 +116,10 @@ public function testWarmupOnOptionalWarmerDoNotPassBuildDir()
         $warmer
             ->expects($this->once())
             ->method('warmUp')
-            ->with('cache_dir', null);
+            ->with('cache_dir', 'build_dir');
 
         $aggregate = new CacheWarmerAggregate([$warmer]);
-        $aggregate->enableOptionalWarmers();
+        $aggregate->enableOnlyOptionalWarmers();
         $aggregate->warmUp('cache_dir', 'build_dir');
     }
 
