7 files changed, 21 insertions, 19 deletions
diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index 706f274448..276cbeb3e1 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -20,7 +20,6 @@ require_once dirname(__FILE__) . '/common_test_case.php';
 class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 {
 	protected static $config;
-	protected $driver;
 
 	public function getDataSet()
 	{
@@ -47,7 +46,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 		}
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/cache/apcu_driver_test.php b/tests/cache/apcu_driver_test.php
index 57f640c313..34bcf8f844 100644
--- a/tests/cache/apcu_driver_test.php
+++ b/tests/cache/apcu_driver_test.php
@@ -20,7 +20,6 @@ require_once dirname(__FILE__) . '/common_test_case.php';
 class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case
 {
 	protected static $config;
-	protected $driver;
 
 	public function getDataSet()
 	{
@@ -45,9 +44,11 @@ class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case
 		{
 			self::markTestSkipped('APCu is not enabled for CLI. Set apc.enable_cli=1 in php.ini');
 		}
+
+		parent::setUpBeforeClass();
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $phpbb_container, $phpbb_root_path;
 
diff --git a/tests/cache/cache_memory_test.php b/tests/cache/cache_memory_test.php
index ba1010bcf3..b3d19f1782 100644
--- a/tests/cache/cache_memory_test.php
+++ b/tests/cache/cache_memory_test.php
@@ -23,7 +23,7 @@ class phpbb_cache_memory_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/cache_memory.xml');
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $db;
 		parent::setUp();
diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index ee0649a755..64273c250a 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -13,6 +13,9 @@
 
 abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 {
+	/** @var \phpbb\cache\driver\driver_interface */
+	protected $driver;
+
 	public function test_get_put_exists()
 	{
 		$this->assertFalse($this->driver->_exists('test_key'));
diff --git a/tests/cache/dummy_driver_test.php b/tests/cache/dummy_driver_test.php
index 6cb6b73729..6802e120ab 100644
--- a/tests/cache/dummy_driver_test.php
+++ b/tests/cache/dummy_driver_test.php
@@ -13,14 +13,12 @@
 
 class phpbb_cache_dummy_driver_test extends phpbb_database_test_case
 {
-	protected $driver;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 471316847d..37973edba3 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -16,22 +16,18 @@ require_once dirname(__FILE__) . '/common_test_case.php';
 class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 {
 	private $cache_dir;
-	protected $driver;
-
-	public function __construct()
-	{
-		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
-	}
 
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
+		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
+
 		if (file_exists($this->cache_dir))
 		{
 			// cache directory possibly left after aborted
@@ -43,7 +39,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 		$this->driver = new \phpbb\cache\driver\file($this->cache_dir);
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		if (file_exists($this->cache_dir))
 		{
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index 387e6ca855..a2288cf9a8 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -13,10 +13,9 @@
 
 require_once dirname(__FILE__) . '/common_test_case.php';
 
-class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
+class phpbb_cache_redis_driver_test extends \phpbb_cache_common_test_case
 {
 	protected static $config;
-	protected $driver;
 
 	public function getDataSet()
 	{
@@ -41,12 +40,18 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 		{
 			self::markTestSkipped('Test redis host/port is not specified');
 		}
+
+		parent::setUpBeforeClass();
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
+		global $phpbb_root_path, $phpbb_container;
+
 		parent::setUp();
 
+		$phpbb_container = new phpbb_mock_container_builder();
+		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/');
 		$this->driver = new \phpbb\cache\driver\redis(self::$config['host'], self::$config['port']);
 		$this->driver->purge();
 	}