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

[ticket/11150] Handle composer context transparently

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2017-04-21 23:11:17 +02:00
parent 69571f9cef
commit 5376f676bf
2 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_extensions.php
View File

@@ -172,13 +172,11 @@ class acp_extensions
/** @var \phpbb\composer\manager $composer_manager */
$composer_manager = $phpbb_container->get('ext.composer.manager');
$this->request->enable_super_globals();
$managed_packages = [];
if ($composer_manager->check_requirements())
{
$managed_packages = $composer_manager->get_managed_packages();
}
$this->request->disable_super_globals();
$this->list_enabled_exts($phpbb_extension_manager, $managed_packages);
$this->list_disabled_exts($phpbb_extension_manager, $managed_packages);
@@ -475,9 +473,7 @@ class acp_extensions
try
{
$this->request->enable_super_globals();
$composer_manager->install((array) $extension, $composer_io);
$this->request->disable_super_globals();
}
catch (\phpbb\exception\runtime_exception $e)
{
@@ -514,9 +510,7 @@ class acp_extensions
try
{
$this->request->enable_super_globals();
$composer_manager->remove((array) $extension, $composer_io);
$this->request->disable_super_globals();
}
catch (\phpbb\exception\runtime_exception $e)
{
@@ -553,9 +547,7 @@ class acp_extensions
try
{
$this->request->enable_super_globals();
$composer_manager->update((array) $extension, $composer_io);
$this->request->disable_super_globals();
}
catch (\phpbb\exception\runtime_exception $e)
{
@@ -592,9 +584,7 @@ class acp_extensions
try
{
$this->request->enable_super_globals();
$composer_manager->start_managing($extension, $composer_io);
$this->request->disable_super_globals();
}
catch (\phpbb\exception\runtime_exception $e)
{
@@ -684,10 +674,8 @@ class acp_extensions
$start = $this->request->variable('start', 0);
$base_url = $this->u_action;
$this->request->enable_super_globals();
$available_extensions = $manager->get_available_packages();
$managed_packages = $manager->get_managed_packages();
$this->request->disable_super_globals();
$extensions = array_slice($available_extensions, $start, 20);