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

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index 3380762878..51f3ac24b6 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -30,7 +30,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 			self::markTestSkipped('APC extension is not loaded');
 		}
 
-		$php_ini = new phpbb_php_ini;
+		$php_ini = new \phpbb\php\ini;
 
 		if (!$php_ini->get_bool('apc.enabled'))
 		{
@@ -47,7 +47,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 	{
 		parent::setUp();
 
-		$this->driver = new phpbb_cache_driver_apc;
+		$this->driver = new \phpbb\cache\driver\apc;
 		$this->driver->purge();
 	}
 }
diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index a5bc2bfda9..3fe10c63e1 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -65,9 +65,9 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 	public function test_cache_sql()
 	{
 		global $db, $cache, $phpbb_root_path, $phpEx;
-		$config = new phpbb_config(array());
+		$config = new phpbb\config\config(array());
 		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx);
+		$cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx);
 
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 745c6bb081..c0843e8ed9 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -36,7 +36,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 		}
 		$this->create_cache_dir();
 
-		$this->driver = new phpbb_cache_driver_file($this->cache_dir);
+		$this->driver = new \phpbb\cache\driver\file($this->cache_dir);
 	}
 
 	protected function tearDown()
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index 43a0cc806c..58e57f2b3a 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -20,7 +20,7 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
-		$this->driver = new phpbb_cache_driver_null;
+		$this->driver = new \phpbb\cache\driver\null;
 	}
 
 	public function test_get_put()
@@ -48,9 +48,9 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 	public function test_cache_sql()
 	{
 		global $db, $cache, $phpbb_root_path, $phpEx;
-		$config = new phpbb_config(array());
+		$config = new phpbb\config\config(array());
 		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx);
+		$cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx);
 
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index 1308519a18..3d954dc0db 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -43,7 +43,7 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 	{
 		parent::setUp();
 
-		$this->driver = new phpbb_cache_driver_redis(self::$config['host'], self::$config['port']);
+		$this->driver = new \phpbb\cache\driver\redis(self::$config['host'], self::$config['port']);
 		$this->driver->purge();
 	}
 }