public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Move construction of pool from repo set into a pool builder

Browse source 
Pool construction depends on the install request now, so only required
packages get loaded, add some structure for future asynchronously
loading composer repositories
This commit is contained in:
Nils Adermann 2018-09-12 11:49:09 +02:00
parent 4c7d271a36
commit c0f19f6c57
20 changed files with 357 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php
View file

@ -21,6 +21,7 @@ use Composer\Package\AliasPackage;
use Composer\Repository\RepositorySet;
use Composer\Semver\Constraint\Constraint;
use Composer\TestCase;
use http\Env\Request;
class DefaultPolicyTest extends TestCase
{
@ -47,7 +48,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA = $this->getPackage('A', '1.0'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA->getId());
$expected = array($packageA->getId());
@ -63,7 +64,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA2 = $this->getPackage('A', '2.0'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
@ -79,7 +80,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.1-alpha'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
@ -95,7 +96,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.1-alpha'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA1->getId());
@ -112,7 +113,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.0'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
@ -129,7 +130,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($this->repoInstalled);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA->getId(), $packageAInstalled->getId());
$expected = array($packageA->getId());
@ -150,7 +151,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($otherRepository);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA->getId(), $packageAImportant->getId());
$expected = array($packageAImportant->getId());
@ -173,7 +174,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($repo1);
$this->repositorySet->addRepository($repo2);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($package1->getId(), $package2->getId(), $package3->getId(), $package4->getId());
$expected = array($package2->getId());
@ -185,7 +186,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($repo2);
$this->repositorySet->addRepository($repo1);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$expected = array($package4->getId());
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
@ -209,7 +210,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($repoImportant);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$packages = $pool->whatProvides('a', new Constraint('=', '2.1.9999999.9999999-dev'));
$literals = array();
@ -234,7 +235,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackages(array('A', 'B'));
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
@ -253,7 +254,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackages(array('A', 'B'));
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
@ -274,7 +275,7 @@ class DefaultPolicyTest extends TestCase
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackages(array('vendor-a/replacer', 'vendor-b/replacer'));
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
@ -290,7 +291,7 @@ class DefaultPolicyTest extends TestCase
$repositorySet = new RepositorySet(array(), 'dev');
$repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackages(array('vendor-a/replacer', 'vendor-b/replacer'));
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
@ -317,7 +318,7 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA2 = $this->getPackage('A', '2.0'));
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->createPool();
$pool = $this->repositorySet->createPoolForPackage('A');
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA1->getId());

79
tests/Composer/Test/DependencyResolver/PoolTest.php
View file

@ -22,90 +22,25 @@ class PoolTest extends TestCase
public function testPool()
{
$pool = $this->createPool();
$repo = new ArrayRepository;
$package = $this->getPackage('foo', '1');
$repo->addPackage($package);
$pool->addRepository($repo);
$pool->setPackages(array($package));
$this->assertEquals(array($package), $pool->whatProvides('foo'));
$this->assertEquals(array($package), $pool->whatProvides('foo'));
}
public function testPoolIgnoresIrrelevantPackages()
{
$pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE), array('bar' => BasePackage::STABILITY_BETA));
$repo = new ArrayRepository;
$repo->addPackage($package = $this->getPackage('bar', '1'));
$repo->addPackage($betaPackage = $this->getPackage('bar', '1-beta'));
$repo->addPackage($alphaPackage = $this->getPackage('bar', '1-alpha'));
$repo->addPackage($package2 = $this->getPackage('foo', '1'));
$repo->addPackage($rcPackage2 = $this->getPackage('foo', '1rc'));
$pool->addRepository($repo);
$this->assertEquals(array($package, $betaPackage), $pool->whatProvides('bar'));
$this->assertEquals(array($package2), $pool->whatProvides('foo'));
}
/**
* @expectedException \RuntimeException
*/
public function testGetPriorityForNotRegisteredRepository()
{
$pool = $this->createPool();
$repository = new ArrayRepository;
$pool->getPriority($repository);
}
public function testGetPriorityWhenRepositoryIsRegistered()
{
$pool = $this->createPool();
$firstRepository = new ArrayRepository;
$pool->addRepository($firstRepository);
$secondRepository = new ArrayRepository;
$pool->addRepository($secondRepository);
$firstPriority = $pool->getPriority($firstRepository);
$secondPriority = $pool->getPriority($secondRepository);
$this->assertEquals(0, $firstPriority);
$this->assertEquals(-1, $secondPriority);
}
public function testWhatProvidesSamePackageForDifferentRepositories()
{
$pool = $this->createPool();
$firstRepository = new ArrayRepository;
$secondRepository = new ArrayRepository;
$firstPackage = $this->getPackage('foo', '1');
$secondPackage = $this->getPackage('foo', '1');
$thirdPackage = $this->getPackage('foo', '2');
$firstRepository->addPackage($firstPackage);
$secondRepository->addPackage($secondPackage);
$secondRepository->addPackage($thirdPackage);
$pool->addRepository($firstRepository);
$pool->addRepository($secondRepository);
$this->assertEquals(array($firstPackage, $secondPackage, $thirdPackage), $pool->whatProvides('foo'));
}
public function testWhatProvidesPackageWithConstraint()
{
$pool = $this->createPool();
$repository = new ArrayRepository;
$firstPackage = $this->getPackage('foo', '1');
$secondPackage = $this->getPackage('foo', '2');
$repository->addPackage($firstPackage);
$repository->addPackage($secondPackage);
$pool->addRepository($repository);
$pool->setPackages(array(
$firstPackage,
$secondPackage,
));
$this->assertEquals(array($firstPackage, $secondPackage), $pool->whatProvides('foo'));
$this->assertEquals(array($secondPackage), $pool->whatProvides('foo', $this->getVersionConstraint('==', '2')));
@ -114,11 +49,9 @@ class PoolTest extends TestCase
public function testPackageById()
{
$pool = $this->createPool();
$repository = new ArrayRepository;
$package = $this->getPackage('foo', '1');
$repository->addPackage($package);
$pool->addRepository($repository);
$pool->setPackages(array($package));
$this->assertSame($package, $pool->packageById(1));
}

17
tests/Composer/Test/DependencyResolver/RuleSetTest.php
View file

@ -22,13 +22,6 @@ use Composer\TestCase;
class RuleSetTest extends TestCase
{
protected $pool;
public function setUp()
{
$this->pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
}
public function testAdd()
{
$rules = array(
@ -146,9 +139,11 @@ class RuleSetTest extends TestCase
public function testPrettyString()
{
$repo = new ArrayRepository;
$repo->addPackage($p = $this->getPackage('foo', '2.1'));
$this->pool->addRepository($repo);
$pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
$pool->setPackages(array(
$p = $this->getPackage('foo', '2.1'),
));
$p->setId(1);
$ruleSet = new RuleSet;
$literal = $p->getId();
@ -156,7 +151,7 @@ class RuleSetTest extends TestCase
$ruleSet->add($rule, RuleSet::TYPE_JOB);
$this->assertContains('JOB : Install command rule (install foo 2.1)', $ruleSet->getPrettyString($this->pool));
$this->assertContains('JOB : Install command rule (install foo 2.1)', $ruleSet->getPrettyString($pool));
}
private function getRuleMock()

20
tests/Composer/Test/DependencyResolver/RuleTest.php
View file

@ -22,13 +22,6 @@ use Composer\TestCase;
class RuleTest extends TestCase
{
protected $pool;
public function setUp()
{
$this->pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
}
public function testGetHash()
{
$rule = new GenericRule(array(123), Rule::RULE_JOB_INSTALL, null);
@ -100,13 +93,16 @@ class RuleTest extends TestCase
public function testPrettyString()
{
$repo = new ArrayRepository;
$repo->addPackage($p1 = $this->getPackage('foo', '2.1'));
$repo->addPackage($p2 = $this->getPackage('baz', '1.1'));
$this->pool->addRepository($repo);
$pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
$pool->setPackages(array(
$p1 = $this->getPackage('foo', '2.1'),
$p2 = $this->getPackage('baz', '1.1'),
));
$p1->setId(1);
$p2->setId(2);
$rule = new GenericRule(array($p1->getId(), -$p2->getId()), Rule::RULE_JOB_INSTALL, null);
$this->assertEquals('Install command rule (don\'t install baz 1.1|install foo 2.1)', $rule->getPrettyString($this->pool));
$this->assertEquals('Install command rule (don\'t install baz 1.1|install foo 2.1)', $rule->getPrettyString($pool));
}
}

19
tests/Composer/Test/DependencyResolver/SolverTest.php
View file

@ -20,6 +20,7 @@ use Composer\DependencyResolver\Request;
use Composer\DependencyResolver\Solver;
use Composer\DependencyResolver\SolverProblemsException;
use Composer\Package\Link;
use Composer\Repository\InstalledArrayRepository;
use Composer\Repository\RepositorySet;
use Composer\TestCase;
use Composer\Semver\Constraint\MultiConstraint;
@ -31,12 +32,13 @@ class SolverTest extends TestCase
protected $repoInstalled;
protected $request;
protected $policy;
protected $solver;
public function setUp()
{
$this->repoSet = new RepositorySet(array());
$this->repo = new ArrayRepository;
$this->repoInstalled = new ArrayRepository;
$this->repoInstalled = new InstalledArrayRepository;
$this->request = new Request($this->repoSet);
$this->policy = new DefaultPolicy;
@ -71,6 +73,7 @@ class SolverTest extends TestCase
$this->request->install('B', $this->getVersionConstraint('==', '1'));
$this->createSolver();
try {
$transaction = $this->solver->solve($this->request);
$this->fail('Unsolvable conflict did not result in exception.');
@ -94,8 +97,6 @@ class SolverTest extends TestCase
$this->repoSet->addRepository($repo1);
$this->repoSet->addRepository($repo2);
$this->solver = new Solver($this->policy, $this->repoSet->createPool(), $this->repoInstalled, new NullIO());
$this->request->install('foo');
$this->checkSolverResult(array(
@ -447,6 +448,7 @@ class SolverTest extends TestCase
// must explicitly pick the provider, so error in this case
$this->setExpectedException('Composer\DependencyResolver\SolverProblemsException');
$this->createSolver();
$this->solver->solve($this->request);
}
@ -480,6 +482,7 @@ class SolverTest extends TestCase
$this->request->install('A');
$this->setExpectedException('Composer\DependencyResolver\SolverProblemsException');
$this->createSolver();
$this->solver->solve($this->request);
}
@ -652,6 +655,7 @@ class SolverTest extends TestCase
$this->setExpectedException('Composer\DependencyResolver\SolverProblemsException');
$this->createSolver();
$this->solver->solve($this->request);
}
@ -668,6 +672,7 @@ class SolverTest extends TestCase
$this->request->install('A');
$this->request->install('B');
$this->createSolver();
try {
$transaction = $this->solver->solve($this->request);
$this->fail('Unsolvable conflict did not result in exception.');
@ -697,6 +702,7 @@ class SolverTest extends TestCase
$this->request->install('A');
$this->createSolver();
try {
$transaction = $this->solver->solve($this->request);
$this->fail('Unsolvable conflict did not result in exception.');
@ -744,6 +750,7 @@ class SolverTest extends TestCase
$this->request->install('A');
$this->createSolver();
try {
$transaction = $this->solver->solve($this->request);
$this->fail('Unsolvable conflict did not result in exception.');
@ -843,12 +850,16 @@ class SolverTest extends TestCase
{
$this->repoSet->addRepository($this->repoInstalled);
$this->repoSet->addRepository($this->repo);
}
$this->solver = new Solver($this->policy, $this->repoSet->createPool(), $this->repoInstalled, new NullIO());
protected function createSolver()
{
$this->solver = new Solver($this->policy, $this->repoSet->createPool($this->request), $this->repoInstalled, new NullIO());
}
protected function checkSolverResult(array $expected)
{
$this->createSolver();
$transaction = $this->solver->solve($this->request);
$result = array();