Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714

* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/11201] Remove database column on update
  [ticket/10431] Remove .left class from reply-all
  [ticket/10431] Remove reply-all custom css
  [ticket/10431] Adjustments for large buttons
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11201] Remove MSN/WLM fields
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
  [ticket/11313] Use correct object el instead of eel in alt_text callback
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
  [ticket/10949] Remove not needed comma
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/11302] Correctly select first timezone or selected timezone
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index fa298ec9ae..a5bc2bfda9 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -64,9 +64,10 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 
 	public function test_cache_sql()
 	{
-		global $db, $cache;
+		global $db, $cache, $phpbb_root_path, $phpEx;
+		$config = new phpbb_config(array());
 		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver);
+		$cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx);
 
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";