mirror of
https://github.com/composer/composer
synced 2025-05-09 00:22:53 +00:00
Put a higher prio on replacers of the same vendor as the required package
This commit is contained in:
parent
19bfd6c713
commit
db4055b778
5 changed files with 90 additions and 8 deletions
|
@ -16,6 +16,7 @@ use Composer\Repository\ArrayRepository;
|
|||
use Composer\Repository\RepositoryInterface;
|
||||
use Composer\DependencyResolver\DefaultPolicy;
|
||||
use Composer\DependencyResolver\Pool;
|
||||
use Composer\DependencyResolver\Rule;
|
||||
use Composer\Package\Link;
|
||||
use Composer\Package\AliasPackage;
|
||||
use Composer\Package\LinkConstraint\VersionConstraint;
|
||||
|
@ -177,7 +178,6 @@ class DefaultPolicyTest extends TestCase
|
|||
|
||||
public function testPreferNonReplacingFromSameRepo()
|
||||
{
|
||||
|
||||
$this->repo->addPackage($packageA = $this->getPackage('A', '1.0'));
|
||||
$this->repo->addPackage($packageB = $this->getPackage('B', '2.0'));
|
||||
|
||||
|
@ -193,6 +193,32 @@ class DefaultPolicyTest extends TestCase
|
|||
$this->assertEquals($expected, $selected);
|
||||
}
|
||||
|
||||
public function testPreferReplacingPackageFromSameVendor()
|
||||
{
|
||||
$this->repo->addPackage($packageB = $this->getPackage('vendor-b/replacer', '1.0'));
|
||||
$this->repo->addPackage($packageA = $this->getPackage('vendor-a/replacer', '1.0'));
|
||||
|
||||
$packageA->setReplaces(array(new Link('vendor-a/replacer', 'vendor-a/package', new VersionConstraint('==', '1.0'), 'replaces')));
|
||||
$packageB->setReplaces(array(new Link('vendor-b/replacer', 'vendor-a/package', new VersionConstraint('==', '1.0'), 'replaces')));
|
||||
|
||||
$this->pool->addRepository($this->repo);
|
||||
|
||||
$literals = array($packageA->getId(), $packageB->getId());
|
||||
$expected = $literals;
|
||||
|
||||
// test with install rule
|
||||
$rule = new Rule($this->pool, $literals, Rule::RULE_JOB_INSTALL, 'vendor-a/package');
|
||||
$selected = $this->policy->selectPreferedPackages($this->pool, array(), $literals, $rule);
|
||||
|
||||
$this->assertEquals($expected, $selected);
|
||||
|
||||
// test with requires rule
|
||||
$rule = new Rule($this->pool, $literals, Rule::RULE_PACKAGE_REQUIRES, new Link('foo', 'vendor-a/package'));
|
||||
$selected = $this->policy->selectPreferedPackages($this->pool, array(), $literals, $rule);
|
||||
|
||||
$this->assertEquals($expected, $selected);
|
||||
}
|
||||
|
||||
protected function mapFromRepo(RepositoryInterface $repo)
|
||||
{
|
||||
$map = array();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue