Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6322456

Browse filesBrowse files
committed
WIP
1 parent 2ca8c35 commit 6322456
Copy full SHA for 6322456

File tree

2 files changed

+3
-17
lines changed
Filter options

2 files changed

+3
-17
lines changed

‎src/Symfony/Component/Filesystem/Filesystem.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Filesystem/Filesystem.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,14 @@ public function readlink($path, $canonicalize = false)
416416
return null;
417417
}
418418

419-
if ('\\' === \DIRECTORY_SEPARATOR) {
419+
if ('\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 70410) {
420420
$path = readlink($path);
421421
}
422422

423423
return realpath($path);
424424
}
425425

426-
if ('\\' === \DIRECTORY_SEPARATOR) {
426+
if ('\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 70410) {
427427
return realpath($path);
428428
}
429429

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+1-15Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,21 +1032,7 @@ public function testReadAbsoluteLink()
10321032
$this->filesystem->symlink($link1, $link2);
10331033

10341034
$this->assertEquals($file, $this->filesystem->readlink($link1));
1035-
1036-
if ('\\' !== \DIRECTORY_SEPARATOR) {
1037-
/*
1038-
this in Windows
1039-
PHP 7.1 - 7.2
1040-
$this->filesystem->readlink($link2) // ***\dir\link
1041-
1042-
PHP 7.3 - 8.0
1043-
$this->filesystem->readlink($link2) // ***\file
1044-
1045-
therefore skipped for Windows
1046-
*/
1047-
$this->assertEquals($link1, $this->filesystem->readlink($link2));
1048-
}
1049-
1035+
$this->assertEquals($link1, $this->filesystem->readlink($link2));
10501036
$this->assertEquals($file, $this->filesystem->readlink($link1, true));
10511037
$this->assertEquals($file, $this->filesystem->readlink($link2, true));
10521038
$this->assertEquals($file, $this->filesystem->readlink($file, true));

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.