Skip to content

Commit 5d70186

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Compare paths after realpath() has been applied to both fix AssetMapper usage without assets enabled Bump Symfony version to 6.4.10 Update VERSION for 6.4.9 Update CHANGELOG for 6.4.9
2 parents 5b1c8be + c92c5bd commit 5d70186

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Kernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ protected function initializeContainer(): void
521521
touch($oldContainerDir.'.legacy');
522522
}
523523

524+
$buildDir = $this->container->getParameter('kernel.build_dir');
524525
$cacheDir = $this->container->getParameter('kernel.cache_dir');
525526
$preload = $this instanceof WarmableInterface ? (array) $this->warmUp($cacheDir, $buildDir) : [];
526527

Tests/KernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public function testWarmup()
452452
$kernel->boot();
453453

454454
$this->assertTrue($kernel->warmedUp);
455-
$this->assertSame($kernel->getBuildDir(), $kernel->warmedUpBuildDir);
455+
$this->assertSame(realpath($kernel->getBuildDir()), $kernel->warmedUpBuildDir);
456456
}
457457

458458
public function testServicesResetter()

0 commit comments

Comments
 (0)