public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #8641 from souweb22/delete_return 

delete 'return' and 'spaces' in Filesystem.php
pull/8661/head
Jordi Boggiano 2020-02-28 22:28:14 +01:00 committed by GitHub
parent eb56c8dcd4 c5ce4de89e
commit 2285a79c63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Util/Filesystem.php
View File

@ -206,7 +206,7 @@ class Filesystem
usleep(350000); usleep(350000);
$unlinked = @$this->unlinkImplementation($path); $unlinked = @$this->unlinkImplementation($path);
} }
if (!$unlinked) { if (!$unlinked) {
$error = error_get_last(); $error = error_get_last();
$message = 'Could not delete '.$path.': ' . @$error['message']; $message = 'Could not delete '.$path.': ' . @$error['message'];
@ -237,7 +237,7 @@ class Filesystem
usleep(350000); usleep(350000);
$deleted = @rmdir($path); $deleted = @rmdir($path);
} }
if (!$deleted) { if (!$deleted) {
$error = error_get_last(); $error = error_get_last();
$message = 'Could not delete '.$path.': ' . @$error['message']; $message = 'Could not delete '.$path.': ' . @$error['message'];
@ -310,7 +310,9 @@ class Filesystem
} }
if (!function_exists('proc_open')) { if (!function_exists('proc_open')) {
return $this->copyThenRemove($source, $target); $this->copyThenRemove($source, $target);
return;
} }
if (Platform::isWindows()) { if (Platform::isWindows()) {
@ -340,7 +342,7 @@ class Filesystem
} }
} }
return $this->copyThenRemove($source, $target); $this->copyThenRemove($source, $target);
} }
/** /**