Skip to content

Commit ccad9c8

Browse files
Merge branch '4.4'
* 4.4: Improve some URLs cleanup remaining param and internal Intl FulLTransformer [HttpClient] fix data loss when streaming as a PHP resource Fix test compatibility with 4.x components [Cache] cs fix
2 parents 1132db0 + ebe9b2f commit ccad9c8

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
@@ -49,7 +49,7 @@ public function copy(string $originFile, string $targetFile, bool $overwriteNewe
4949
}
5050

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

269269
if (true !== @rename($origin, $target)) {
270270
if (is_dir($origin)) {
271-
// See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943
271+
// See https://bugs.php.net/54097 & https://php.net/rename#113943
272272
$this->mirror($origin, $target, null, ['override' => $overwrite, 'delete' => $overwrite]);
273273
$this->remove($origin);
274274

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)