Avoid errors in cleanup, fixes #8766, fixes #8764

src/Composer/Downloader/FileDownloader.php

@@ -239,14 +239,17 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface
         if (file_exists($fileName)) {
             $this->filesystem->unlink($fileName);
         }
-        if (is_dir($path) && $this->filesystem->isDirEmpty($this->config->get('vendor-dir').'/composer/')) {
+
-            $this->filesystem->removeDirectory($this->config->get('vendor-dir').'/composer/');
+        $dirsToCleanUp = array(
-        }
+            $this->config->get('vendor-dir').'/composer/',
-        if (is_dir($path) && $this->filesystem->isDirEmpty($this->config->get('vendor-dir'))) {
+            $this->config->get('vendor-dir'),
-            $this->filesystem->removeDirectory($this->config->get('vendor-dir'));
+            $path,
-        }
+        );
-        if (is_dir($path) && $this->filesystem->isDirEmpty($path)) {
+
-            $this->filesystem->removeDirectory($path);
+        foreach ($dirsToCleanUp as $dir) {
+            if (is_dir($dir) && $this->filesystem->isDirEmpty($dir)) {
+                $this->filesystem->removeDirectory($dir);
+            }
         }
     }