mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
[ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
This commit is contained in:
@@ -240,6 +240,69 @@ class version_helper
|
||||
return $update_info === null ? array() : $update_info;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the latest extension update for the current phpBB branch the user is on
|
||||
* Will suggest versions from newer branches when EoL has been reached
|
||||
* and/or version from newer branch is needed for having all known security
|
||||
* issues fixed.
|
||||
*
|
||||
* @param bool $force_update Ignores cached data. Defaults to false.
|
||||
* @param bool $force_cache Force the use of the cache. Override $force_update.
|
||||
* @return array Version info or empty array if there are no updates
|
||||
* @throws \RuntimeException
|
||||
*/
|
||||
public function get_ext_update_on_branch($force_update = false, $force_cache = false)
|
||||
{
|
||||
$versions = $this->get_versions_matching_stability($force_update, $force_cache);
|
||||
|
||||
$self = $this;
|
||||
$current_version = $this->current_version;
|
||||
|
||||
// Get current phpBB branch from version, e.g.: 3.2
|
||||
preg_match('/^(\d+\.\d+).*$/', $this->config['version'], $matches);
|
||||
$current_branch = $matches[1];
|
||||
|
||||
// Filter out any versions less than the current version
|
||||
$versions = array_filter($versions, function($data) use ($self, $current_version) {
|
||||
return $self->compare($data['current'], $current_version, '>=');
|
||||
});
|
||||
|
||||
// Filter out any phpbb branches less than the current version
|
||||
$branches = array_filter(array_keys($versions), function($branch) use ($self, $current_branch) {
|
||||
return $self->compare($branch, $current_branch, '>=');
|
||||
});
|
||||
if (!empty($branches))
|
||||
{
|
||||
$versions = array_intersect_key($versions, array_flip($branches));
|
||||
}
|
||||
else
|
||||
{
|
||||
// If branches are empty, it means the current phpBB branch is newer than any branch the
|
||||
// extension was validated against. Reverse sort the versions array so we get the newest
|
||||
// validated release available.
|
||||
krsort($versions);
|
||||
}
|
||||
|
||||
// Get the first available version from the previous list.
|
||||
$update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) {
|
||||
if ($value === null && $self->compare($data['current'], $current_version, '>='))
|
||||
{
|
||||
if (!$data['eol'] && (!$data['security'] || $self->compare($data['security'], $data['current'], '<=')))
|
||||
{
|
||||
return $self->compare($data['current'], $current_version, '>') ? $data : array();
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return $value;
|
||||
});
|
||||
|
||||
return $update_info === null ? array() : $update_info;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the latest version information
|
||||
*
|
||||
|
Reference in New Issue
Block a user