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

Merge pull request #2482 from oziks/fix-composer-archive-property 

Check exclude from downloaded composer.json
pull/2483/head
Jordi Boggiano 2013-12-05 07:29:59 -08:00
parent f346274f9a ca7cb68dd5
commit 43fde9177e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ use Composer\Downloader\DownloadManager;
use Composer\Package\PackageInterface;
use Composer\Package\RootPackage;
use Composer\Util\Filesystem;
use Composer\Json\JsonFile;
/**
* @author Matthieu Moquet <matthieu@moquet.net>
@ -141,6 +142,13 @@ class ArchiveManager
// Download sources
$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']);
}
}
// Create the archive

4
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -79,13 +79,13 @@ class ArchiveManagerTest extends ArchiverTest
throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput());
}
$result = file_put_contents('b', 'a');
$result = file_put_contents('composer.json', '{"name":"faker/faker", "description": "description", "license": "MIT"}');
if (false === $result) {
chdir($currentWorkDir);
throw new \RuntimeException('Could not save file.');
}
$result = $this->process->execute('git add b && git commit -m "commit b" -q', $output, $this->testDir);
$result = $this->process->execute('git add composer.json && git commit -m "commit composer.json" -q', $output, $this->testDir);
if ($result > 0) {
chdir($currentWorkDir);
throw new \RuntimeException('Could not commit: '.$this->process->getErrorOutput());