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

diff --git a/tests/config/config_test.php b/tests/config/config_test.php
index 5845cc4590..5373fcef5f 100644
--- a/tests/config/config_test.php
+++ b/tests/config/config_test.php
@@ -11,7 +11,7 @@ class phpbb_config_test extends phpbb_test_case
 {
 	public function test_offset_exists()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 
 		$this->assertTrue(isset($config['foo']));
 		$this->assertFalse(isset($config['foobar']));
@@ -19,19 +19,19 @@ class phpbb_config_test extends phpbb_test_case
 
 	public function test_offset_get()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 		$this->assertEquals('bar', $config['foo']);
 	}
 
 	public function test_offset_get_missing()
 	{
-		$config = new phpbb_config(array());
+		$config = new \phpbb\config\config(array());
 		$this->assertEquals('', $config['foo']);
 	}
 
 	public function test_offset_set()
 	{
-		$config = new phpbb_config(array());
+		$config = new \phpbb\config\config(array());
 		$config['foo'] = 'x';
 		$this->assertEquals('x', $config['foo']);
 	}
@@ -39,20 +39,20 @@ class phpbb_config_test extends phpbb_test_case
 	public function test_offset_unset_fails()
 	{
 		$this->setExpectedTriggerError(E_USER_ERROR);
-		$config = new phpbb_config(array('foo' => 'x'));
+		$config = new \phpbb\config\config(array('foo' => 'x'));
 		unset($config['foo']);
 	}
 
 	public function test_count()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 		$this->assertEquals(1, count($config));
 	}
 
 	public function test_iterate()
 	{
 		$vars = array('foo' => '23', 'bar' => '42');
-		$config = new phpbb_config($vars);
+		$config = new \phpbb\config\config($vars);
 
 		$count = 0;
 		foreach ($config as $key => $value)
@@ -68,42 +68,42 @@ class phpbb_config_test extends phpbb_test_case
 
 	public function test_set_overwrite()
 	{
-		$config = new phpbb_config(array('foo' => 'x'));
+		$config = new \phpbb\config\config(array('foo' => 'x'));
 		$config->set('foo', 'bar');
 		$this->assertEquals('bar', $config['foo']);
 	}
 
 	public function test_set_new()
 	{
-		$config = new phpbb_config(array());
+		$config = new \phpbb\config\config(array());
 		$config->set('foo', 'bar');
 		$this->assertEquals('bar', $config['foo']);
 	}
 
 	public function test_set_atomic_overwrite()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 		$this->assertTrue($config->set_atomic('foo', 'bar', '23'));
 		$this->assertEquals('23', $config['foo']);
 	}
 
 	public function test_set_atomic_new()
 	{
-		$config = new phpbb_config(array());
+		$config = new \phpbb\config\config(array());
 		$this->assertTrue($config->set_atomic('foo', false, '23'));
 		$this->assertEquals('23', $config['foo']);
 	}
 
 	public function test_set_atomic_failure()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 		$this->assertFalse($config->set_atomic('foo', 'wrong', '23'));
 		$this->assertEquals('bar', $config['foo']);
 	}
 
 	public function test_increment()
 	{
-		$config = new phpbb_config(array('foo' => '23'));
+		$config = new \phpbb\config\config(array('foo' => '23'));
 		$config->increment('foo', 3);
 		$this->assertEquals(26, $config['foo']);
 		$config->increment('foo', 1);
@@ -112,7 +112,7 @@ class phpbb_config_test extends phpbb_test_case
 
 	public function test_delete()
 	{
-		$config = new phpbb_config(array('foo' => 'bar'));
+		$config = new \phpbb\config\config(array('foo' => 'bar'));
 
 		$config->delete('foo');
 		$this->assertFalse(isset($config['foo']));