From 2e204b016187c1ce4a50021fc127ff19ea5c650e Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 20 Feb 2019 11:10:44 +0100
Subject: [PATCH] Remove support for the first version of the compression algo
 (#7906)

---
 src/Composer/Package/Loader/ArrayLoader.php   | 31 +++----------------
 .../Repository/ComposerRepository.php         | 24 +++-----------
 2 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/src/Composer/Package/Loader/ArrayLoader.php b/src/Composer/Package/Loader/ArrayLoader.php
index c5edd0d68..511f6c7ca 100644
--- a/src/Composer/Package/Loader/ArrayLoader.php
+++ b/src/Composer/Package/Loader/ArrayLoader.php
@@ -62,39 +62,16 @@ class ArrayLoader implements LoaderInterface
 
     public function loadPackages(array $versions, $class)
     {
-        static $uniqKeys = array('version', 'version_normalized', 'source', 'dist', 'time');
-
         $packages = array();
         $linkCache = array();
 
         foreach ($versions as $version) {
-            if (isset($version['versions'])) {
-                $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);
+            $package = $this->createObject($version, $class);
 
-                    $this->configureCachedLinks($linkCache, $package, $unpackedVersion);
-                    $package = $this->configureObject($package, $unpackedVersion);
+            $this->configureCachedLinks($linkCache, $package, $version);
+            $package = $this->configureObject($package, $version);
 
-                    $packages[] = $package;
-                }
-            } else {
-                $package = $this->createObject($version, $class);
-
-                $this->configureCachedLinks($linkCache, $package, $version);
-                $package = $this->configureObject($package, $version);
-
-                $packages[] = $package;
-            }
+            $packages[] = $package;
         }
 
         return $packages;
diff --git a/src/Composer/Repository/ComposerRepository.php b/src/Composer/Repository/ComposerRepository.php
index 8d0d8c3a4..ccb14f622 100644
--- a/src/Composer/Repository/ComposerRepository.php
+++ b/src/Composer/Repository/ComposerRepository.php
@@ -645,28 +645,14 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
                         unset($expanded, $expandedVersion, $versionData);
                     }
 
-                    static $uniqKeys = array('version', 'version_normalized', 'source', 'dist', 'time');
                     $versionsToLoad = array();
                     foreach ($versions as $version) {
-                        if (isset($version['version_normalizeds'])) {
-                            foreach ($version['version_normalizeds'] as $index => $normalizedVersion) {
-                                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 (!isset($version['version_normalized'])) {
+                            $version['version_normalized'] = $repo->versionParser->normalize($version['version']);
+                        }
 
-                            if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $version['version_normalized'])) {
-                                $versionsToLoad[] = $version;
-                            }
+                        if ($repo->isVersionAcceptable($isPackageAcceptableCallable, $constraint, $realName, $version['version_normalized'])) {
+                            $versionsToLoad[] = $version;
                         }
                     }