Skip to content

Commit e5c9fc2

Browse files
Merge branch '3.4' into 4.3
* 3.4: Improve some URLs Fix test compatibility with 4.x components [Cache] cs fix
2 parents 29155d4 + f1b75e0 commit e5c9fc2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Filesystem.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
5353
}
5454

5555
if ($doCopy) {
56-
// https://bugs.php.net/bug.php?id=64634
56+
// https://bugs.php.net/64634
5757
if (false === $source = @fopen($originFile, 'r')) {
5858
throw new IOException(sprintf('Failed to copy "%s" to "%s" because source file could not be opened for reading.', $originFile, $targetFile), 0, null, $originFile);
5959
}
@@ -281,7 +281,7 @@ public function rename($origin, $target, $overwrite = false)
281281

282282
if (true !== @rename($origin, $target)) {
283283
if (is_dir($origin)) {
284-
// See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943
284+
// See https://bugs.php.net/54097 & https://php.net/rename#113943
285285
$this->mirror($origin, $target, null, ['override' => $overwrite, 'delete' => $overwrite]);
286286
$this->remove($origin);
287287

Tests/FilesystemTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected function markAsSkippedIfSymlinkIsMissing($relative = false)
144144
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
145145
}
146146

147-
// https://bugs.php.net/bug.php?id=69473
147+
// https://bugs.php.net/69473
148148
if ($relative && '\\' === \DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {
149149
$this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
150150
}

0 commit comments

Comments
 (0)