From 4cd0914f8976913de0ec46cc78c8ac5731415838 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Apr 2013 22:16:46 -0500
Subject: [ticket/11413] Fix notification tests

Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413
---
 phpBB/config/notifications.yml              | 34 ++++++++++++++---------------
 phpBB/includes/notification/exception.php   | 29 ++++++++++++++++++++++++
 phpBB/includes/notification/method/base.php |  4 ++--
 phpBB/includes/notification/type/base.php   |  4 ++--
 4 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 phpBB/includes/notification/exception.php

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 60aa63a854..c66527941e 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -19,7 +19,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -37,7 +37,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -55,7 +55,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -73,7 +73,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -91,7 +91,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -109,7 +109,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -127,7 +127,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -145,7 +145,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -163,7 +163,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -181,7 +181,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -199,7 +199,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -217,7 +217,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -235,7 +235,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -253,7 +253,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -271,7 +271,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -289,7 +289,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
@@ -304,7 +304,7 @@ services:
         arguments:
             - @user_loader
             - @dbal.conn
-            - @cache.driver
+            - @cache
             - @user
             - @auth
             - @config
diff --git a/phpBB/includes/notification/exception.php b/phpBB/includes/notification/exception.php
new file mode 100644
index 0000000000..a52d6fdc57
--- /dev/null
+++ b/phpBB/includes/notification/exception.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications exception
+*
+* @package notifications
+*/
+class phpbb_notification_exception extends \Exception
+{
+	public function __toString()
+	{
+		return $this->getMessage();
+	}
+}
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 22418c9be8..bae85310b2 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -66,7 +66,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_service $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -74,7 +74,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* @param string $php_ext
 	* @return phpbb_notification_method_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index f56956d16a..983383ce2a 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -96,7 +96,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_service $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -107,7 +107,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param string $user_notifications_table
 	* @return phpbb_notification_type_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
-- 
cgit v1.2.1