diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-27 09:52:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-27 15:08:58 +0100 |
| commit | b2f638b79359ee6df600ca940ffa2b1657235364 (patch) | |
| tree | c4cc7e9439d480cbc53e2c2cde758739aa654349 /tests/avatar | |
| parent | b0e0834637172c86f3a152034d77d558e95b2e61 (diff) | |
| download | forums-b2f638b79359ee6df600ca940ffa2b1657235364.tar forums-b2f638b79359ee6df600ca940ffa2b1657235364.tar.gz forums-b2f638b79359ee6df600ca940ffa2b1657235364.tar.bz2 forums-b2f638b79359ee6df600ca940ffa2b1657235364.tar.xz forums-b2f638b79359ee6df600ca940ffa2b1657235364.zip | |
[ticket/11857] Use passed service collection instead of container in manager
The service collection that was already passed to the avatar manager should
be used in the avatar manager method get_driver() instead of the container
itself.
PHPBB3-11857
Diffstat (limited to 'tests/avatar')
| -rw-r--r-- | tests/avatar/manager_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 4afa594beb..0db3f13617 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -112,7 +112,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase public function test_get_driver_enabled($driver_name, $expected) { $driver = $this->manager->get_driver($driver_name); - $this->assertEquals($expected, $driver); + $this->assertEquals($expected, ($driver === null) ? null : $driver->get_name()); } public function get_driver_data_all() @@ -133,7 +133,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase public function test_get_driver_all($driver_name, $expected) { $driver = $this->manager->get_driver($driver_name, false); - $this->assertEquals($expected, $driver); + $this->assertEquals($expected, ($driver === null) ? $driver : $driver->get_name()); } public function test_get_avatar_settings() |