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

diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 4ebe79c9cd..ba1fb04b33 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -22,17 +22,17 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 			->will($this->returnArgument(0));
 
 		// Prepare dependencies for avatar manager and driver
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$cache = $this->getMock('phpbb_cache_driver_interface');
+		$config = new \phpbb\config\config(array());
+		$request = $this->getMock('\phpbb\request\request');
+		$cache = $this->getMock('\phpbb\cache\driver\driver_interface');
 
 		// $this->avatar_foobar will be needed later on
-		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
 		$this->avatar_foobar->expects($this->any())
 			->method('get_name')
 			->will($this->returnValue('avatar.driver.foobar'));
 		// barfoo driver can't be mocked with constructor arguments
-		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo = $this->getMock('\phpbb\avatar\driver\barfoo', array('get_name'));
 		$this->avatar_barfoo->expects($this->any())
 			->method('get_name')
 			->will($this->returnValue('avatar.driver.barfoo'));
@@ -40,7 +40,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 
 		foreach ($this->avatar_drivers() as $driver)
 		{
-			$cur_avatar = $this->getMock('phpbb_avatar_driver_' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+			$cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
 			$cur_avatar->expects($this->any())
 				->method('get_name')
 				->will($this->returnValue('avatar.driver.' . $driver));
@@ -52,7 +52,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
 
 		// Set up avatar manager
-		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
+		$this->manager = new \phpbb\avatar\manager($config, $avatar_drivers, $this->phpbb_container);
 	}
 
 	protected function avatar_drivers()
@@ -203,7 +203,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 	{
 		$cleaned_row = array();
 
-		$cleaned_row = phpbb_avatar_manager::clean_row($input);
+		$cleaned_row = \phpbb\avatar\manager::clean_row($input);
 		foreach ($output as $key => $null)
 		{
 			$this->assertArrayHasKey($key, $cleaned_row);
@@ -222,7 +222,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 
 	public function test_localize_errors()
 	{
-		$user = $this->getMock('phpbb_user');
+		$user = $this->getMock('\phpbb\user');
 		$lang_array = array(
 			array('FOOBAR_OFF', 'foobar_off'),
 			array('FOOBAR_EXPLAIN', 'FOOBAR_EXPLAIN %s'),