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, 6 insertions, 6 deletions

diff --git a/tests/notification/base.php b/tests/notification/base.php
index 8de162a1fb..549545f01b 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -46,17 +46,17 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		global $db, $config, $user, $auth, $cache, $phpbb_container;
 
 		$db = $this->db = $this->new_dbal();
-		$config = $this->config = new phpbb_config(array(
+		$config = $this->config = new \phpbb\config\config(array(
 			'allow_privmsg'			=> true,
 			'allow_bookmarks'		=> true,
 			'allow_topic_notify'	=> true,
 			'allow_forum_notify'	=> true,
 		));
-		$user = $this->user = new phpbb_user();
-		$this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
+		$user = $this->user = new \phpbb\user();
+		$this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 		$auth = $this->auth = new phpbb_mock_notifications_auth();
-		$cache = $this->cache = new phpbb_cache_service(
-			new phpbb_cache_driver_null(),
+		$cache = $this->cache = new \phpbb\cache\service(
+			new \phpbb\cache\driver\null(),
 			$this->config,
 			$this->db,
 			$phpbb_root_path,
@@ -87,7 +87,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		$types = array();
 		foreach ($this->get_notification_types() as $type)
 		{
-			$class = $this->build_type('phpbb_notification_type_' . $type);
+			$class = $this->build_type('phpbb\notification\type\\' . $type);
 
 			$types[$type] = $class;
 			$this->container->set('notification.type.' . $type, $class);