mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 11:30:22 +02:00
Code Issues Releases Wiki Activity

[ticket/11150] Better version normalization

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2015-09-10 13:11:55 +02:00
committed by Tristan Darricau
parent ac129f34d3
commit 540bac3ba4
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/composer/installer.php
View File

@@ -118,7 +118,6 @@ class installer
// TODO Extract the precise error and use language string // TODO Extract the precise error and use language string
throw new \RuntimeException(substr($output, $error_pos)); throw new \RuntimeException(substr($output, $error_pos));
} }
} }
catch (\Exception $e) catch (\Exception $e)
{ {

10
phpBB/phpbb/composer/manager.php
View File

@@ -191,7 +191,15 @@ class manager implements manager_interface
{ {
if (is_numeric($package)) if (is_numeric($package))
{ {
$normalized_packages[$version] = '*'; if (strpos($version, ':') !== false)
{
$parts = explode(':', $version);
$normalized_packages[$parts[0]] = $parts[1];
}
else
{
$normalized_packages[$version] = '*';
}
} }
else else
{ {