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] Check extension compatibility correctly

Browse source 
PHPBB-17336

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

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

@ -24,9 +24,11 @@ use Composer\Json\JsonValidationException;
use Composer\Package\BasePackage; use Composer\Package\BasePackage;
use Composer\Package\CompleteAliasPackage; use Composer\Package\CompleteAliasPackage;
use Composer\Package\CompletePackage; use Composer\Package\CompletePackage;
use Composer\Package\PackageInterface;
use Composer\PartialComposer; use Composer\PartialComposer;
use Composer\Repository\ComposerRepository; use Composer\Repository\ComposerRepository;
use Composer\Semver\Constraint\ConstraintInterface; use Composer\Semver\Constraint\ConstraintInterface;
use Composer\Semver\VersionParser;
use Composer\Util\HttpDownloader; use Composer\Util\HttpDownloader;
use phpbb\composer\io\null_io; use phpbb\composer\io\null_io;
use phpbb\config\config; use phpbb\config\config;
@ -353,7 +355,7 @@ class installer
$downloader = new HttpDownloader($io, $composer_config); $downloader = new HttpDownloader($io, $composer_config);
$json = $downloader->get($url)->getBody(); $json = $downloader->get($url)->getBody();
/** @var \Composer\Package\PackageInterface $package */ /** @var PackageInterface $package */
foreach (JsonFile::parseJson($json, $url)['packageNames'] as $package) foreach (JsonFile::parseJson($json, $url)['packageNames'] as $package)
{ {
$versions = $repository->findPackages($package); $versions = $repository->findPackages($package);
@ -365,7 +367,7 @@ class installer
{ {
// Pre-filter repo packages by their type // Pre-filter repo packages by their type
$packages = []; $packages = [];
/** @var \Composer\Package\PackageInterface $package */ /** @var PackageInterface $package */
foreach ($repository->getPackages() as $package) foreach ($repository->getPackages() as $package)
{ {
if ($package->getType() === $type) if ($package->getType() === $type)
@ -476,21 +478,35 @@ class installer
{ {
$core_stability_value = BasePackage::$stabilities[$core_stability]; $core_stability_value = BasePackage::$stabilities[$core_stability];
/** @var \Composer\Package\PackageInterface $version */ /** @var PackageInterface $version */
foreach ($versions as $version) foreach ($versions as $version)
{ {
try try
{ {
// Check stability first to avoid unnecessary operations
if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value) if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value)
{ {
continue; continue;
} }
if (array_key_exists('phpbb/phpbb', $version->getRequires())) $requires = $version->getRequires();
{ $extra = $version->getExtra();
/** @var ConstraintInterface $package_constraint */
$package_constraint = $version->getRequires()['phpbb/phpbb']->getConstraint();
// Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'requires'
if (isset($requires['phpbb/phpbb']))
{
$package_constraint = $requires['phpbb/phpbb']->getConstraint();
if (!$package_constraint->matches($core_constraint))
{
continue;
}
}
// Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'soft-require'
if (isset($extra['soft-require']['phpbb/phpbb']))
{
$version_parser = new VersionParser();
$package_constraint = $version_parser->parseConstraints($extra['soft-require']['phpbb/phpbb']);
if (!$package_constraint->matches($core_constraint)) if (!$package_constraint->matches($core_constraint))
{ {
continue; continue;