8 files changed, 553 insertions, 30 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v318rc1.php b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php
new file mode 100644
index 0000000000..8bae95c7d6
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php
@@ -0,0 +1,32 @@
+<?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\data\v31x;
+
+class v318rc1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\increase_size_of_dateformat',
+			'\phpbb\db\migration\data\v31x\v317pl1',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.8-RC1')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php
new file mode 100644
index 0000000000..65e5b3fa73
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php
@@ -0,0 +1,361 @@
+<?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\data\v320;
+
+class default_data_type_ids extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v320\v320a2',
+			'\phpbb\db\migration\data\v320\oauth_states',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'acl_users'			=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'attachments'			=> array(
+					'attach_id'		=> array('ULINT', null, 'auto_increment'),
+					'post_msg_id'	=> array('ULINT', 0),
+					'poster_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'banlist'				=> array(
+					'ban_id'		=> array('ULINT', null, 'auto_increment'),
+					'ban_userid'	=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'bookmarks'			=> array(
+					'topic_id'		=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'bots'				=> array(
+					'bot_id'		=> array('ULINT', null, 'auto_increment'),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'drafts'				=> array(
+					'draft_id'		=> array('ULINT', null, 'auto_increment'),
+					'user_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'forums'				=> array(
+					'forum_last_post_id'	=> array('ULINT', 0),
+					'forum_last_poster_id'	=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'forums_access'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'forums_track'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'forums_watch'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'log'					=> array(
+					'log_id'		=> array('ULINT', null, 'auto_increment'),
+					'post_id'		=> array('ULINT', 0),
+					'reportee_id'	=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'login_attempts'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'moderator_cache'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'oauth_accounts'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'oauth_states'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'oauth_tokens'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'poll_options'		=> array(
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'poll_votes'			=> array(
+					'topic_id'		=> array('ULINT', 0),
+					'vote_user_id'	=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'posts'				=> array(
+					'post_id'			=> array('ULINT', null, 'auto_increment'),
+					'poster_id'			=> array('ULINT', 0),
+					'post_delete_user'	=> array('ULINT', 0),
+					'post_edit_user'	=> array('ULINT', 0),
+					'topic_id'			=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'privmsgs'			=> array(
+					'author_id'			=> array('ULINT', 0),
+					'message_edit_user'	=> array('ULINT', 0),
+					'msg_id'			=> array('ULINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'privmsgs_folder'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'privmsgs_rules'		=> array(
+					'rule_user_id'	=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'privmsgs_to'			=> array(
+					'author_id'		=> array('ULINT', 0),
+					'msg_id'		=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'profile_fields_data'	=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'reports'				=> array(
+					'report_id'		=> array('ULINT', 0),
+					'pm_id'			=> array('ULINT', 0),
+					'post_id'		=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'search_wordlist'		=> array(
+					'word_id'		=> array('ULINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'search_wordmatch'	=> array(
+					'post_id'		=> array('ULINT', 0),
+					'word_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'sessions'			=> array(
+					'session_user_id'	=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'sessions_keys'		=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'topics'				=> array(
+					'topic_id'				=> array('ULINT', null, 'auto_increment'),
+					'topic_poster'			=> array('ULINT', 0),
+					'topic_first_post_id'	=> array('ULINT', 0),
+					'topic_last_post_id'	=> array('ULINT', 0),
+					'topic_last_poster_id'	=> array('ULINT', 0),
+					'topic_moved_id'		=> array('ULINT', 0),
+					'topic_delete_user'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'topics_track'		=> array(
+					'user_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'topics_posted'		=> array(
+					'user_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'topics_watch'		=> array(
+					'user_id'		=> array('ULINT', 0),
+					'topic_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'item_id'		=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'user_group'			=> array(
+					'user_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'users'				=> array(
+					'user_id'		=> array('ULINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'warnings'			=> array(
+					'log_id'		=> array('ULINT', 0),
+					'user_id'		=> array('ULINT', 0),
+					'post_id'		=> array('ULINT', 0),
+				),
+				$this->table_prefix . 'words'				=> array(
+					'word_id'		=> array('ULINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'zebra'			=> array(
+					'user_id'		=> array('ULINT', 0),
+					'zebra_id'		=> array('ULINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'acl_users'			=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'attachments'			=> array(
+					'attach_id'		=> array('UINT', null, 'auto_increment'),
+					'post_msg_id'	=> array('UINT', 0),
+					'poster_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'banlist'				=> array(
+					'ban_id'		=> array('UINT', null, 'auto_increment'),
+					'ban_userid'	=> array('UINT', 0),
+				),
+				$this->table_prefix . 'bookmarks'			=> array(
+					'topic_id'		=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'bots'				=> array(
+					'bot_id'		=> array('UINT', null, 'auto_increment'),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'drafts'				=> array(
+					'draft_id'		=> array('UINT', null, 'auto_increment'),
+					'user_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'forums'				=> array(
+					'forum_last_post_id'	=> array('UINT', 0),
+					'forum_last_poster_id'	=> array('UINT', 0),
+				),
+				$this->table_prefix . 'forums_access'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'forums_track'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'forums_watch'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'log'					=> array(
+					'log_id'		=> array('UINT', null, 'auto_increment'),
+					'post_id'		=> array('UINT', 0),
+					'reportee_id'	=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'login_attempts'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'moderator_cache'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'oauth_accounts'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'oauth_states'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'oauth_tokens'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'poll_options'		=> array(
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'poll_votes'			=> array(
+					'topic_id'		=> array('UINT', 0),
+					'vote_user_id'	=> array('UINT', 0),
+				),
+				$this->table_prefix . 'posts'				=> array(
+					'post_id'			=> array('UINT', null, 'auto_increment'),
+					'poster_id'			=> array('UINT', 0),
+					'post_delete_user'	=> array('UINT', 0),
+					'post_edit_user'	=> array('UINT', 0),
+					'topic_id'			=> array('UINT', 0),
+				),
+				$this->table_prefix . 'privmsgs'			=> array(
+					'author_id'			=> array('UINT', 0),
+					'message_edit_user'	=> array('UINT', 0),
+					'msg_id'			=> array('UINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'privmsgs_folder'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'privmsgs_rules'		=> array(
+					'rule_user_id'	=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'privmsgs_to'			=> array(
+					'author_id'		=> array('UINT', 0),
+					'msg_id'		=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'profile_fields_data'	=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'reports'				=> array(
+					'report_id'		=> array('UINT', 0),
+					'pm_id'			=> array('UINT', 0),
+					'post_id'		=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'search_wordlist'		=> array(
+					'word_id'		=> array('UINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'search_wordmatch'	=> array(
+					'post_id'		=> array('UINT', 0),
+					'word_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'sessions'			=> array(
+					'session_user_id'	=> array('UINT', 0),
+				),
+				$this->table_prefix . 'sessions_keys'		=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'topics'				=> array(
+					'topic_id'				=> array('UINT', null, 'auto_increment'),
+					'topic_poster'			=> array('UINT', 0),
+					'topic_first_post_id'	=> array('UINT', 0),
+					'topic_last_post_id'	=> array('UINT', 0),
+					'topic_last_poster_id'	=> array('UINT', 0),
+					'topic_moved_id'		=> array('UINT', 0),
+					'topic_delete_user'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'topics_track'		=> array(
+					'user_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'topics_posted'		=> array(
+					'user_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'topics_watch'		=> array(
+					'user_id'		=> array('UINT', 0),
+					'topic_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'item_id'		=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'user_group'			=> array(
+					'user_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'users'				=> array(
+					'user_id'		=> array('UINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'warnings'			=> array(
+					'log_id'		=> array('UINT', 0),
+					'user_id'		=> array('UINT', 0),
+					'post_id'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'words'				=> array(
+					'word_id'		=> array('UINT', null, 'auto_increment'),
+				),
+				$this->table_prefix . 'zebra'			=> array(
+					'user_id'		=> array('UINT', 0),
+					'zebra_id'		=> array('UINT', 0),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php b/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php
new file mode 100644
index 0000000000..d61f6b96fd
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php
@@ -0,0 +1,31 @@
+<?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\data\v320;
+
+class remote_upload_validation extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v320\v320a2',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('remote_upload_verify', '0')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v320/text_reparser.php b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
index 1d73b74a76..ea614feb40 100644
--- a/phpBB/phpbb/db/migration/data/v320/text_reparser.php
+++ b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
@@ -17,7 +17,10 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
 {
 	static public function depends_on()
 	{
-		return array('\phpbb\db\migration\data\v310\contact_admin_form');
+		return array(
+			'\phpbb\db\migration\data\v310\contact_admin_form',
+			'\phpbb\db\migration\data\v320\allowed_schemes_links',
+		);
 	}
 
 	public function effectively_installed()
@@ -78,7 +81,7 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
 			$end = max(1, $resume_data['current']);
 			$reparser->reparse_range($start, $end);
 
-			$processed_records = $end - $start + 1;
+			$processed_records += $end - $start + 1;
 			$resume_data['current'] = $start - 1;
 
 			if ($start === 1)
diff --git a/phpBB/phpbb/db/migration/data/v320/v320b1.php b/phpBB/phpbb/db/migration/data/v320/v320b1.php
new file mode 100644
index 0000000000..5c3a3797cd
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/v320b1.php
@@ -0,0 +1,39 @@
+<?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\data\v320;
+
+class v320b1 extends \phpbb\db\migration\container_aware_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.2.0-b1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\v317pl1',
+			'\phpbb\db\migration\data\v320\v320a2',
+			'\phpbb\db\migration\data\v31x\increase_size_of_dateformat',
+			'\phpbb\db\migration\data\v320\default_data_type_ids',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.2.0-b1')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php
index 2304c8e44c..4e218344f4 100644
--- a/phpBB/phpbb/db/migration/migration.php
+++ b/phpBB/phpbb/db/migration/migration.php
@@ -20,7 +20,7 @@ namespace phpbb\db\migration;
 * in a subclass. This class provides various utility methods to simplify editing
 * a phpBB.
 */
-abstract class migration
+abstract class migration implements migration_interface
 {
 	/** @var \phpbb\config\config */
 	protected $config;
@@ -70,9 +70,7 @@ abstract class migration
 	}
 
 	/**
-	* Defines other migrations to be applied first
-	*
-	* @return array An array of migration class names
+	* {@inheritdoc}
 	*/
 	static public function depends_on()
 	{
@@ -80,14 +78,7 @@ abstract class migration
 	}
 
 	/**
-	* Allows you to check if the migration is effectively installed (entirely optional)
-	*
-	* This is checked when a migration is installed. If true is returned, the migration will be set as
-	* installed without performing the database changes.
-	* This function is intended to help moving to migrations from a previous database updater, where some
-	* migrations may have been installed already even though they are not yet listed in the migrations table.
-	*
-	* @return bool True if this migration is installed, False if this migration is not installed (checked on install)
+	* {@inheritdoc}
 	*/
 	public function effectively_installed()
 	{
@@ -95,9 +86,7 @@ abstract class migration
 	}
 
 	/**
-	* Updates the database schema by providing a set of change instructions
-	*
-	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
+	* {@inheritdoc}
 	*/
 	public function update_schema()
 	{
@@ -105,9 +94,7 @@ abstract class migration
 	}
 
 	/**
-	* Reverts the database schema by providing a set of change instructions
-	*
-	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
+	* {@inheritdoc}
 	*/
 	public function revert_schema()
 	{
@@ -115,9 +102,7 @@ abstract class migration
 	}
 
 	/**
-	* Updates data by returning a list of instructions to be executed
-	*
-	* @return array Array of data update instructions
+	* {@inheritdoc}
 	*/
 	public function update_data()
 	{
@@ -125,12 +110,7 @@ abstract class migration
 	}
 
 	/**
-	* Reverts data by returning a list of instructions to be executed
-	*
-	* @return array Array of data instructions that will be performed on revert
-	* 	NOTE: calls to tools (such as config.add) are automatically reverted when
-	* 		possible, so you should not attempt to revert those, this is mostly for
-	* 		otherwise unrevertable calls (custom functions for example)
+	* {@inheritdoc}
 	*/
 	public function revert_data()
 	{
diff --git a/phpBB/phpbb/db/migration/migration_interface.php b/phpBB/phpbb/db/migration/migration_interface.php
new file mode 100644
index 0000000000..2aba5ec608
--- /dev/null
+++ b/phpBB/phpbb/db/migration/migration_interface.php
@@ -0,0 +1,70 @@
+<?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;
+
+/**
+ * Base class interface for database migrations
+ */
+interface migration_interface
+{
+	/**
+	 * Defines other migrations to be applied first
+	 *
+	 * @return array An array of migration class names
+	 */
+	static public function depends_on();
+
+	/**
+	 * Allows you to check if the migration is effectively installed (entirely optional)
+	 *
+	 * This is checked when a migration is installed. If true is returned, the migration will be set as
+	 * installed without performing the database changes.
+	 * This function is intended to help moving to migrations from a previous database updater, where some
+	 * migrations may have been installed already even though they are not yet listed in the migrations table.
+	 *
+	 * @return bool True if this migration is installed, False if this migration is not installed (checked on install)
+	 */
+	public function effectively_installed();
+
+	/**
+	 * Updates the database schema by providing a set of change instructions
+	 *
+	 * @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
+	 */
+	public function update_schema();
+
+	/**
+	 * Reverts the database schema by providing a set of change instructions
+	 *
+	 * @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
+	 */
+	public function revert_schema();
+
+	/**
+	 * Updates data by returning a list of instructions to be executed
+	 *
+	 * @return array Array of data update instructions
+	 */
+	public function update_data();
+
+	/**
+	 * Reverts data by returning a list of instructions to be executed
+	 *
+	 * @return array Array of data instructions that will be performed on revert
+	 * 	NOTE: calls to tools (such as config.add) are automatically reverted when
+	 * 		possible, so you should not attempt to revert those, this is mostly for
+	 * 		otherwise unrevertable calls (custom functions for example)
+	 */
+	public function revert_data();
+}
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index 7003844bc4..c579e25824 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -77,8 +77,15 @@ class schema_generator
 		$check_dependencies = true;
 		while (!empty($migrations))
 		{
-			foreach ($migrations as $migration_class)
+			foreach ($migrations as $key => $migration_class)
 			{
+				// Unset classes that are not a valid migration
+				if (\phpbb\db\migrator::is_migration($migration_class) === false)
+				{
+					unset($migrations[$key]);
+					continue;
+				}
+
 				$open_dependencies = array_diff($migration_class::depends_on(), $tree);
 
 				if (empty($open_dependencies))