[ticket/14492] Re-enable extensions if updated during update

PHPBB3-14492

phpBB/config/installer/container/services_install_finish.yml

@@ -7,7 +7,7 @@ services:
         tags:
             - { name: install_finish, order: 10 }
 
-    installer.install_finish.install_viglink:
+    installer.install_finish.install_extensions:
         class: phpbb\install\module\install_finish\task\install_extensions
         arguments:
             - '@installer.helper.container_factory'
@@ -41,4 +41,4 @@ services:
         arguments:
             - '@installer.module.install_finish_collection'
         tags:
-            - { name: installer_install_module, order: 60 }
+            - { name: installer_install_module, order: 80 }

phpBB/config/installer/container/services_update_database.yml

@@ -11,6 +11,17 @@ services:
         tags:
             - { name: update_database_task, order: 10 }
 
+    installer.update_database.update_extensions:
+        class: phpbb\install\module\update_database\task\update_extensions
+        arguments:
+            - '@installer.helper.container_factory'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+        tags:
+            - { name: update_database_task, order: 20 }
+
     installer.module.update_database_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
@@ -26,4 +37,4 @@ services:
             - true
             - false
         tags:
-            - { name: installer_update_module, order: 40 }
+            - { name: installer_update_module, order: 60 }

phpBB/language/en/install.php

@@ -458,6 +458,8 @@ $lang = array_merge($lang, array(
 	'STAGE_UPDATE_DATABASE'		=> 'Update database',
 
 	'INLINE_UPDATE_SUCCESSFUL'		=> 'The database update was successful.',
+
+	'TASK_UPDATE_EXTENSIONS'	=> 'Updating extensions',
 ));
 
 // Converter

phpBB/phpbb/install/module/install_finish/task/install_extensions.php

@@ -91,7 +91,6 @@ class install_extensions extends \phpbb\install\task_base
 	{
 		$this->user->session_begin();
 		$this->user->setup(array('common', 'acp/common', 'cli'));
-		$name = 'phpbb/viglink';
 
 		// Find available extensions
 		foreach ($this->finder as $file)
@@ -122,7 +121,7 @@ class install_extensions extends \phpbb\install\task_base
 	 */
 	static public function get_step_count()
 	{
-		return 1;
+		return 0;
 	}
 
 	/**

phpBB/phpbb/install/module/update_database/task/update_extensions.php

@@ -0,0 +1,162 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\install\module\update_database\task;
+
+use phpbb\install\helper\container_factory;
+use phpbb\install\helper\config;
+use phpbb\install\helper\iohandler\iohandler_interface;
+use phpbb\install\helper\update_helper;
+use phpbb\install\task_base;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Installs extensions that exist in ext folder upon install
+ */
+class enable_extensions extends task_base
+{
+	/**
+	 * @var config
+	 */
+	protected $install_config;
+
+	/**
+	 * @var iohandler_interface
+	 */
+	protected $iohandler;
+
+	/** @var update_helper */
+	protected $update_helper;
+
+	/**
+	 * @var \phpbb\config\db
+	 */
+	protected $config;
+
+	/**
+	 * @var \phpbb\log\log_interface
+	 */
+	protected $log;
+
+	/**
+	 * @var \phpbb\user
+	 */
+	protected $user;
+
+	/** @var \phpbb\extension\manager */
+	protected $extension_manager;
+
+	/** @var Finder */
+	protected $finder;
+
+	/**
+	 * Constructor
+	 *
+	 * @param container_factory			$container
+	 * @param config					$install_config
+	 * @param iohandler_interface		$iohandler
+	 * @param $update_helper			$update_helper
+	 * @param string					$phpbb_root_path phpBB root path
+	 */
+	public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler, update_helper $update_helper, $phpbb_root_path)
+	{
+		$this->install_config	= $install_config;
+		$this->iohandler		= $iohandler;
+
+		$this->log				= $container->get('log');
+		$this->user				= $container->get('user');
+		$this->extension_manager = $container->get('ext.manager');
+		$this->config			= $container->get('config');
+		$this->finder = new Finder();
+		$this->finder->in($phpbb_root_path . 'ext/')
+			->ignoreUnreadableDirs()
+			->depth('< 3')
+			->files()
+			->name('composer.json');
+
+		// Make sure asset version exists in config. Otherwise we might try to
+		// insert the assets_version setting into the database and cause a
+		// duplicate entry error.
+		if (!isset($this->config['assets_version']))
+		{
+			$this->config['assets_version'] = 0;
+		}
+
+		parent::__construct(true);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function run()
+	{
+		$this->user->session_begin();
+		$this->user->setup(array('common', 'acp/common', 'cli'));
+
+		$update_info = $this->install_config->get('update_info_unprocessed', array());
+
+		if (!empty($update_info))
+		{
+			// Find available extensions
+			foreach ($this->finder as $file)
+			{
+				/** @var \SplFileInfo $file */
+				$ext_name = preg_replace('#(.+ext[\\/\\\])#', '', dirname($file->getRealPath()));
+
+				// Skip extensions that were not added or updated during update
+				if (!count(preg_grep('#ext/' . $ext_name . '#', $update_info['files'])))
+				{
+					continue;
+				}
+
+				// Disable enabled extensions in order to run migrations if needed
+				if ($this->extension_manager->is_enabled($ext_name))
+				{
+					$this->extension_manager->disable($ext_name);
+				}
+
+				if ($this->extension_manager->is_available($ext_name))
+				{
+					$this->extension_manager->enable($ext_name);
+					$this->extension_manager->load_extensions();
+
+					if (!$this->extension_manager->is_enabled($ext_name))
+					{
+						// Create log
+						$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
+					}
+				}
+				else
+				{
+					$this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
+				}
+			}
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	static public function get_step_count()
+	{
+		return 0;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get_task_lang_name()
+	{
+		return 'TASK_UPDATE_EXTENSIONS';
+	}
+}