From c6db86e4448301e0731af2e0ad9e7824600cf97d Mon Sep 17 00:00:00 2001 From: Jan Prieser Date: Wed, 17 Jul 2013 13:28:15 +0200 Subject: [PATCH 1/2] cleanup temporary download location when archiving --- src/Composer/Package/Archiver/ArchiveManager.php | 9 ++++++++- .../Test/Package/Archiver/ArchiveManagerTest.php | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Composer/Package/Archiver/ArchiveManager.php b/src/Composer/Package/Archiver/ArchiveManager.php index be1d66bb8..46f156667 100644 --- a/src/Composer/Package/Archiver/ArchiveManager.php +++ b/src/Composer/Package/Archiver/ArchiveManager.php @@ -142,6 +142,13 @@ class ArchiveManager } // Create the archive - return $usableArchiver->archive($sourcePath, $target, $format, $package->getArchiveExcludes()); + $archivePath = $usableArchiver->archive($sourcePath, $target, $format, $package->getArchiveExcludes()); + + //cleanup temporary download + if (!($package instanceof RootPackage)) { + $filesystem->removeDirectory($sourcePath); + } + + return $archivePath; } } diff --git a/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php b/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php index 83c3de0b6..427b0d70c 100644 --- a/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php +++ b/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php @@ -49,6 +49,9 @@ class ArchiveManagerTest extends ArchiverTest $target = $this->getTargetName($package, 'tar'); $this->assertFileExists($target); + + $tmppath = sys_get_temp_dir().'/composer_archiver/'.$this->manager->getPackageFilename($package); + $this->assertFileNotExists($tmppath); unlink($target); } From 290b9307f4657cf0a4d8a04cf7a290b0836d9f69 Mon Sep 17 00:00:00 2001 From: Jan Prieser Date: Wed, 17 Jul 2013 14:40:41 +0200 Subject: [PATCH 2/2] remove unneeded braces --- src/Composer/Package/Archiver/ArchiveManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Package/Archiver/ArchiveManager.php b/src/Composer/Package/Archiver/ArchiveManager.php index 46f156667..383f83b72 100644 --- a/src/Composer/Package/Archiver/ArchiveManager.php +++ b/src/Composer/Package/Archiver/ArchiveManager.php @@ -145,7 +145,7 @@ class ArchiveManager $archivePath = $usableArchiver->archive($sourcePath, $target, $format, $package->getArchiveExcludes()); //cleanup temporary download - if (!($package instanceof RootPackage)) { + if (!$package instanceof RootPackage) { $filesystem->removeDirectory($sourcePath); }