Merge branch 'develop' into ticket/10820-develop

# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
  [ticket/11599] Copy the forums into a static array for later reuse
  [ticket/11602] Do not call localize_errors() if avatars are disabled
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11590] Close database connections when tearDown() is called
  [ticket/develop/11543] Use plurals in develop
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
  [ticket/11481] Move prepended slash from calls into function
  ...

6 files changed, 69 insertions, 0 deletions

diff --git a/tests/extension/ext/foo/acp/a_info.php b/tests/extension/ext/foo/acp/a_info.php
new file mode 100644
index 0000000000..3e9bbffaca
--- /dev/null
+++ b/tests/extension/ext/foo/acp/a_info.php
@@ -0,0 +1,16 @@
+<?php
+
+class phpbb_ext_foo_acp_a_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> 'phpbb_ext_foo_acp_a_module',
+			'title'		=> 'Foobar',
+			'version'	=> '3.1.0-dev',
+			'modes'		=> array(
+				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
+			),
+		);
+	}
+}
diff --git a/tests/extension/ext/foo/acp/a_module.php b/tests/extension/ext/foo/acp/a_module.php
new file mode 100644
index 0000000000..093b4b1ad7
--- /dev/null
+++ b/tests/extension/ext/foo/acp/a_module.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_acp_a_module
+{
+}
diff --git a/tests/extension/ext/foo/acp/fail_info.php b/tests/extension/ext/foo/acp/fail_info.php
new file mode 100644
index 0000000000..99aa09551e
--- /dev/null
+++ b/tests/extension/ext/foo/acp/fail_info.php
@@ -0,0 +1,19 @@
+<?php
+/*
+* Due to the mismatch between the class name and the file name, this module
+* file shouldn't be found by the extension finder
+*/
+class phpbb_ext_foo_acp_foo_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> 'phpbb_ext_foo_acp_fail_module',
+			'title'		=> 'Foobar',
+			'version'	=> '3.1.0-dev',
+			'modes'		=> array(
+				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
+			),
+		);
+	}
+}
diff --git a/tests/extension/ext/foo/acp/fail_module.php b/tests/extension/ext/foo/acp/fail_module.php
new file mode 100644
index 0000000000..a200d92d2f
--- /dev/null
+++ b/tests/extension/ext/foo/acp/fail_module.php
@@ -0,0 +1,8 @@
+<?php
+/*
+* Due to the mismatch between the class name and the file name of the module
+* info file, this module's info file shouldn't be found
+*/
+class phpbb_ext_foo_acp_fail_module
+{
+}
diff --git a/tests/extension/ext/foo/mcp/a_info.php b/tests/extension/ext/foo/mcp/a_info.php
new file mode 100644
index 0000000000..84a36b9134
--- /dev/null
+++ b/tests/extension/ext/foo/mcp/a_info.php
@@ -0,0 +1,16 @@
+<?php
+
+class phpbb_ext_foo_mcp_a_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> 'phpbb_ext_foo_mcp_a_module',
+			'title'		=> 'Foobar',
+			'version'	=> '3.1.0-dev',
+			'modes'		=> array(
+				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')),
+			),
+		);
+	}
+}
diff --git a/tests/extension/ext/foo/mcp/a_module.php b/tests/extension/ext/foo/mcp/a_module.php
new file mode 100644
index 0000000000..59d9f8cc6f
--- /dev/null
+++ b/tests/extension/ext/foo/mcp/a_module.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_mcp_a_module
+{
+}