[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673

tests/mock/auth_provider.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * Mock auth provider class with basic functions to help test sessions.
+ */
+class phpbb_mock_auth_provider extends phpbb_auth_provider_base
+{
+	public function login($username, $password)
+	{
+		return array(
+			'status' => "",
+			'error_msg' => "",
+			'user_row' => "",
+		);
+	}
+}

tests/mock/session_testable.php

@@ -58,5 +58,9 @@ class phpbb_mock_session_testable extends phpbb_session
 			}
 		}
 	}
+
+	public function setup()
+	{
+	}
 }