mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
PHPBB3-11413
This commit is contained in:
Nathaniel Guse
2013-05-03 08:50:27 -05:00
parent 77147b53c1
commit 3c76cdeb67
5 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/notification/manager_helper.php
View File

@@ -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);

4
tests/notification/notification_test.php
View File

@@ -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) {}
}

2
tests/notification/submit_post_base.php
View File

@@ -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);