Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

Conflicts:
	phpBB/develop/create_schema_files.php

phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php

@@ -7,11 +7,13 @@
 *
 */
 
-class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class local_url_bbcode extends \phpbb\db\migration\migration
 {
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_12_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_12_rc1');
 	}
 
 	public function update_data()
@@ -44,7 +46,7 @@ class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration
 			$bbcode_match = $row['bbcode_match'];
 			$bbcode_tpl = $row['bbcode_tpl'];
 
-			$acp_bbcodes = new acp_bbcodes();
+			$acp_bbcodes = new \acp_bbcodes();
 			$sql_ary = $acp_bbcodes->build_regexp($bbcode_match, $bbcode_tpl);
 
 			$sql = 'UPDATE ' . BBCODES_TABLE . '

phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_1_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_1_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_10 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc3');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc3');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_10_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_9');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_9');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_10_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_10_rc3 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_11 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11_rc2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_11_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_10');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_10');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_11_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11_rc1');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php

@@ -7,18 +7,20 @@
 *
 */
 
+namespace phpbb\db\migration\data\v30x;
+
 /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
 
-class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
+class release_3_0_12_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
 		return phpbb_version_compare($this->config['version'], '3.0.12-RC1', '>=');
 	}
 
- 	static public function depends_on()
+	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_1_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{

phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_2_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_2_rc2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_2_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_2_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_2_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_2_rc1');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_3 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_3_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_3_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_3_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_2');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_4 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_4_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_4_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_4_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_3');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_3');
 	}
 
 	public function update_schema()
@@ -82,7 +84,7 @@ class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
 
 	public function update_custom_profile_fields()
 	{
-		// Update the Custom Profile Fields based on previous settings to the new format
+		// Update the Custom Profile Fields based on previous settings to the new \format
 		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
 				FROM ' . PROFILE_FIELDS_TABLE;
 		$result = $this->db->sql_query($sql);

phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_5 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_5_rc1part2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_5_rc1part2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_5_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_4');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_4');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_5_rc1part2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_5_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_5_rc1');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_6 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc4');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc4');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_6_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_5');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_5');
 	}
 
 	public function update_schema()
@@ -318,7 +320,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
 
 		// Clear permissions...
 		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		$auth_admin = new auth_admin();
+		$auth_admin = new \auth_admin();
 		$auth_admin->acl_clear_prefetch();
 	}
 }

phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_6_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_6_rc3 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc2');
 	}
 
 	public function update_data()
@@ -30,7 +32,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
 
 	public function update_cp_fields()
 	{
-		// Update the Custom Profile Fields based on previous settings to the new format
+		// Update the Custom Profile Fields based on previous settings to the new \format
 		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
 			SET field_show_on_vt = 1
 			WHERE field_hide = 0

phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_6_rc4 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc3');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc3');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_7 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_7_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_7_rc2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_7_pl1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_7');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_7');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_7_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_6');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_6');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_7_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_7_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_7_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_8 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_8_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_8_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_8_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_7_pl1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_7_pl1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_9 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc4');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc4');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_9_rc1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_8');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_8');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_9_rc2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc1');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc1');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_9_rc3 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc2');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc2');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_9_rc4 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc3');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc3');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php

@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class auth_provider_oauth extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+						'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
+						'provider'			=> array('VCHAR', ''), // Name of the OAuth provider
+						'oauth_token'		=> array('MTEXT', ''), // Serialized token
+					),
+					'KEYS' => array(
+						'user_id'			=> array('INDEX', 'user_id'),
+						'provider'			=> array('INDEX', 'provider'),
+					),
+				),
+				$this->table_prefix . 'oauth_accounts'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0),
+						'provider'			=> array('VCHAR', ''),
+						'oauth_provider_id'	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY' => array(
+						'user_id',
+						'provider',
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens',
+				$this->table_prefix . 'oauth_accounts',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_auth_link',
+					'modes'				=> array('auth_link'),
+				),
+			)),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v310/avatars.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class avatars extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/boardindex.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class boardindex extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{

phpBB/phpbb/db/migration/data/v310/config_db_text.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_config_db_text extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class config_db_text extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_config_db_text extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/dev.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_dev extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class dev extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -17,10 +19,10 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 	static public function depends_on()
 	{
 		return array(
-			'phpbb_db_migration_data_310_extensions',
-			'phpbb_db_migration_data_310_style_update_p2',
-			'phpbb_db_migration_data_310_timezone_p2',
-			'phpbb_db_migration_data_310_reported_posts_display',
+			'\phpbb\db\migration\data\v310\extensions',
+			'\phpbb\db\migration\data\v310\style_update_p2',
+			'\phpbb\db\migration\data\v310\timezone_p2',
+			'\phpbb\db\migration\data\v310\reported_posts_display',
 		);
 	}
 
@@ -206,7 +208,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		{
 			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
 		}
-		$module_manager = new acp_modules();
+		$module_manager = new \acp_modules();
 		$module_manager->module_class = 'acp';
 		$module_manager->move_module($language_module_id, $language_management_module_id);
 	}

phpBB/phpbb/db/migration/data/v310/extensions.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class extensions extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/forgot_password.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class forgot_password extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v310/jquery_update.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class jquery_update extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -17,7 +19,7 @@ class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration
 	static public function depends_on()
 	{
 		return array(
-			'phpbb_db_migration_data_310_dev',
+			'\phpbb\db\migration\data\v310\dev',
 		);
 	}
 

phpBB/phpbb/db/migration/data/v310/mod_rewrite.php

@@ -0,0 +1,27 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class mod_rewrite extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('enable_mod_rewrite', '0')),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v310/namespaces.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class namespaces extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('if', array(
+				(preg_match('#^phpbb_search_#', $this->config['search_type'])),
+				array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))),
+			)),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php

@@ -7,11 +7,13 @@
 *
 */
 
-class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class notification_options_reconvert extends \phpbb\db\migration\migration
 {
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_notifications_schema_fix');
+		return array('\phpbb\db\migration\data\v310\notifications_schema_fix');
 	}
 
 	public function update_data()
@@ -24,7 +26,7 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 	public function convert_notifications()
 	{
 		$insert_table = $this->table_prefix . 'user_notifications';
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
+		$insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $insert_table);
 
 		$this->perform_conversion($insert_buffer, $insert_table);
 	}
@@ -32,10 +34,10 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 	/**
 	* Perform the conversion (separate for testability)
 	*
-	* @param phpbb_db_sql_insert_buffer $insert_buffer
+	* @param \phpbb\db\sql_insert_buffer $insert_buffer
 	* @param string $insert_table
 	*/
-	public function perform_conversion(phpbb_db_sql_insert_buffer $insert_buffer, $insert_table)
+	public function perform_conversion(\phpbb\db\sql_insert_buffer $insert_buffer, $insert_table)
 	{
 		$sql = 'DELETE FROM ' . $insert_table;
 		$this->db->sql_query($sql);
@@ -94,13 +96,13 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 	/**
 	* Insert method rows to DB
 	*
-	* @param phpbb_db_sql_insert_buffer $insert_buffer
+	* @param \phpbb\db\sql_insert_buffer $insert_buffer
 	* @param string $item_type
 	* @param int $item_id
 	* @param int $user_id
 	* @param string $methods
 	*/
-	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
+	protected function add_method_rows(\phpbb\db\sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
 	{
 		$row_base = array(
 			'item_type'		=> $item_type,

phpBB/phpbb/db/migration/data/v310/notifications.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class notifications extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_dev');
+		return array('\phpbb\db\migration\data\v310\dev');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/notifications_cron.php

@@ -0,0 +1,27 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class notifications_cron extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\notifications');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('read_notification_expire_days', 30)),
+			array('config.add', array('read_notification_last_gc', 0)), // last run
+			array('config.add', array('read_notification_gc', (60 * 60 * 24))), // seconds between run; 1 day
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php

@@ -7,11 +7,13 @@
 *
 */
 
-class phpbb_db_migration_data_310_notifications_schema_fix extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class notifications_schema_fix extends \phpbb\db\migration\migration
 {
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_notifications');
+		return array('\phpbb\db\migration\data\v310\notifications');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/reported_posts_display.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class reported_posts_display extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migrat
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/signature_module_auth.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class signature_module_auth extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -25,7 +27,7 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_31x_dev');
+		return array('\phpbb\db\migration\data\v31x\dev');
 	}
 
 	public function update_data()

phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class softdelete_mcp_modules extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -26,8 +28,8 @@ class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migrat
 	static public function depends_on()
 	{
 		return array(
-			'phpbb_db_migration_data_310_dev',
-			'phpbb_db_migration_data_310_softdelete_p2',
+			'phpbb\db\migration\data\v310\dev',
+			'phpbb\db\migration\data\v310\softdelete_p2',
 		);
 	}
 

phpBB/phpbb/db/migration/data/v310/softdelete_p1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class softdelete_p1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_dev');
+		return array('\phpbb\db\migration\data\v310\dev');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/softdelete_p2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class softdelete_p2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -17,8 +19,8 @@ class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration
 	static public function depends_on()
 	{
 		return array(
-			'phpbb_db_migration_data_310_dev',
-			'phpbb_db_migration_data_310_softdelete_p1',
+			'\phpbb\db\migration\data\v310\dev',
+			'\phpbb\db\migration\data\v310\softdelete_p1',
 		);
 	}
 

phpBB/phpbb/db/migration/data/v310/style_update_p1.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class style_update_p1 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()
@@ -59,7 +61,7 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
 		// Get list of valid 3.1 styles
 		$available_styles = array('prosilver');
 
-		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
+		$iterator = new \DirectoryIterator($this->phpbb_root_path . 'styles');
 		$skip_dirs = array('.', '..', 'prosilver');
 		foreach ($iterator as $fileinfo)
 		{

phpBB/phpbb/db/migration/data/v310/style_update_p2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class style_update_p2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_style_update_p1');
+		return array('\phpbb\db\migration\data\v310\style_update_p1');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/teampage.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class teampage extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_dev');
+		return array('\phpbb\db\migration\data\v310\dev');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/timezone.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class timezone extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()

phpBB/phpbb/db/migration/data/v310/timezone_p2.php

@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class timezone_p2 extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
@@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_310_timezone');
+		return array('\phpbb\db\migration\data\v310\timezone');
 	}
 
 	public function update_schema()