mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00
Code Issues Releases Wiki Activity

[ticket/11150] Do not override extensions installed manually

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2015-09-09 23:35:14 +02:00
committed by Tristan Darricau
parent fbb85e2f4f
commit ac129f34d3
9 changed files with 180 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,8 @@ class installer
{
$this->generate_ext_json_file($packages);
putenv('COMPOSER_VENDOR_DIR=' . $this->root_path . '/' . $this->packages_vendor_dir);
$original_vendor_dir = getenv('COMPOSER_VENDOR_DIR');
putenv('COMPOSER_VENDOR_DIR=' . $this->root_path . $this->packages_vendor_dir);
$io = new BufferIO('', OutputInterface::VERBOSITY_DEBUG);
$composer = Factory::create($io, $this->get_composer_ext_json_filename(), false);
@@ -123,6 +124,10 @@ class installer
{
throw new runtime_exception('Cannot install packages', [], $e);
}
finally
{
putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
}
}
/**
@@ -134,10 +139,12 @@ class installer
*/
public function get_installed_packages($type)
{
$original_vendor_dir = getenv('COMPOSER_VENDOR_DIR');
try
{
$io = new NullIO();
putenv('COMPOSER_VENDOR_DIR=' . $this->root_path . '/' . $this->packages_vendor_dir);
putenv('COMPOSER_VENDOR_DIR=' . $this->root_path . $this->packages_vendor_dir);
$composer = Factory::create($io, $this->get_composer_ext_json_filename(), false);
$installed = [];
@@ -157,6 +164,10 @@ class installer
{
return [];
}
finally
{
putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
}
}
/**