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

Internalize pool creation in repository set, store root aliases in set

Browse source 
The pool is still exposed too early in a few places which will require
further refactoring
This commit is contained in:
Nils Adermann 2018-09-11 13:33:29 +02:00
parent 6ef65e5319
commit 1228bcdffc
17 changed files with 248 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,13 +18,14 @@ use Composer\DependencyResolver\DefaultPolicy;
use Composer\DependencyResolver\Pool;
use Composer\Package\Link;
use Composer\Package\AliasPackage;
use Composer\Repository\RepositorySet;
use Composer\Semver\Constraint\Constraint;
use Composer\TestCase;
class DefaultPolicyTest extends TestCase
{
/** @var Pool */
protected $pool;
/** @var RepositorySet */
protected $repositorySet;
/** @var ArrayRepository */
protected $repo;
/** @var ArrayRepository */
@ -34,7 +35,7 @@ class DefaultPolicyTest extends TestCase
public function setUp()
{
$this->pool = new Pool('dev');
$this->repositorySet = new RepositorySet(array(), 'dev');
$this->repo = new ArrayRepository;
$this->repoInstalled = new ArrayRepository;
@ -44,12 +45,14 @@ class DefaultPolicyTest extends TestCase
public function testSelectSingle()
{
$this->repo->addPackage($packageA = $this->getPackage('A', '1.0'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId());
$expected = array($packageA->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -58,12 +61,14 @@ class DefaultPolicyTest extends TestCase
{
$this->repo->addPackage($packageA1 = $this->getPackage('A', '1.0'));
$this->repo->addPackage($packageA2 = $this->getPackage('A', '2.0'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -72,12 +77,14 @@ class DefaultPolicyTest extends TestCase
{
$this->repo->addPackage($packageA1 = $this->getPackage('A', '1.0.0'));
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.1-alpha'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -86,13 +93,15 @@ class DefaultPolicyTest extends TestCase
{
$this->repo->addPackage($packageA1 = $this->getPackage('A', '1.0.0'));
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.1-alpha'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA1->getId());
$policy = new DefaultPolicy(true);
$selected = $policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -101,12 +110,14 @@ class DefaultPolicyTest extends TestCase
{
$this->repo->addPackage($packageA1 = $this->getPackage('A', 'dev-foo'));
$this->repo->addPackage($packageA2 = $this->getPackage('A', '1.0.0'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA2->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -115,13 +126,15 @@ class DefaultPolicyTest extends TestCase
{
$this->repo->addPackage($packageA = $this->getPackage('A', '2.0'));
$this->repoInstalled->addPackage($packageAInstalled = $this->getPackage('A', '1.0'));
$this->pool->addRepository($this->repoInstalled);
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repoInstalled);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageAInstalled->getId());
$expected = array($packageA->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, $this->mapFromRepo($this->repoInstalled), $literals);
$selected = $this->policy->selectPreferredPackages($pool, $this->mapFromRepo($this->repoInstalled), $literals);
$this->assertSame($expected, $selected);
}
@ -133,14 +146,16 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA = $this->getPackage('A', '1.0'));
$otherRepository->addPackage($packageAImportant = $this->getPackage('A', '1.0'));
$this->pool->addRepository($this->repoInstalled);
$this->pool->addRepository($otherRepository);
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repoInstalled);
$this->repositorySet->addRepository($otherRepository);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageAImportant->getId());
$expected = array($packageAImportant->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -155,21 +170,25 @@ class DefaultPolicyTest extends TestCase
$repo2->addPackage($package3 = $this->getPackage('A', '1.1'));
$repo2->addPackage($package4 = $this->getPackage('A', '1.2'));
$this->pool->addRepository($repo1);
$this->pool->addRepository($repo2);
$this->repositorySet->addRepository($repo1);
$this->repositorySet->addRepository($repo2);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($package1->getId(), $package2->getId(), $package3->getId(), $package4->getId());
$expected = array($package2->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
$this->pool = new Pool('dev');
$this->pool->addRepository($repo2);
$this->pool->addRepository($repo1);
$this->repositorySet = new RepositorySet(array(), 'dev');
$this->repositorySet->addRepository($repo2);
$this->repositorySet->addRepository($repo1);
$pool = $this->repositorySet->getPoolTemp();
$expected = array($package4->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -186,11 +205,13 @@ class DefaultPolicyTest extends TestCase
$repoImportant->addPackage($packageA2AliasImportant = new AliasPackage($packageA2Important, '2.1.9999999.9999999-dev', '2.1.x-dev'));
$packageAAliasImportant->setRootPackageAlias(true);
$this->pool->addRepository($this->repoInstalled);
$this->pool->addRepository($repoImportant);
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repoInstalled);
$this->repositorySet->addRepository($repoImportant);
$this->repositorySet->addRepository($this->repo);
$packages = $this->pool->whatProvides('a', new Constraint('=', '2.1.9999999.9999999-dev'));
$pool = $this->repositorySet->getPoolTemp();
$packages = $pool->whatProvides('a', new Constraint('=', '2.1.9999999.9999999-dev'));
$literals = array();
foreach ($packages as $package) {
$literals[] = $package->getId();
@ -198,7 +219,7 @@ class DefaultPolicyTest extends TestCase
$expected = array($packageAAliasImportant->getId());
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -211,12 +232,14 @@ class DefaultPolicyTest extends TestCase
$packageA->setProvides(array(new Link('A', 'X', new Constraint('==', '1.0'), 'provides')));
$packageB->setProvides(array(new Link('B', 'X', new Constraint('==', '1.0'), 'provides')));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -228,12 +251,14 @@ class DefaultPolicyTest extends TestCase
$packageB->setReplaces(array(new Link('B', 'A', new Constraint('==', '1.0'), 'replaces')));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}
@ -247,12 +272,14 @@ class DefaultPolicyTest extends TestCase
$packageA->setReplaces(array(new Link('vendor-a/replacer', 'vendor-a/package', new Constraint('==', '1.0'), 'replaces')));
$packageB->setReplaces(array(new Link('vendor-b/replacer', 'vendor-a/package', new Constraint('==', '1.0'), 'replaces')));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals, 'vendor-a/package');
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals, 'vendor-a/package');
$this->assertEquals($expected, $selected);
// test with reversed order in repo
@ -260,13 +287,15 @@ class DefaultPolicyTest extends TestCase
$repo->addPackage($packageA = clone $packageA);
$repo->addPackage($packageB = clone $packageB);
$pool = new Pool('dev');
$pool->addRepository($this->repo);
$repositorySet = new RepositorySet(array(), 'dev');
$repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA->getId(), $packageB->getId());
$expected = $literals;
$selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals, 'vendor-a/package');
$selected = $this->policy->selectPreferredPackages($pool, array(), $literals, 'vendor-a/package');
$this->assertSame($expected, $selected);
}
@ -286,12 +315,14 @@ class DefaultPolicyTest extends TestCase
$this->repo->addPackage($packageA1 = $this->getPackage('A', '1.0'));
$this->repo->addPackage($packageA2 = $this->getPackage('A', '2.0'));
$this->pool->addRepository($this->repo);
$this->repositorySet->addRepository($this->repo);
$pool = $this->repositorySet->getPoolTemp();
$literals = array($packageA1->getId(), $packageA2->getId());
$expected = array($packageA1->getId());
$selected = $policy->selectPreferredPackages($this->pool, array(), $literals);
$selected = $policy->selectPreferredPackages($pool, array(), $literals);
$this->assertSame($expected, $selected);
}

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

@ -21,7 +21,7 @@ class PoolTest extends TestCase
{
public function testPool()
{
$pool = new Pool;
$pool = $this->createPool();
$repo = new ArrayRepository;
$package = $this->getPackage('foo', '1');
@ -34,7 +34,7 @@ class PoolTest extends TestCase
public function testPoolIgnoresIrrelevantPackages()
{
$pool = new Pool('stable', array('bar' => BasePackage::STABILITY_BETA));
$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'));
@ -53,7 +53,7 @@ class PoolTest extends TestCase
*/
public function testGetPriorityForNotRegisteredRepository()
{
$pool = new Pool;
$pool = $this->createPool();
$repository = new ArrayRepository;
$pool->getPriority($repository);
@ -61,7 +61,7 @@ class PoolTest extends TestCase
public function testGetPriorityWhenRepositoryIsRegistered()
{
$pool = new Pool;
$pool = $this->createPool();
$firstRepository = new ArrayRepository;
$pool->addRepository($firstRepository);
$secondRepository = new ArrayRepository;
@ -76,7 +76,7 @@ class PoolTest extends TestCase
public function testWhatProvidesSamePackageForDifferentRepositories()
{
$pool = new Pool;
$pool = $this->createPool();
$firstRepository = new ArrayRepository;
$secondRepository = new ArrayRepository;
@ -96,7 +96,7 @@ class PoolTest extends TestCase
public function testWhatProvidesPackageWithConstraint()
{
$pool = new Pool;
$pool = $this->createPool();
$repository = new ArrayRepository;
$firstPackage = $this->getPackage('foo', '1');
@ -113,7 +113,7 @@ class PoolTest extends TestCase
public function testPackageById()
{
$pool = new Pool;
$pool = $this->createPool();
$repository = new ArrayRepository;
$package = $this->getPackage('foo', '1');
@ -125,8 +125,13 @@ class PoolTest extends TestCase
public function testWhatProvidesWhenPackageCannotBeFound()
{
$pool = new Pool;
$pool = $this->createPool();
$this->assertEquals(array(), $pool->whatProvides('foo'));
}
protected function createPool()
{
return new Pool(array('stable' => BasePackage::STABILITY_STABLE));
}
}

3
tests/Composer/Test/DependencyResolver/RuleSetIteratorTest.php
View file

@ -17,6 +17,7 @@ use Composer\DependencyResolver\Rule;
use Composer\DependencyResolver\RuleSet;
use Composer\DependencyResolver\RuleSetIterator;
use Composer\DependencyResolver\Pool;
use Composer\Package\BasePackage;
use PHPUnit\Framework\TestCase;
class RuleSetIteratorTest extends TestCase
@ -26,7 +27,7 @@ class RuleSetIteratorTest extends TestCase
protected function setUp()
{
$this->pool = new Pool;
$this->pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
$this->rules = array(
RuleSet::TYPE_JOB => array(

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

@ -16,6 +16,7 @@ use Composer\DependencyResolver\GenericRule;
use Composer\DependencyResolver\Rule;
use Composer\DependencyResolver\RuleSet;
use Composer\DependencyResolver\Pool;
use Composer\Package\BasePackage;
use Composer\Repository\ArrayRepository;
use Composer\TestCase;
@ -25,7 +26,7 @@ class RuleSetTest extends TestCase
public function setUp()
{
$this->pool = new Pool;
$this->pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
}
public function testAdd()

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

@ -16,6 +16,7 @@ use Composer\DependencyResolver\GenericRule;
use Composer\DependencyResolver\Rule;
use Composer\DependencyResolver\RuleSet;
use Composer\DependencyResolver\Pool;
use Composer\Package\BasePackage;
use Composer\Repository\ArrayRepository;
use Composer\TestCase;
@ -25,7 +26,7 @@ class RuleTest extends TestCase
public function setUp()
{
$this->pool = new Pool;
$this->pool = new Pool(array('stable' => BasePackage::STABILITY_STABLE));
}
public function testGetHash()

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

@ -34,7 +34,7 @@ class SolverTest extends TestCase
public function setUp()
{
$this->repoSet = new RepositorySet(new Pool);
$this->repoSet = new RepositorySet(array());
$this->repo = new ArrayRepository;
$this->repoInstalled = new ArrayRepository;