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

Fix implementation of whatProvides for older provider-only repos

pull/7904/head
Jordi Boggiano 2019-01-14 15:30:55 +01:00
parent 4b7658a2a8
commit fd5c5ff6bc
3 changed files with 24 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -95,7 +95,6 @@ class ArrayLoader implements LoaderInterface
$packages[] = $package;
}
}
return $packages;

92
src/Composer/Repository/ComposerRepository.php
View File

@ -49,10 +49,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
protected $providersUrl;
protected $lazyProvidersUrl;
protected $providerListing;
private $providers = array();
private $providersByUid = array();
protected $loader;
private $rootAliases;
private $allowSslDowngrade = false;
private $eventDispatcher;
private $sourceMirrors;
@ -116,11 +113,6 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
return $this->repoConfig;
}
public function setRootAliases(array $rootAliases)
{
$this->rootAliases = $rootAliases;
}
/**
* {@inheritDoc}
*/
@ -378,10 +370,6 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
*/
private function whatProvides($name, $isPackageAcceptableCallable = null)
{
if (isset($this->providers[$name])) {
return $this->providers[$name];
}
if (!$this->hasPartialPackages() || !isset($this->partialPackagesByName[$name])) {
// skip platform packages, root package and composer-plugin-api
if (preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $name) || '__root__' === $name || 'composer-plugin-api' === $name) {
@ -449,9 +437,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$loadingPartialPackage = true;
}
$this->providers[$name] = array();
$result = array();
$versionsToLoad = array();
foreach ($packages['packages'] as $versions) {
$versionsToLoad = array();
foreach ($versions as $version) {
$normalizedName = strtolower($version['name']);
@ -464,70 +452,34 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
continue;
}
// avoid loading the same objects twice
if (isset($this->providersByUid[$version['uid']])) {
// skip if already assigned
if (!isset($this->providers[$name][$version['uid']])) {
// expand alias in two packages
if ($this->providersByUid[$version['uid']] instanceof AliasPackage) {
$this->providers[$name][$version['uid']] = $this->providersByUid[$version['uid']]->getAliasOf();
$this->providers[$name][$version['uid'].'-alias'] = $this->providersByUid[$version['uid']];
} else {
$this->providers[$name][$version['uid']] = $this->providersByUid[$version['uid']];
}
// check for root aliases
if (isset($this->providersByUid[$version['uid'].'-root'])) {
$this->providers[$name][$version['uid'].'-root'] = $this->providersByUid[$version['uid'].'-root'];
}
}
} else {
if (!isset($versionsToLoad[$version['uid']])) {
if ($isPackageAcceptableCallable && !call_user_func($isPackageAcceptableCallable, $normalizedName, VersionParser::parseStability($version['version']))) {
continue;
}
$versionsToLoad[] = $version;
}
}
// load acceptable packages in the providers
$loadedPackages = $this->createPackages($versionsToLoad, 'Composer\Package\CompletePackage');
foreach ($loadedPackages as $package) {
$package->setRepository($this);
if ($package instanceof AliasPackage) {
$aliased = $package->getAliasOf();
$aliased->setRepository($this);
$this->providers[$name][$version['uid']] = $aliased;
$this->providers[$name][$version['uid'].'-alias'] = $package;
// override provider with its alias so it can be expanded in the if block above
$this->providersByUid[$version['uid']] = $package;
} else {
$this->providers[$name][$version['uid']] = $package;
$this->providersByUid[$version['uid']] = $package;
}
// handle root package aliases
unset($rootAliasData);
if (isset($this->rootAliases[$package->getName()][$package->getVersion()])) {
$rootAliasData = $this->rootAliases[$package->getName()][$package->getVersion()];
} elseif ($package instanceof AliasPackage && isset($this->rootAliases[$package->getName()][$package->getAliasOf()->getVersion()])) {
$rootAliasData = $this->rootAliases[$package->getName()][$package->getAliasOf()->getVersion()];
}
if (isset($rootAliasData)) {
$alias = $this->createAliasPackage($package, $rootAliasData['alias_normalized'], $rootAliasData['alias']);
$alias->setRepository($this);
$this->providers[$name][$version['uid'].'-root'] = $alias;
$this->providersByUid[$version['uid'].'-root'] = $alias;
$versionsToLoad[$version['uid']] = $version;
}
}
}
$result = $this->providers[$name];
// load acceptable packages in the providers
$loadedPackages = $this->createPackages($versionsToLoad, 'Composer\Package\CompletePackage');
$uids = array_keys($versionsToLoad);
foreach ($loadedPackages as $index => $package) {
$package->setRepository($this);
$uid = $uids[$index];
if ($package instanceof AliasPackage) {
$aliased = $package->getAliasOf();
$aliased->setRepository($this);
$result[$uid] = $aliased;
$result[$uid.'-alias'] = $package;
} else {
$result[$uid] = $package;
}
}
return $result;
}

13
tests/Composer/Test/Repository/ComposerRepositoryTest.php
View File

@ -146,21 +146,12 @@ class ComposerRepositoryTest extends TestCase
)));
$versionParser = new VersionParser();
$repo->setRootAliases(array(
'a' => array(
$versionParser->normalize('0.6') => array('alias' => 'dev-feature', 'alias_normalized' => $versionParser->normalize('dev-feature')),
$versionParser->normalize('1.1.x-dev') => array('alias' => '1.0', 'alias_normalized' => $versionParser->normalize('1.0')),
),
));
$reflMethod = new \ReflectionMethod($repo, 'whatProvides');
$reflMethod->setAccessible(true);
$packages = $reflMethod->invoke($repo, 'a', array($this, 'isPackageAcceptableReturnTrue'));
$this->assertCount(7, $packages);
$this->assertEquals(array('1', '1-alias', '2', '2-alias', '2-root', '3', '3-root'), array_keys($packages));
$this->assertInstanceOf('Composer\Package\AliasPackage', $packages['2-root']);
$this->assertSame($packages['2'], $packages['2-root']->getAliasOf());
$this->assertCount(5, $packages);
$this->assertEquals(array('1', '1-alias', '2', '2-alias', '3'), array_keys($packages));
$this->assertSame($packages['2'], $packages['2-alias']->getAliasOf());
}