diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 14:27:43 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 14:27:43 -0500 |
| commit | cea94d89848a806f449610ddb2a7df7b7eec1328 (patch) | |
| tree | 9d246a59cafecef6b7e8e7c62b9d6c2d2d727651 /phpBB/includes/notification/method/base.php | |
| parent | 64820546d758b34720888311d0abffcf95609436 (diff) | |
| download | forums-cea94d89848a806f449610ddb2a7df7b7eec1328.tar forums-cea94d89848a806f449610ddb2a7df7b7eec1328.tar.gz forums-cea94d89848a806f449610ddb2a7df7b7eec1328.tar.bz2 forums-cea94d89848a806f449610ddb2a7df7b7eec1328.tar.xz forums-cea94d89848a806f449610ddb2a7df7b7eec1328.zip | |
[ticket/11103] Use dependency injection instead of phpbb_container
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notification/method/base.php')
| -rw-r--r-- | phpBB/includes/notification/method/base.php | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php index b502d3afd0..ced85e2582 100644 --- a/phpBB/includes/notification/method/base.php +++ b/phpBB/includes/notification/method/base.php @@ -23,12 +23,7 @@ if (!defined('IN_PHPBB')) */ abstract class phpbb_notification_method_base implements phpbb_notification_method_interface { - protected $phpbb_container; - protected $service; - protected $db; - protected $user; - protected $phpbb_root_path; - protected $php_ext; + protected $notification_manager, $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null; /** * Desired notifications @@ -56,20 +51,17 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth */ protected $queue = array(); - public function __construct(ContainerBuilder $phpbb_container) + public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext) { - // phpBB Container - $this->phpbb_container = $phpbb_container; - - // Service - $this->service = $phpbb_container->get('notifications'); - - // Some common things we're going to use - $this->db = $phpbb_container->get('dbal.conn'); - $this->user = $phpbb_container->get('user'); - - $this->phpbb_root_path = $phpbb_container->getParameter('core.root_path'); - $this->php_ext = $phpbb_container->getParameter('core.php_ext'); + $this->db = $db; + $this->cache = $cache; + $this->template = $template; + $this->extension_manager = $extension_manager; + $this->user = $user; + $this->auth = $auth; + $this->config = $config; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; } /** |