From 5f4aa4f41603701733a174a2f97ae1e80477d8b2 Mon Sep 17 00:00:00 2001 From: Tristan Darricau <tristan.darricau@sensiolabs.com> Date: Sun, 27 Dec 2015 12:58:10 +0100 Subject: [PATCH] [ticket/11150] Uses PHPBB_VERSION, not the composer.json one PHPBB3-11150 --- phpBB/phpbb/composer/installer.php | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 6197b59bd5..74b874a507 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -547,28 +547,7 @@ class installer $core_deps[$package->getName()] = $package->getPrettyVersion(); } - $core_deps['phpbb/phpbb'] = $composer->getPackage()->getPrettyVersion(); - - return $core_deps; - } - - /** - * Get the core installed packages - * - * @param Composer $composer Composer object to load the dependencies - * @return array The core packages with their version - */ - protected function get_core_version(Composer $composer) - { - $core_deps = []; - $packages = $composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages(); - - foreach ($packages as $package) - { - $core_deps[$package->getName()] = $package->getPrettyVersion(); - } - - $core_deps['phpbb/phpbb'] = $composer->getPackage()->getPrettyVersion(); + $core_deps['phpbb/phpbb'] = PHPBB_VERSION; return $core_deps; }