[ticket/11413] Remove remaining irrelevant code to this PR

PHPBB3-11413

3 files changed, 6 insertions, 8 deletions

diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php
index 8d2ce5e002..7a794f922f 100644
--- a/tests/notification/manager_helper.php
+++ b/tests/notification/manager_helper.php
@@ -28,12 +28,10 @@ class phpbb_notification_manager_helper extends phpbb_notification_manager
 
 	// Extra dependencies for get_*_class functions
 	protected $auth = null;
-	protected $cache = null;
 	protected $config = null;
-	public function setDependencies($auth, $cache, $config)
+	public function setDependencies($auth, $config)
 	{
 		$this->auth = $auth;
-		$this->cache = $cache;
 		$this->config = $config;
 	}
 
@@ -44,7 +42,7 @@ class phpbb_notification_manager_helper extends phpbb_notification_manager
 	{
 		$item_type = 'phpbb_notification_type_' . $item_type;
 
-		$item = new $item_type($this->user_loader, $this->db, $this->cache, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
+		$item = new $item_type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
 
 		$item->set_notification_manager($this);
 
@@ -60,7 +58,7 @@ class phpbb_notification_manager_helper extends phpbb_notification_manager
 	{
 		$method_name = 'phpbb_notification_method_' . $method_name;
 
-		$method = new $method_name($this->user_loader, $this->db, $this->cache, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
+		$method = new $method_name($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
 
 		$method->set_notification_manager($this);
 
diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php
index 4ffd3587f1..c342b10a7f 100644
--- a/tests/notification/notification_test.php
+++ b/tests/notification/notification_test.php
@@ -61,7 +61,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 			'phpbb_user_notifications'
 		);
 
-		$this->notifications->setDependencies($this->auth, $this->cache, $this->config);
+		$this->notifications->setDependencies($this->auth, $this->config);
 
 		$types = array();
 		foreach (array(
@@ -123,7 +123,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 		{
 			$this->assertEquals(3, $this->notifications->get_notification_type_id('fail'));
 
-			$this->fail('Non-existant type should throw exception');
+			$this->fail('Non-existent type should throw an exception');
 		}
 		catch (Exception $e) {}
 	}
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index c3dbfc2535..59daf6c9cb 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -106,7 +106,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 		{
 			$class_name = 'phpbb_notification_type_' . $type;
 			$class = new $class_name(
-				$user_loader, $db, $cache, $user, $auth, $config,
+				$user_loader, $db, $cache->get_driver(), $user, $auth, $config,
 				$phpbb_root_path, $phpEx,
 				NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE);