aboutsummaryrefslogtreecommitdiffstats
path: root/tests/avatar
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-05 18:31:01 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-05 18:31:01 +0200
commitd9de4fc72c82ff1eb3ac5cbe64259a2bc0405037 (patch)
tree377b0d301a8c6dc53f568320b7c2aeaf6db4fe75 /tests/avatar
parentf27e4a44b85909fe0d93afc55e4266bd6d927fba (diff)
downloadforums-d9de4fc72c82ff1eb3ac5cbe64259a2bc0405037.tar
forums-d9de4fc72c82ff1eb3ac5cbe64259a2bc0405037.tar.gz
forums-d9de4fc72c82ff1eb3ac5cbe64259a2bc0405037.tar.bz2
forums-d9de4fc72c82ff1eb3ac5cbe64259a2bc0405037.tar.xz
forums-d9de4fc72c82ff1eb3ac5cbe64259a2bc0405037.zip
[ticket/12504] Use local variables where possible
PHPBB3-12504
Diffstat (limited to 'tests/avatar')
-rw-r--r--tests/avatar/manager_test.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 7e78201b2f..69d4280b9a 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -11,13 +11,18 @@ require_once dirname(__FILE__) . '/driver/foobar.php';
class phpbb_avatar_manager_test extends \phpbb_test_case
{
+ /** @var \phpbb\avatar\manager */
+ protected $manager;
+ protected $avatar_foobar;
+ protected $avatar_barfoo;
+
public function setUp()
{
global $phpbb_root_path, $phpEx;
// Mock phpbb_container
- $this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
- $this->phpbb_container->expects($this->any())
+ $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $phpbb_container->expects($this->any())
->method('get')
->will($this->returnArgument(0));
@@ -59,7 +64,7 @@ class phpbb_avatar_manager_test extends \phpbb_test_case
$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
// Set up avatar manager
- $this->manager = new \phpbb\avatar\manager($config, $avatar_drivers, $this->phpbb_container);
+ $this->manager = new \phpbb\avatar\manager($config, $avatar_drivers, $phpbb_container);
}
protected function avatar_drivers()
@@ -221,8 +226,6 @@ class phpbb_avatar_manager_test extends \phpbb_test_case
*/
public function test_clean_row(array $input, array $output, $prefix = '')
{
- $cleaned_row = array();
-
$cleaned_row = \phpbb\avatar\manager::clean_row($input, $prefix);
foreach ($output as $key => $value)
{