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

5 files changed, 12 insertions, 10 deletions

diff --git a/tests/class_loader/phpbb/class_name.php b/tests/class_loader/phpbb/class_name.php
index e941173cdd..64a3fa646e 100644
--- a/tests/class_loader/phpbb/class_name.php
+++ b/tests/class_loader/phpbb/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_class_name
+namespace phpbb;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir.php b/tests/class_loader/phpbb/dir.php
deleted file mode 100644
index 1c8930d8e7..0000000000
--- a/tests/class_loader/phpbb/dir.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir
-{
-}
-
diff --git a/tests/class_loader/phpbb/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php
index 0675aa8fc5..1cd39a1181 100644
--- a/tests/class_loader/phpbb/dir/class_name.php
+++ b/tests/class_loader/phpbb/dir/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir_class_name
+namespace phpbb\dir;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php
index 7321a609cc..89affbc847 100644
--- a/tests/class_loader/phpbb/dir/subdir/class_name.php
+++ b/tests/class_loader/phpbb/dir/subdir/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir_subdir_class_name
+namespace phpbb\dir\subdir;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php
index 01cf4086ff..b273511fcd 100644
--- a/tests/class_loader/phpbb/dir2/dir2.php
+++ b/tests/class_loader/phpbb/dir2/dir2.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir2
+namespace phpbb;
+
+class dir2
 {
 }