Merge remote-tracking branch 'phpbb/develop' into ticket/11621

* phpbb/develop: (542 commits)
  [ticket/11901] Pass empty string as relative_url for non-local magic URL.
  [ticket/11898] Correct adm_relative_path created by installer
  [ticket/11898] Correct admin S_LOGIN_ACTION
  [ticket/11892] Fix undefined variables: to_forum_id & to_topic_id
  [ticket/11890] Fix untranslated string when deleting posts through MCP.
  [ticket/11895] Fix undefined $forum_id
  [ticket/10383] Update the results without the overlay popup.
  [ticket/10383] Make the content transitions smoother.
  [ticket/10383] AJAXify poll voting
  [ticket/11888] Update default search backend in namespaces migration
  [ticket/11739] Rename “Remember Me” login keys module
  [ticket/11893] Remove unnecessary <fieldset> causing a large font size
  [ticket/11894] Fix typo in "Delete post" option
  [ticket/11888] Use \phpbb\search\fulltext_native as search backend config
  [ticket/11608] Mark failed test as incomplete for mysql search backend
  [ticket/11608] Update search backend class names to namespaces
  [ticket/11608] Move markIncomplete to search backends test
  [ticket/11608] Rename base search test class file
  [ticket/11608] Remove suffix test from base class
  [ticket/11608] Mark postgres search not found test as incomplete
  ...

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
 {
 }