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

Prevent CompositeRepository instances from being nested

pull/1186/merge
Jordi Boggiano 2012-10-22 14:29:34 +02:00
parent fef3dacdfb
commit 1760b1e093
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Repository/CompositeRepository.php
View File

@ -33,7 +33,10 @@ class CompositeRepository implements RepositoryInterface
*/ */
public function __construct(array $repositories) public function __construct(array $repositories)
{ {
$this->repositories = $repositories; $this->repositories = array();
foreach ($repositories as $repo) {
$this->addRepository($repo);
}
} }
/** /**
@ -150,6 +153,12 @@ class CompositeRepository implements RepositoryInterface
*/ */
public function addRepository(RepositoryInterface $repository) public function addRepository(RepositoryInterface $repository)
{ {
if ($repository instanceof self) {
foreach ($repository->getRepositories() as $repo) {
$this->addRepository($repo);
}
} else {
$this->repositories[] = $repository; $this->repositories[] = $repository;
} }
} }
}