Skip to content

Commit edd3677

Browse files
Merge branch '6.2' into 6.3
* 6.2: [Cache] Fix tests [Mailer] [MailPace] Fix undefined array key in errors response [DependencyInjection] Allow casting env var processors to cast null [Cache] Fix DBAL deprecations Fix broken symlink tests Windows PHP 7.4+ [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE` [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE`
2 parents 97b698e + b0818e7 commit edd3677

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Tests/FilesystemTest.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Filesystem\Exception\InvalidArgumentException;
1515
use Symfony\Component\Filesystem\Exception\IOException;
16+
use Symfony\Component\Filesystem\Path;
1617

1718
/**
1819
* Test class for Filesystem.
@@ -1087,18 +1088,18 @@ public function testReadBrokenLink()
10871088
{
10881089
$this->markAsSkippedIfSymlinkIsMissing();
10891090

1090-
$file = $this->workspace.'/file';
1091-
$link = $this->workspace.'/link';
1091+
$file = Path::join($this->workspace, 'file');
1092+
$link = Path::join($this->workspace, 'link');
10921093

10931094
touch($file);
10941095
$this->filesystem->symlink($file, $link);
10951096
$this->filesystem->remove($file);
10961097

1097-
$this->assertEquals($file, $this->filesystem->readlink($link));
1098+
$this->assertEquals($file, Path::normalize($this->filesystem->readlink($link)));
10981099
$this->assertNull($this->filesystem->readlink($link, true));
10991100

11001101
touch($file);
1101-
$this->assertEquals($file, $this->filesystem->readlink($link, true));
1102+
$this->assertEquals($file, Path::normalize($this->filesystem->readlink($link, true)));
11021103
}
11031104

11041105
public function testReadLinkDefaultPathDoesNotExist()

0 commit comments

Comments
 (0)