From 540bac3ba425196d914dce1b74df7eb2880ea00c Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 10 Sep 2015 13:11:55 +0200 Subject: [PATCH] [ticket/11150] Better version normalization PHPBB3-11150 --- phpBB/phpbb/composer/installer.php | 1 - phpBB/phpbb/composer/manager.php | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 7256e82d3a..5c3bf712e7 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -118,7 +118,6 @@ class installer // TODO Extract the precise error and use language string throw new \RuntimeException(substr($output, $error_pos)); } - } catch (\Exception $e) { diff --git a/phpBB/phpbb/composer/manager.php b/phpBB/phpbb/composer/manager.php index 4ade6e24a0..6f087ea19d 100644 --- a/phpBB/phpbb/composer/manager.php +++ b/phpBB/phpbb/composer/manager.php @@ -191,7 +191,15 @@ class manager implements manager_interface { 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 {