Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850

# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
  [ticket/11862] Correct var names in user_delete() events due to prune-users
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.
  [ticket/11852] Add class file
  [ticket/11852] Move tests to folder with new class name
  [ticket/11852] Split filesystem and path_helper into 2 classes
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
  [ticket/11866] Only single backslash in .md files
  [ticket/11866] Remove outdated and broken develop script
  [ticket/11866] More namespaces
  [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
  [ticket/11865] Convert old class name to namespaced version
  ...

Conflicts:
	tests/security/extract_current_page_test.php
	tests/session/testable_facade.php

1 files changed, 20 insertions, 18 deletions

diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index fe71747c5d..ef21c943c2 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -45,6 +45,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 	{
 		global $phpbb_root_path;
 
+//		$this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.');
+
 		// Correctly set the root path for this test to this directory, so the classes can be found
 		$phpbb_root_path = dirname(__FILE__) . '/';
 
@@ -52,8 +54,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->acp_modules->module_class = 'acp';
 		$acp_modules = $this->acp_modules->get_module_infos();
 		$this->assertEquals(array(
-				'phpbb_ext_foo_acp_a_module' => array(
-					'filename'	=> 'phpbb_ext_foo_acp_a_module',
+				'foo\\acp\\a_module' => array(
+					'filename'	=> 'foo\\acp\\a_module',
 					'title'		=> 'Foobar',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -74,8 +76,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->acp_modules->module_class = 'mcp';
 		$acp_modules = $this->acp_modules->get_module_infos();
 		$this->assertEquals(array(
-				'phpbb_ext_foo_mcp_a_module' => array(
-					'filename'	=> 'phpbb_ext_foo_mcp_a_module',
+				'foo\\mcp\\a_module' => array(
+					'filename'	=> 'foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -88,8 +90,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->acp_modules->module_class = 'mcp';
 		$acp_modules = $this->acp_modules->get_module_infos('mcp_a_module');
 		$this->assertEquals(array(
-				'phpbb_ext_foo_mcp_a_module' => array(
-					'filename'	=> 'phpbb_ext_foo_mcp_a_module',
+				'foo\\mcp\\a_module' => array(
+					'filename'	=> 'foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -102,8 +104,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->acp_modules->module_class = '';
 		$acp_modules = $this->acp_modules->get_module_infos('mcp_a_module', 'mcp');
 		$this->assertEquals(array(
-				'phpbb_ext_foo_mcp_a_module' => array(
-					'filename'	=> 'phpbb_ext_foo_mcp_a_module',
+				'foo\\mcp\\a_module' => array(
+					'filename'	=> 'foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -124,10 +126,10 @@ class phpbb_extension_modules_test extends phpbb_test_case
 
 		// Get module info of specified extension module
 		$this->acp_modules->module_class = 'acp';
-		$acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_foo_acp_a_module');
+		$acp_modules = $this->acp_modules->get_module_infos('foo_acp_a_module');
 		$this->assertEquals(array(
-				'phpbb_ext_foo_acp_a_module' => array (
-					'filename' => 'phpbb_ext_foo_acp_a_module',
+				'foo\\acp\\a_module' => array (
+					'filename' => 'foo\\acp\\a_module',
 					'title' => 'Foobar',
 					'version' => '3.1.0-dev',
 					'modes' => array (
@@ -150,8 +152,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->acp_modules->module_class = 'acp';
 		$acp_modules = $this->acp_modules->get_module_infos('', false, true);
 		$this->assertEquals(array(
-				'phpbb_ext_foo_acp_a_module' => array(
-					'filename'	=> 'phpbb_ext_foo_acp_a_module',
+				'foo\\acp\\a_module' => array(
+					'filename'	=> 'foo\\acp\\a_module',
 					'title'		=> 'Foobar',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -166,8 +168,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')),
 					),
 				),
-				'phpbb_ext_barfoo_acp_a_module' => array(
-					'filename'	=> 'phpbb_ext_barfoo_acp_a_module',
+				'barfoo\\acp\\a_module' => array(
+					'filename'	=> 'barfoo\\acp\\a_module',
 					'title'		=> 'Barfoo',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
@@ -177,10 +179,10 @@ class phpbb_extension_modules_test extends phpbb_test_case
 			), $acp_modules);
 
 		// Specific module set to disabled extension
-		$acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_barfoo_acp_a_module', 'acp', true);
+		$acp_modules = $this->acp_modules->get_module_infos('barfoo_acp_a_module', 'acp', true);
 		$this->assertEquals(array(
-				'phpbb_ext_barfoo_acp_a_module' => array(
-					'filename'	=> 'phpbb_ext_barfoo_acp_a_module',
+				'barfoo\\acp\\a_module' => array(
+					'filename'	=> 'barfoo\\acp\\a_module',
 					'title'		=> 'Barfoo',
 					'version'	=> '3.1.0-dev',
 					'modes'		=> array(