Merge branch 'develop' into feature/prune-users

* develop: (170 commits)
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
  [ticket/10147] Corrected a typo in includes/functions_template.php.
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10143] Added tests for storing a previously deleted value in db cache.
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
  [ticket/9961] Create log entries when users are activated.
  [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.
  [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object
  [ticket/10006] Remove unneeded if statements
  [ticket/10006] Remove return values
  [ticket/10006] More testing
  [ticket/10006] Tweak the tests a bit
  [ticket/10006] Add phpbb_config::delete
  [ticket/7941] Added @return to generate_board_url docstring.
  ...

1 files changed, 14 insertions, 2 deletions

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 713f1ca817..d3f9b8ad5a 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -42,9 +42,21 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 		$test->assertFalse(isset($this->data[$var_name]));
 	}
 
-	public function check(PHPUnit_Framework_Assert $test, $data)
+	public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)
 	{
-		$test->assertEquals($data, $this->data);
+		$cache_data = $this->data;
+
+		if ($ignore_db_info)
+		{
+			unset($cache_data['mssqlodbc_version']);
+			unset($cache_data['mssql_version']);
+			unset($cache_data['mysql_version']);
+			unset($cache_data['mysqli_version']);
+			unset($cache_data['pgsql_version']);
+			unset($cache_data['sqlite_version']);
+		}
+
+		$test->assertEquals($data, $cache_data);
 	}
 
 	function load()