From 0645952af0ce02e22da9b0e4987aa16be40cb2f8 Mon Sep 17 00:00:00 2001 From: Thaddee Tyl Date: Fri, 20 Feb 2015 12:38:59 +0100 Subject: [PATCH] Disable packagist aliases See concerns raised here: https://github.com/badges/shields/pull/366#issuecomment-75206920 --- server.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index 36574fd..0d48d2c 100644 --- a/server.js +++ b/server.js @@ -821,15 +821,21 @@ cache(function(data, match, sendBadge, request) { // Map aliases (eg, dev-master). var aliasesMap = {}; - versions = versions.map(function(version) { + versions.forEach(function(version) { var versionData = versionsData[version]; if (versionData.extra && versionData.extra['branch-alias'] && versionData.extra['branch-alias'][version]) { // eg, version is 'dev-master', mapped to '2.0.x-dev'. var validVersion = versionData.extra['branch-alias'][version]; - aliasesMap[validVersion] = version; - return validVersion; - } else { return version; } + if (aliasesMap[validVersion] === undefined || + phpVersionCompare(aliasesMap[validVersion], validVersion) < 0) { + versions.push(validVersion); + aliasesMap[validVersion] = version; + } + } + }); + versions = versions.filter(function(version) { + return !(/^dev-/.test(version)); }); var badgeText = null; @@ -842,18 +848,18 @@ cache(function(data, match, sendBadge, request) { if (!stableVersion) { stableVersion = phpLatestVersion(versions); } - if (!!aliasesMap[stableVersion]) { - stableVersion = aliasesMap[stableVersion]; - } + //if (!!aliasesMap[stableVersion]) { + // stableVersion = aliasesMap[stableVersion]; + //} var vdata = versionColor(stableVersion); badgeText = vdata.version; badgeColor = vdata.color; break; case 'vpre': var unstableVersion = phpLatestVersion(versions); - if (!!aliasesMap[unstableVersion]) { - unstableVersion = aliasesMap[unstableVersion]; - } + //if (!!aliasesMap[unstableVersion]) { + // unstableVersion = aliasesMap[unstableVersion]; + //} var vdata = versionColor(unstableVersion); badgeText = vdata.version; badgeColor = 'orange';