From ddd874ba76366cebe3cc30df6daa1974e29f34d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:46:32 -0600
Subject: [PATCH] [ticket/11103] dbal -> phpbb_db_driver

PHPBB3-11103
---
 phpBB/includes/notification/manager.php     | 4 ++--
 phpBB/includes/notification/method/base.php | 4 ++--
 phpBB/includes/notification/type/base.php   | 4 ++--
 phpBB/includes/user_loader.php              | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 22f8f58783..653446ab73 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -33,7 +33,7 @@ class phpbb_notification_manager
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_user */
@@ -51,7 +51,7 @@ class phpbb_notification_manager
 	/** @var string */
 	protected $user_notifications_table = null;
 
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, dbal $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 3f85d62a09..f37e7e7845 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -27,7 +27,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_cache_service */
@@ -61,7 +61,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(phpbb_user_loader $user_loader, dbal $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_driver_interface $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 d596c06167..31792de04c 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -27,7 +27,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_cache_service */
@@ -84,7 +84,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_user_loader $user_loader, dbal $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	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, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index db12854a60..77128d6570 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_user_loader
 {
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var string */
@@ -46,12 +46,12 @@ class phpbb_user_loader
 	/**
 	* User loader constructor
 	*
-	* @param dbal $db A database connection
+	* @param phpbb_db_driver $db A database connection
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $php_ext php file extension
 	* @param string $users_table The name of the database table (phpbb_users)
 	*/
-	public function __construct(dbal $db, $phpbb_root_path, $php_ext, $users_table)
+	public function __construct(phpbb_db_driver $db, $phpbb_root_path, $php_ext, $users_table)
 	{
 		$this->db = $db;