2 files changed, 129 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/tool/config_text.php b/phpBB/phpbb/db/migration/tool/config_text.php
new file mode 100644
index 0000000000..bf8ac55023
--- /dev/null
+++ b/phpBB/phpbb/db/migration/tool/config_text.php
@@ -0,0 +1,125 @@
+<?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\db\migration\tool;
+
+/**
+* Migration config_text tool
+*/
+class config_text implements \phpbb\db\migration\tool\tool_interface
+{
+	/** @var \phpbb\config\db_text */
+	protected $config_text;
+
+	/**
+	* Constructor
+	*
+	* @param \phpbb\config\db_text $config_text
+	*/
+	public function __construct(\phpbb\config\db_text $config_text)
+	{
+		$this->config_text = $config_text;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_name()
+	{
+		return 'config_text';
+	}
+
+	/**
+	* Add a config_text setting.
+	*
+	* @param string $config_name The name of the config_text setting
+	* 	you would like to add
+	* @param mixed $config_value The value of the config_text setting
+	* @return null
+	*/
+	public function add($config_name, $config_value)
+	{
+		if (!is_null($this->config_text->get($config_name)))
+		{
+			return;
+		}
+
+		$this->config_text->set($config_name, $config_value);
+	}
+
+	/**
+	* Update an existing config_text setting.
+	*
+	* @param string $config_name The name of the config_text setting you would
+	* 	like to update
+	* @param mixed $config_value The value of the config_text setting
+	* @return null
+	* @throws \phpbb\db\migration\exception
+	*/
+	public function update($config_name, $config_value)
+	{
+		if (is_null($this->config_text->get($config_name)))
+		{
+			throw new \phpbb\db\migration\exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config_text->set($config_name, $config_value);
+	}
+
+	/**
+	* Remove an existing config_text setting.
+	*
+	* @param string $config_name The name of the config_text setting you would
+	* 	like to remove
+	* @return null
+	*/
+	public function remove($config_name)
+	{
+		if (is_null($this->config_text->get($config_name)))
+		{
+			return;
+		}
+
+		$this->config_text->delete($config_name);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function reverse()
+	{
+		$arguments = func_get_args();
+		$original_call = array_shift($arguments);
+
+		$call = false;
+		switch ($original_call)
+		{
+			case 'add':
+				$call = 'remove';
+			break;
+
+			case 'remove':
+				$call = 'add';
+				if (sizeof($arguments) == 1)
+				{
+					$arguments[] = '';
+				}
+			break;
+		}
+
+		if ($call)
+		{
+			return call_user_func_array(array(&$this, $call), $arguments);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index d2df27613a..5cfbc5ca00 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -105,6 +105,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	* @param string $auth_option The name of the permission (auth) option
 	* @param bool $global True for checking a global permission setting,
 	* 	False for a local permission setting
+	* @param int|false $copy_from If set, contains the id of the permission from which to copy the new one.
 	* @return null
 	*/
 	public function add($auth_option, $global = true, $copy_from = false)
@@ -243,7 +244,9 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	* Add a new permission role
 	*
 	* @param string $role_name The new role name
-	* @param sting $role_type The type (u_, m_, a_)
+	* @param string $role_type The type (u_, m_, a_)
+	* @param string $role_description Description of the new role
+	*
 	* @return null
 	*/
 	public function role_add($role_name, $role_type, $role_description = '')