aboutsummaryrefslogtreecommitdiffstats
path: root/tests/avatar/manager_test.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-08 22:23:03 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-08 22:23:03 +0200
commit47b32f1da9edca7945bbc82ad65cdc30cb969890 (patch)
tree83aeeb3b8d79eda198d153fe5e03598bc23935ec /tests/avatar/manager_test.php
parent46ffafd0c6805f3903235d5c6f55d6848ed60859 (diff)
parentb7e4d0b0a5e5264da3e65418d8e7ac2f92dc8cbc (diff)
downloadforums-47b32f1da9edca7945bbc82ad65cdc30cb969890.tar
forums-47b32f1da9edca7945bbc82ad65cdc30cb969890.tar.gz
forums-47b32f1da9edca7945bbc82ad65cdc30cb969890.tar.bz2
forums-47b32f1da9edca7945bbc82ad65cdc30cb969890.tar.xz
forums-47b32f1da9edca7945bbc82ad65cdc30cb969890.zip
Merge branch '3.1.x'
Conflicts: phpBB/phpbb/avatar/driver/upload.php tests/avatar/manager_test.php
Diffstat (limited to 'tests/avatar/manager_test.php')
-rw-r--r--tests/avatar/manager_test.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 71f40c0b13..6d77f2ed3a 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -59,6 +59,8 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
$guesser = new \phpbb\mimetype\guesser($guessers);
$imagesize = new \fastImageSize\fastImageSize();
+ $dispatcher = new phpbb_mock_event_dispatcher();
+
// $this->avatar_foobar will be needed later on
$this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache));
$this->avatar_foobar->expects($this->any())
@@ -79,7 +81,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
}
else
{
- $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $filesystem, $path_helper, $guesser, $cache));
+ $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $filesystem, $path_helper, $guesser, $dispatcher, $cache));
}
$cur_avatar->expects($this->any())
->method('get_name')