Remove support for the first version of the compression algo (#7906)

main
Jordi Boggiano 5 years ago committed by GitHub
parent 177f21ec5c
commit 2e204b0161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -62,39 +62,16 @@ class ArrayLoader implements LoaderInterface
public function loadPackages(array $versions, $class) public function loadPackages(array $versions, $class)
{ {
static $uniqKeys = array('version', 'version_normalized', 'source', 'dist', 'time');
$packages = array(); $packages = array();
$linkCache = array(); $linkCache = array();
foreach ($versions as $version) { foreach ($versions as $version) {
if (isset($version['versions'])) { $package = $this->createObject($version, $class);
$baseVersion = $version;
foreach ($uniqKeys as $key) {
unset($baseVersion[$key.'s']);
}
foreach ($version['versions'] as $index => $dummy) {
$unpackedVersion = $baseVersion;
foreach ($uniqKeys as $key) {
$unpackedVersion[$key] = $version[$key.'s'][$index];
}
$package = $this->createObject($unpackedVersion, $class);
$this->configureCachedLinks($linkCache, $package, $unpackedVersion); $this->configureCachedLinks($linkCache, $package, $version);
$package = $this->configureObject($package, $unpackedVersion); $package = $this->configureObject($package, $version);
$packages[] = $package; $packages[] = $package;
}
} else {
$package = $this->createObject($version, $class);
$this->configureCachedLinks($linkCache, $package, $version);
$package = $this->configureObject($package, $version);
$packages[] = $package;
}
} }
return $packages; return $packages;

@ -645,28 +645,14 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
unset($expanded, $expandedVersion, $versionData); unset($expanded, $expandedVersion, $versionData);
} }
static $uniqKeys = array('version', 'version_normalized', 'source', 'dist', 'time');
$versionsToLoad = array(); $versionsToLoad = array();
foreach ($versions as $version) { foreach ($versions as $version) {
if (isset($version['version_normalizeds'])) { if (!isset($version['version_normalized'])) {
foreach ($version['version_normalizeds'] as $index => $normalizedVersion) { $version['version_normalized'] = $repo->versionParser->normalize($version['version']);
if (!$repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $normalizedVersion)) { }
foreach ($uniqKeys as $key) {
unset($version[$key.'s'][$index]);
}
}
}
if (count($version['version_normalizeds'])) {
$versionsToLoad[] = $version;
}
} else {
if (!isset($version['version_normalized'])) {
$version['version_normalized'] = $repo->versionParser->normalize($version['version']);
}
if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $version['version_normalized'])) { if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $version['version_normalized'])) {
$versionsToLoad[] = $version; $versionsToLoad[] = $version;
}
} }
} }

Loading…
Cancel
Save