Skip to content

Fix composer installers from overwriting author intent #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2025
+46 −3
Merged

Fix composer installers from overwriting author intent #407

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e9d08
Only update composer/installers as needed
iMattPro Oct 2, 2025
a60c693
Improve constraint checking logic
iMattPro Oct 2, 2025
1596214
Chech submission branch too if writing comp-installers
iMattPro Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 46 additions & 3 deletions contribution/extension/type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ protected function repack(package $package, \titania_contribution $contrib, \tit

$ext_name = $data['name'];
$data['type'] = 'phpbb-extension';
$data = $this->update_phpbb_requirement($data);
$data = $this->update_phpbb_requirement($data, $revision);
$data = $this->set_version_check($data, $contrib);

$data = json_encode(
Expand Down Expand Up @@ -352,9 +352,10 @@ protected function set_version_check(array $data, \titania_contribution $contrib
* Updates phpBB requirements in composer.json
*
* @param array $data composer.json data
* @param \titania_revision $revision
* @return array Returns $data array with phpBB requirement updated
*/
protected function update_phpbb_requirement(array $data)
protected function update_phpbb_requirement(array $data, \titania_revision $revision)
{
if (!isset($data['require']['phpbb/phpbb']))
{
Expand All @@ -371,7 +372,15 @@ protected function update_phpbb_requirement(array $data)
}

// Composer installers must be required by all extensions in order to be installed correctly
$data['require']['composer/installers'] = '~1.0.0';
if (!isset($data['require']['composer/installers']))
{
$installers_version = '~1.0';
if ($this->is_phpbb_4_branch($revision) || (isset($data['require']['phpbb/phpbb']) && $this->requires_phpbb_4($data['require']['phpbb/phpbb'])))
{
$installers_version = '^1.0 || ^2.0';
}
$data['require']['composer/installers'] = $installers_version;
}

return $data;
}
Expand All @@ -387,6 +396,40 @@ protected function is_stable_version($version)
return preg_match('#^\d+\.\d+\.\d+(-pl\d+)?$#i', $version) === 1 && phpbb_version_compare($version, '1.0.0', '>=');
}

/**
* Check if phpBB requires 4.0.0 or higher
*
* @param string $constraint Version constraint
* @return bool True if constraint requires phpBB 4.0.0+
*/
protected function requires_phpbb_4($constraint)
{
try
{
$parser = new \Composer\Semver\VersionParser();
$constraint_obj = $parser->parseConstraints($constraint);
$phpbb4_constraint = $parser->parseConstraints('>=4.0.0');
$phpbb3_constraint = $parser->parseConstraints('<4.0.0');
// Check if constraint allows 4.0.0+ and excludes all versions below 4.0.0
return $constraint_obj->matches($phpbb4_constraint) && !$constraint_obj->matches($phpbb3_constraint);
}
catch (\Exception $e)
{
return false;
}
}

/**
* Check if revision is submitted to phpBB 4.0+ branch
*
* @param \titania_revision $revision
* @return bool True if submitted to phpBB 4.0+ branch
*/
protected function is_phpbb_4_branch(\titania_revision $revision)
{
return max(array_column($revision->phpbb_versions, 'phpbb_version_branch')) >= 40;
}

/**
* Get prevalidator
*
Expand Down