Merge branch 'task/naderman/config-class' into develop

* task/naderman/config-class:
  [task/config-class] Do not create multiple cache driver instances.
  [task/config-class] Add an attribute for the table name in phpbb_config_db.
  [task/config-class] Correctly merge cached config with dynamically loaded data.
  [task/config-class] Always specify the config table to use.
  [task/config-class] Fix db config constructor param order
  [task/config-class] Implemented a config class to replace the global array.

1 files changed, 6 insertions, 0 deletions

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 3bfb31f1be..dd29e0e9e3 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -37,6 +37,11 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
+	public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name)
+	{
+		$test->assertFalse(isset($this->data[$var_name]));
+	}
+
 	public function check(PHPUnit_Framework_Assert $test, $data)
 	{
 		$test->assertEquals($data, $this->data);
@@ -59,6 +64,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	}
 	function destroy($var_name, $table = '')
 	{
+		unset($this->data[$var_name]);
 	}
 	public function _exists($var_name)
 	{