diff options
| author | Matt Friedman <maf675@gmail.com> | 2016-03-27 10:24:12 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2016-03-31 15:07:59 -0700 |
| commit | 4b789c041844396f3a5e6a51142c45c13d2edd59 (patch) | |
| tree | c28e306305753d1284a1f4bc2be45a7a58971dda /tests/console | |
| parent | ed0f151d863d7449d73336b3697e37259812215e (diff) | |
| download | forums-4b789c041844396f3a5e6a51142c45c13d2edd59.tar forums-4b789c041844396f3a5e6a51142c45c13d2edd59.tar.gz forums-4b789c041844396f3a5e6a51142c45c13d2edd59.tar.bz2 forums-4b789c041844396f3a5e6a51142c45c13d2edd59.tar.xz forums-4b789c041844396f3a5e6a51142c45c13d2edd59.zip | |
[ticket/14561] Use the user loader where appropriate
PHPBB3-14561
Diffstat (limited to 'tests/console')
| -rw-r--r-- | tests/console/user/activate_test.php | 1 | ||||
| -rw-r--r-- | tests/console/user/base.php | 3 | ||||
| -rw-r--r-- | tests/console/user/delete_test.php | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 08b25c6c95..1588a76e47 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -40,6 +40,7 @@ class phpbb_console_user_activate_test extends phpbb_console_user_base $this->language, $this->log, $this->notifications, + $this->user_loader, $this->phpbb_root_path, $this->php_ext )); diff --git a/tests/console/user/base.php b/tests/console/user/base.php index c6ffc428ed..7ff11af1ae 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -25,6 +25,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case protected $passwords_manager; protected $command_name; protected $question; + protected $user_loader; protected $phpbb_root_path; protected $php_ext; @@ -70,6 +71,8 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case '\phpbb\datetime' )); + $this->user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + $driver_helper = new \phpbb\passwords\driver\helper($this->config); $passwords_drivers = array( 'passwords.driver.bcrypt_2y' => new \phpbb\passwords\driver\bcrypt_2y($this->config, $driver_helper), diff --git a/tests/console/user/delete_test.php b/tests/console/user/delete_test.php index dc4c07e8b8..88f91afab1 100644 --- a/tests/console/user/delete_test.php +++ b/tests/console/user/delete_test.php @@ -27,6 +27,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base $this->db, $this->language, $this->log, + $this->user_loader, $this->phpbb_root_path, $this->php_ext )); |