Skip to content

Commit 666ac79

Browse files
Merge branch '4.4' into 5.2
* 4.4: [HttpKernel] fix transient test [FrameworkBundle] Fix freshness checks with boolean parameters on routes [FrameworkBundle] fix registering "annotations.cache" on the "container.hot_path" Add some information about the username in CONTRIBUTORS
2 parents caf79a2 + c004548 commit 666ac79

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Tests/KernelTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
1818
use Symfony\Component\DependencyInjection\ContainerInterface;
1919
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
20+
use Symfony\Component\Filesystem\Exception\IOException;
2021
use Symfony\Component\Filesystem\Filesystem;
2122
use Symfony\Component\HttpFoundation\Request;
2223
use Symfony\Component\HttpFoundation\Response;
@@ -36,8 +37,10 @@ class KernelTest extends TestCase
3637
{
3738
protected function tearDown(): void
3839
{
39-
$fs = new Filesystem();
40-
$fs->remove(__DIR__.'/Fixtures/var');
40+
try {
41+
(new Filesystem())->remove(__DIR__.'/Fixtures/var');
42+
} catch (IOException $e) {
43+
}
4144
}
4245

4346
public function testConstructor()
@@ -473,7 +476,7 @@ public function testProjectDirExtension()
473476

474477
public function testKernelReset()
475478
{
476-
(new Filesystem())->remove(__DIR__.'/Fixtures/var/cache');
479+
$this->tearDown();
477480

478481
$kernel = new CustomProjectDirKernel();
479482
$kernel->boot();

0 commit comments

Comments
 (0)