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

Added packagist repository as the last repository with the lowest priority

pull/393/head
Martin Hasoň 2012-03-06 10:14:11 +01:00
parent 2b08df5192
commit 9021c86237
2 changed files with 91 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Composer/Factory.php
View File

@ -78,17 +78,7 @@ class Factory
$rm = $this->createRepositoryManager($io);
// load default repository unless it's explicitly disabled
$loadPackagist = true;
if (isset($packageConfig['repositories'])) {
foreach ($packageConfig['repositories'] as $repo) {
if (isset($repo['packagist']) && $repo['packagist'] === false) {
$loadPackagist = false;
}
}
}
if ($loadPackagist) {
$this->addPackagistRepository($rm);
}
$packageConfig = $this->addPackagistRepository($packageConfig);
// load local repository
$this->addLocalRepository($rm, $vendorDir);
@ -134,9 +124,32 @@ class Factory
$rm->setLocalRepository(new Repository\InstalledFilesystemRepository(new JsonFile($vendorDir.'/.composer/installed.json')));
}
protected function addPackagistRepository(RepositoryManager $rm)
protected function addPackagistRepository(array $packageConfig)
{
$rm->addRepository(new Repository\ComposerRepository(array('url' => 'http://packagist.org')));
$loadPackagist = true;
$packagistConfig = array(
'type' => 'composer',
'url' => 'http://packagist.org'
);
if (isset($packageConfig['repositories'])) {
foreach ($packageConfig['repositories'] as $key => $repo) {
if (isset($repo['packagist'])) {
if (true === $repo['packagist']) {
$packageConfig['repositories'][$key] = $packagistConfig;
}
$loadPackagist = false;
}
}
} else {
$packageConfig['repositories'] = array();
}
if ($loadPackagist) {
$packageConfig['repositories'][] = $packagistConfig;
}
return $packageConfig;
}
protected function createDownloadManager(IOInterface $io)

65
tests/Composer/Test/FactoryTest.php Normal file
View File

@ -0,0 +1,65 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test;
use Composer\Factory;
class FactoryTest extends \PHPUnit_Framework_TestCase
{
/**
* @dataProvider dataAddPackagistRepository
*/
public function testAddPackagistRepository($expected, $config)
{
$factory = new Factory();
$ref = new \ReflectionMethod($factory, 'addPackagistRepository');
$ref->setAccessible(true);
$this->assertEquals($expected, $ref->invoke($factory, $config));
}
public function dataAddPackagistRepository()
{
$f = function() {
$repositories = func_get_args();
return array('repositories' => $repositories);
};
$data = array();
$data[] = array(
$f(array('type' => 'composer', 'url' => 'http://packagist.org')),
$f()
);
$data[] = array(
$f(array('packagist' => false)),
$f(array('packagist' => false))
);
$data[] = array(
$f(
array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'),
array('type' => 'composer', 'url' => 'http://packagist.org'),
array('type' => 'pear', 'url' => 'http://pear.composer.org')
),
$f(
array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'),
array('packagist' => true),
array('type' => 'pear', 'url' => 'http://pear.composer.org')
)
);
return $data;
}
}