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
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php
index 43680609f8..ce03c1fc21 100644
--- a/tests/tree/nestedset_forum_base.php
+++ b/tests/tree/nestedset_forum_base.php
@@ -52,11 +52,11 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case
 
 		global $config;
 
-		$config = $this->config = new phpbb_config(array('nestedset_forum_lock' => 0));
+		$config = $this->config = new \phpbb\config\config(array('nestedset_forum_lock' => 0));
 		set_config(null, null, null, $this->config);
 
-		$this->lock = new phpbb_lock_db('nestedset_forum_lock', $this->config, $this->db);
-		$this->set = new phpbb_tree_nestedset_forum($this->db, $this->lock, 'phpbb_forums');
+		$this->lock = new \phpbb\lock\db('nestedset_forum_lock', $this->config, $this->db);
+		$this->set = new \phpbb\tree\nestedset_forum($this->db, $this->lock, 'phpbb_forums');
 
 		$this->set_up_forums();
 	}
@@ -97,7 +97,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case
 		}
 		else
 		{
-			$buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_forums');
+			$buffer = new \phpbb\db\sql_insert_buffer($this->db, 'phpbb_forums');
 			$buffer->insert_all($forums);
 			$buffer->flush();