makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17336] Correctly handle aliased packages

Browse source 
PHPBB-17336

Signed-off-by: Matt Friedman <maf675@gmail.com>
This commit is contained in:
Matt Friedman 2024-06-11 07:04:01 -07:00
parent ec34f72a3b
commit d8aa3f05e5
No known key found for this signature in database
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/phpbb/composer/installer.php
View file

@ -22,7 +22,9 @@ use Composer\IO\NullIO;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Json\JsonValidationException; use Composer\Json\JsonValidationException;
use Composer\Package\BasePackage; use Composer\Package\BasePackage;
use Composer\Package\CompleteAliasPackage;
use Composer\Package\CompletePackage; use Composer\Package\CompletePackage;
use Composer\Package\Version\VersionParser;
use Composer\PartialComposer; use Composer\PartialComposer;
use Composer\Repository\ComposerRepository; use Composer\Repository\ComposerRepository;
use Composer\Semver\Constraint\ConstraintInterface; use Composer\Semver\Constraint\ConstraintInterface;
@ -390,23 +392,25 @@ class installer
foreach ($compatible_packages as $name => $versions) foreach ($compatible_packages as $name => $versions)
{ {
// Determine the highest version of the package // Determine the highest version of the package
/** @var CompletePackage $highest_version */ /** @var CompletePackage|CompleteAliasPackage $highest_version */
$highest_version = null; $highest_version = null;
/** @var CompletePackage $version */ /** @var CompletePackage|CompleteAliasPackage $version */
foreach ($versions as $version) foreach ($versions as $version)
{ {
if (strpos($version->getVersion(), '9999999') === 0)
{
continue;
}
if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>')) if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>'))
{ {
$highest_version = $version; $highest_version = $version;
} }
} }
// If highest version is DEFAULT_BRANCH_ALIAS (9999999-dev), then it's a non-numeric dev branch handled by
// an Alias, so we need to get the actual package being aliased in order to show the true non-numeric version.
if ($highest_version->getVersion() === VersionParser::DEFAULT_BRANCH_ALIAS)
{
$highest_version = $highest_version->getAliasOf();
}
// Generates the entry // Generates the entry
$available[$name] = []; $available[$name] = [];
$available[$name]['name'] = $highest_version->getPrettyName(); $available[$name]['name'] = $highest_version->getPrettyName();