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

Fix loading of dev providers, refs #6415

pull/7906/head^2
Jordi Boggiano 2019-02-20 10:51:07 +01:00
parent ff82334124
commit 177f21ec5c
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -591,8 +591,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
foreach ($packageNames as $name => $constraint) { foreach ($packageNames as $name => $constraint) {
$name = strtolower($name); $name = strtolower($name);
$realName = preg_replace('{~dev$}', '', $name);
// skip platform packages, root package and composer-plugin-api // skip platform packages, root package and composer-plugin-api
if (preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $name) || '__root__' === $name || 'composer-plugin-api' === $name) { if (preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $realName) || '__root__' === $realName || 'composer-plugin-api' === $realName) {
continue; continue;
} }
@ -606,16 +607,16 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
$promises[] = $this->asyncFetchFile($url, $cacheKey, $lastModified) $promises[] = $this->asyncFetchFile($url, $cacheKey, $lastModified)
->then(function ($response) use (&$packages, $contents, $name, $constraint, $repo, $isPackageAcceptableCallable) { ->then(function ($response) use (&$packages, $contents, $realName, $constraint, $repo, $isPackageAcceptableCallable) {
if (true === $response) { if (true === $response) {
$response = $contents; $response = $contents;
} }
if (!isset($response['packages'][$name])) { if (!isset($response['packages'][$realName])) {
return; return;
} }
$versions = $response['packages'][$name]; $versions = $response['packages'][$realName];
if (isset($response['minified']) && $response['minified'] === 'composer/2.0') { if (isset($response['minified']) && $response['minified'] === 'composer/2.0') {
// TODO extract in other method // TODO extract in other method
@ -649,7 +650,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
foreach ($versions as $version) { foreach ($versions as $version) {
if (isset($version['version_normalizeds'])) { if (isset($version['version_normalizeds'])) {
foreach ($version['version_normalizeds'] as $index => $normalizedVersion) { foreach ($version['version_normalizeds'] as $index => $normalizedVersion) {
if (!$repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $name, $normalizedVersion)) { if (!$repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $normalizedVersion)) {
foreach ($uniqKeys as $key) { foreach ($uniqKeys as $key) {
unset($version[$key.'s'][$index]); unset($version[$key.'s'][$index]);
} }
@ -663,7 +664,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$version['version_normalized'] = $repo->versionParser->normalize($version['version']); $version['version_normalized'] = $repo->versionParser->normalize($version['version']);
} }
if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $name, $version['version_normalized'])) { if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $version['version_normalized'])) {
$versionsToLoad[] = $version; $versionsToLoad[] = $version;
} }
} }