From e61b559eb2305dd3627954640d73540a58f90f93 Mon Sep 17 00:00:00 2001 From: arai Date: Sun, 23 Feb 2020 21:38:14 +0900 Subject: [PATCH 1/2] delete 'return' in Filesystem.php --- src/Composer/Util/Filesystem.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php index 7cdad1df4..e305b03b5 100644 --- a/src/Composer/Util/Filesystem.php +++ b/src/Composer/Util/Filesystem.php @@ -206,7 +206,7 @@ class Filesystem usleep(350000); $unlinked = @$this->unlinkImplementation($path); } - + if (!$unlinked) { $error = error_get_last(); $message = 'Could not delete '.$path.': ' . @$error['message']; @@ -237,7 +237,7 @@ class Filesystem usleep(350000); $deleted = @rmdir($path); } - + if (!$deleted) { $error = error_get_last(); $message = 'Could not delete '.$path.': ' . @$error['message']; @@ -340,7 +340,7 @@ class Filesystem } } - return $this->copyThenRemove($source, $target); + $this->copyThenRemove($source, $target); } /** From c5ce4de89eb58c17e1a0ac331b904afc02da2dfb Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 28 Feb 2020 22:27:53 +0100 Subject: [PATCH 2/2] Consistently return void --- src/Composer/Util/Filesystem.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php index e305b03b5..008ed584a 100644 --- a/src/Composer/Util/Filesystem.php +++ b/src/Composer/Util/Filesystem.php @@ -310,7 +310,9 @@ class Filesystem } if (!function_exists('proc_open')) { - return $this->copyThenRemove($source, $target); + $this->copyThenRemove($source, $target); + + return; } if (Platform::isWindows()) {