1 files changed, 51 insertions, 14 deletions

diff --git a/tests/notification/base.php b/tests/notification/base.php
index 162feae557..1295f099f0 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -11,6 +11,10 @@
 *
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 require_once dirname(__FILE__) . '/manager_helper.php';
 
 abstract class phpbb_tests_notification_base extends phpbb_database_test_case
@@ -39,6 +43,13 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		);
 	}
 
+	protected function get_notification_methods()
+	{
+		return array(
+			'notification.method.board',
+		);
+	}
+
 	protected function setUp()
 	{
 		parent::setUp();
@@ -55,55 +66,81 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 			'allow_bookmarks'		=> true,
 			'allow_topic_notify'	=> true,
 			'allow_forum_notify'	=> true,
+			'allow_board_notifications'	=> true,
 		));
-		$user = $this->user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$this->user = $user;
 		$this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 		$auth = $this->auth = new phpbb_mock_notifications_auth();
+		$cache_driver = new \phpbb\cache\driver\dummy();
 		$cache = $this->cache = new \phpbb\cache\service(
-			new \phpbb\cache\driver\null(),
+			$cache_driver,
 			$this->config,
 			$this->db,
 			$phpbb_root_path,
 			$phpEx
 		);
-		
+
 		$this->phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
-		$phpbb_container = $this->container = new phpbb_mock_container_builder();
+		$phpbb_container = $this->container = new ContainerBuilder();
+		$loader     = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
+		$loader->load('services_notification.yml');
+		$phpbb_container->set('user_loader', $this->user_loader);
+		$phpbb_container->set('user', $user);
+		$phpbb_container->set('config', $this->config);
+		$phpbb_container->set('dbal.conn', $this->db);
+		$phpbb_container->set('auth', $auth);
+		$phpbb_container->set('cache.driver', $cache_driver);
+		$phpbb_container->set('cache', $cache);
+		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
+		$phpbb_container->set('dispatcher', $this->phpbb_dispatcher);
+		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+		$phpbb_container->setParameter('core.php_ext', $phpEx);
+		$phpbb_container->setParameter('tables.notifications', 'phpbb_notifications');
+		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
+		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 
 		$this->notifications = new phpbb_notification_manager_helper(
 			array(),
 			array(),
 			$this->container,
 			$this->user_loader,
-			$this->config,
 			$this->phpbb_dispatcher,
 			$this->db,
 			$this->cache,
 			$this->user,
-			$phpbb_root_path,
-			$phpEx,
 			'phpbb_notification_types',
-			'phpbb_notifications',
 			'phpbb_user_notifications'
 		);
 
 		$phpbb_container->set('notification_manager', $this->notifications);
+		$phpbb_container->compile();
 
 		$this->notifications->setDependencies($this->auth, $this->config);
 
 		$types = array();
 		foreach ($this->get_notification_types() as $type)
 		{
-			$type_parts = explode('.', $type);
-			$class = $this->build_type('phpbb\notification\type\\' . array_pop($type_parts));
+			$class = $this->build_type($type);
 
 			$types[$type] = $class;
-			$this->container->set($type, $class);
 		}
 
 		$this->notifications->set_var('notification_types', $types);
 
+		$methods = array();
+		foreach ($this->get_notification_methods() as $method)
+		{
+			$class = $this->container->get($method);
+
+			$methods[$method] = $class;
+		}
+
+		$this->notifications->set_var('notification_methods', $methods);
+
 		$this->db->sql_query('DELETE FROM phpbb_notification_types');
 		$this->db->sql_query('DELETE FROM phpbb_notifications');
 		$this->db->sql_query('DELETE FROM phpbb_user_notifications');
@@ -111,14 +148,14 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 
 	protected function build_type($type)
 	{
-		global $phpbb_root_path, $phpEx;
+		$instance = $this->container->get($type);
 
-		return new $type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $phpbb_root_path, $phpEx, 'phpbb_notification_types', 'phpbb_notifications', 'phpbb_user_notifications');
+		return $instance;
 	}
 
 	protected function assert_notifications($expected, $options = array())
 	{
-		$notifications = $this->notifications->load_notifications(array_merge(array(
+		$notifications = $this->notifications->load_notifications('notification.method.board', array_merge(array(
 			'count_unread'	=> true,
 			'order_by'		=> 'notification_time',
 			'order_dir'		=> 'ASC',