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

Fix error on check exclude from download composer.json

pull/2496/head
Morgan Brunot 2013-12-10 21:14:50 +01:00
parent 80499bb024
commit a300e1d45b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Archiver/ArchiveManager.php
View File

@ -144,12 +144,14 @@ class ArchiveManager
$this->downloadManager->download($package, $sourcePath); $this->downloadManager->download($package, $sourcePath);
// Check exclude from downloaded composer.json // Check exclude from downloaded composer.json
$jsonFile = new JsonFile($sourcePath.'/composer.json'); if (file_exists($composerJsonPath = $sourcePath.'/composer.json')) {
$jsonFile = new JsonFile($composerJsonPath);
$jsonData = $jsonFile->read(); $jsonData = $jsonFile->read();
if (!empty($jsonData['archive']['exclude'])) { if (!empty($jsonData['archive']['exclude'])) {
$package->setArchiveExcludes($jsonData['archive']['exclude']); $package->setArchiveExcludes($jsonData['archive']['exclude']);
} }
} }
}
// Create the archive // Create the archive
$archivePath = $usableArchiver->archive($sourcePath, $target, $format, $package->getArchiveExcludes()); $archivePath = $usableArchiver->archive($sourcePath, $target, $format, $package->getArchiveExcludes());