5 files changed, 245 insertions, 55 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
new file mode 100644
index 0000000000..f749b32119
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
@@ -0,0 +1,122 @@
+<?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\v310;
+
+class notifications_use_full_name extends \phpbb\db\migration\migration
+{
+	protected $notification_types = array(
+		'admin_activate_user',
+		'approve_post',
+		'approve_topic',
+		'bookmark',
+		'disapprove_post',
+		'disapprove_topic',
+		'group_request',
+		'group_request_approved',
+		'pm',
+		'post',
+		'post_in_queue',
+		'quote',
+		'report_pm',
+		'report_pm_closed',
+		'report_post',
+		'report_post_closed',
+		'topic',
+		'topic_in_queue');
+
+	protected $notification_methods = array(
+		'email',
+		'jabber',
+	);
+
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_notifications_name'))),
+			array('custom', array(array($this, 'update_notifications_method_name'))),
+		);
+	}
+
+	public function revert_data()
+	{
+		return array(
+			array('custom', array(array($this, 'revert_notifications_name'))),
+			array('custom', array(array($this, 'revert_notifications_method_name'))),
+		);
+	}
+
+	public function update_notifications_method_name()
+	{
+		foreach ($this->notification_methods as $notification_method)
+		{
+			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+				SET method = 'notification.method.{$notification_method}'
+				WHERE method = '{$notification_method}'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function revert_notifications_method_name()
+	{
+		foreach ($this->notification_methods as $notification_method)
+		{
+			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+				SET method = '{$notification_method}'
+				WHERE method = 'notification.method.{$notification_method}'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function update_notifications_name()
+	{
+		$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . '
+			SET notification_type_enabled = 0
+			WHERE ' . $this->db->sql_in_set('notification_type_name', $this->notification_types, true);
+		$this->db->sql_query($sql);
+
+		foreach ($this->notification_types as $notification_type)
+		{
+			$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "
+				SET notification_type_name = 'notification.type.{$notification_type}'
+				WHERE notification_type_name = '{$notification_type}'";
+			$this->db->sql_query($sql);
+
+			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+				SET item_type = 'notification.type.{$notification_type}'
+				WHERE item_type = '{$notification_type}'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function revert_notifications_name()
+	{
+		foreach ($this->notification_types as $notification_type)
+		{
+			$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "
+				SET notification_type_name = '{$notification_type}'
+				WHERE notification_type_name = 'notification.type.{$notification_type}'";
+			$this->db->sql_query($sql);
+
+			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+				SET item_type = '{$notification_type}'
+				WHERE item_type = 'notification.type.{$notification_type}'";
+			$this->db->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_field_validation_length.php b/phpBB/phpbb/db/migration/data/v310/profilefield_field_validation_length.php
new file mode 100644
index 0000000000..c7d8b2dc91
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/profilefield_field_validation_length.php
@@ -0,0 +1,90 @@
+<?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\v310;
+
+class profilefield_field_validation_length extends \phpbb\db\migration\migration
+{
+	protected $validation_options_old = array(
+		'ALPHA_SPACERS'		=> '[\w_\+\. \-\[\]]+',
+	);
+
+	protected $validation_options_new = array(
+		'ALPHA_SPACERS'		=> '[\w\x20_+\-\[\]]+',
+	);
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\rc3',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'profile_fields'			=> array(
+					'field_validation'	=> array('VCHAR_UNI:64', ''),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'profile_fields'			=> array(
+					'field_validation'	=> array('VCHAR_UNI:20', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_profile_fields_validation'))),
+		);
+	}
+
+	public function revert_data()
+	{
+		return array(
+			array('custom', array(array($this, 'revert_profile_fields_validation'))),
+		);
+	}
+
+	public function update_profile_fields_validation()
+	{
+		foreach ($this->validation_options_new as $validation_type => $regex)
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "profile_fields
+				SET field_validation = '" . $this->db->sql_escape($this->validation_options_new[$validation_type]) . "'
+				WHERE field_validation = '" . $this->db->sql_escape($this->validation_options_old[$validation_type]) . "'";
+			$this->sql_query($sql);
+		}
+	}
+
+	public function revert_profile_fields_validation()
+	{
+		foreach ($this->validation_options_new as $validation_type => $regex)
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "profile_fields
+				SET field_validation = '" . $this->db->sql_escape($this->validation_options_old[$validation_type]) . "'
+				WHERE field_validation = '" . $this->db->sql_escape($this->validation_options_new[$validation_type]) . "'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/rc4.php b/phpBB/phpbb/db/migration/data/v310/rc4.php
new file mode 100644
index 0000000000..47de8291c1
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/rc4.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\v310;
+
+class rc4 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\rc3',
+			'\phpbb\db\migration\data\v310\notifications_use_full_name',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.0-RC4')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 8bc63e564a..44bea3c5d2 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -715,60 +715,6 @@ class migrator
 	}
 
 	/**
-	* Load migration data files from a directory
-	*
-	* @param \phpbb\finder $finder
-	* @param string $path Path to migration data files
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	* @throws \phpbb\db\migration\exception
-	*/
-	public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new \phpbb\db\migration\exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-
-	/**
 	* Creates the migrations table if it does not exist.
 	* @return null
 	*/
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 3567570137..0781d7425e 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1512,7 +1512,7 @@ class tools
 					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
 				}
 
-				if (!is_null($column_data[1]))
+				if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment'))
 				{
 					$sql .= 'NOT NULL';
 				}