makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14492] Rework logic for selecting which extensions to update

Browse source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-03-02 13:54:02 +01:00
parent 930b02342e
commit f604e1ab5d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 54 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
phpBB/phpbb/install/module/update_database/task/update_extensions.php
View file

@ -24,7 +24,7 @@ use Symfony\Component\Finder\Finder;
/** /**
* Installs extensions that exist in ext folder upon install * Installs extensions that exist in ext folder upon install
*/ */
class enable_extensions extends task_base class update_extensions extends task_base
{ {
/** /**
* @var config * @var config
@ -66,6 +66,14 @@ class enable_extensions extends task_base
/** @var \phpbb\db\driver\driver_interface */ /** @var \phpbb\db\driver\driver_interface */
protected $db; protected $db;
/**
* @var array List of default extensions to update, grouped by version
* they were added
*/
private $default_update = [
'3.2.0-b2' => ['phpbb/viglink']
];
/** /**
* Constructor * Constructor
* *
@ -112,47 +120,66 @@ class enable_extensions extends task_base
$this->user->session_begin(); $this->user->session_begin();
$this->user->setup(array('common', 'acp/common', 'cli')); $this->user->setup(array('common', 'acp/common', 'cli'));
$input = new ArgvInput(); $update_info = $this->install_config->get('update_info_unprocessed', []);
$update_extensions = explode(',', $input->getArgument('update-extensions'));
$update_info = $this->install_config->get('update_info_unprocessed', array()); if (empty($update_info))
if (!empty($update_info))
{ {
// Find available extensions return;
foreach ($this->finder as $file) }
$update_extensions = $this->iohandler->get_input('update-extensions', []);
// Create list of default extensions that need to be enabled in update
$default_update_extensions = [];
foreach ($this->default_update as $version => $extensions)
{
if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '<'))
{ {
/** @var \SplFileInfo $file */ $default_update_extensions = array_merge($default_update_extensions, $extensions);
$ext_name = preg_replace('#(.+[\\/\\\]ext[\\/\\\])(\w+)[\\/\\\](\w+)#', '$2/$3', dirname($file->getRealPath())); }
}
// Skip extensions that were not added or updated during update // Find available extensions
if (!count(preg_grep('#ext/' . $ext_name . '#', $update_info['files'])) && foreach ($this->finder as $file)
!in_array($ext_name, $update_extensions) && $ext_name !== 'phpbb/viglink') {
{ /** @var \SplFileInfo $file */
continue; $ext_name = preg_replace('#(.+[\\/\\\]ext[\\/\\\])(\w+)[\\/\\\](\w+)#', '$2/$3', dirname($file->getRealPath()));
}
// Disable enabled extensions in order to run migrations if needed // Update extensions if:
if ($this->extension_manager->is_enabled($ext_name)) // 1) Extension is currently enabled
// 2) Extension was implicitly defined as needing an update
// 3) Extension was newly added as default phpBB extension in
// this update and should be enabled by default.
if ($this->extension_manager->is_available($ext_name) &&
(
$this->extension_manager->is_enabled($ext_name) ||
in_array($ext_name, $update_extensions) ||
in_array($ext_name, $default_update_extensions)
))
{
$extension_enabled = $this->extension_manager->is_enabled($ext_name);
if ($extension_enabled)
{ {
$this->extension_manager->disable($ext_name); $this->extension_manager->disable($ext_name);
} }
$this->extension_manager->enable($ext_name);
$extensions = $this->get_extensions();
if ($this->extension_manager->is_available($ext_name)) if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active'])
{ {
$this->extension_manager->enable($ext_name); // Create log
$extensions = $this->get_extensions(); $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active'])
{
// Create log
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
}
} }
else else
{ {
$this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name)); $this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
} }
// Disable extensions if it was disabled by the admin before
if (!$extension_enabled && !in_array($ext_name, $default_update_extensions))
{
$this->extension_manager->disable($ext_name);
}
} }
} }
} }