From 935f7271f819721088671be180774947198bdcbb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 25 Feb 2013 16:25:24 +0100 Subject: [PATCH] The ArchiveManager should return the written path for library usage --- src/Composer/Package/Archiver/ArchiveManager.php | 2 +- src/Composer/Package/Archiver/ArchiverInterface.php | 2 ++ src/Composer/Package/Archiver/PharArchiver.php | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Composer/Package/Archiver/ArchiveManager.php b/src/Composer/Package/Archiver/ArchiveManager.php index 76df21c55..a875c4f97 100644 --- a/src/Composer/Package/Archiver/ArchiveManager.php +++ b/src/Composer/Package/Archiver/ArchiveManager.php @@ -118,6 +118,6 @@ class ArchiveManager // Create the archive $sourceRef = $package->getSourceReference(); - $usableArchiver->archive($sourcePath, $target, $format, $sourceRef, $package->getArchiveExcludes()); + return $usableArchiver->archive($sourcePath, $target, $format, $sourceRef, $package->getArchiveExcludes()); } } diff --git a/src/Composer/Package/Archiver/ArchiverInterface.php b/src/Composer/Package/Archiver/ArchiverInterface.php index 7a688d251..ce9f6778c 100644 --- a/src/Composer/Package/Archiver/ArchiverInterface.php +++ b/src/Composer/Package/Archiver/ArchiverInterface.php @@ -29,6 +29,8 @@ interface ArchiverInterface * @param string $sourceRef The reference of the source to archive or null * for the current reference * @param array $excludes A list of patterns for files to exclude + * + * @return string The path to the written archive file */ public function archive($sources, $target, $format, $sourceRef = null, $excludes = array()); diff --git a/src/Composer/Package/Archiver/PharArchiver.php b/src/Composer/Package/Archiver/PharArchiver.php index 950832ce2..071424b15 100644 --- a/src/Composer/Package/Archiver/PharArchiver.php +++ b/src/Composer/Package/Archiver/PharArchiver.php @@ -60,6 +60,7 @@ class PharArchiver implements ArchiverInterface }) ->ignoreVCS(true); $phar->buildFromIterator($finder->getIterator(), $sources); + return $target; } catch (\UnexpectedValueException $e) { $message = sprintf("Could not create archive '%s' from '%s': %s", $target,