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

Merge pull request #2496 from oziks/fix-exclude 

Fix error on check exclude from download composer.json
pull/2528/merge
Jordi Boggiano 2013-12-26 01:23:24 -08:00
parent fb72d26def a300e1d45b
commit bcb5e38bcb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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