Skip to content

Commit 855dee8

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

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
@@ -528,6 +528,7 @@ protected function initializeContainer(): void
528528
touch($oldContainerDir.'.legacy');
529529
}
530530

531+
$buildDir = $this->container->getParameter('kernel.build_dir');
531532
$cacheDir = $this->container->getParameter('kernel.cache_dir');
532533
$preload = $this instanceof WarmableInterface ? (array) $this->warmUp($cacheDir, $buildDir) : [];
533534

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)