diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-21 10:20:12 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-21 10:20:12 +0200 |
| commit | d7bf50bc8073dbfe52c686066fcdd156550ab7f0 (patch) | |
| tree | 6298cdbb9e3df3e7f8bae9ea0d73f5e8052f0926 | |
| parent | 3f0ce78a25e433287e36bb92ff2c531e5a5b4743 (diff) | |
| download | forums-d7bf50bc8073dbfe52c686066fcdd156550ab7f0.tar forums-d7bf50bc8073dbfe52c686066fcdd156550ab7f0.tar.gz forums-d7bf50bc8073dbfe52c686066fcdd156550ab7f0.tar.bz2 forums-d7bf50bc8073dbfe52c686066fcdd156550ab7f0.tar.xz forums-d7bf50bc8073dbfe52c686066fcdd156550ab7f0.zip | |
[ticket/11930] Move path_helper in front of optional cache argument
Optional method arguments should be after any mandatory ones.
PHPBB3-11930
| -rw-r--r-- | phpBB/config/avatars.yml | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 2 | ||||
| -rw-r--r-- | tests/avatar/manager_test.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml index 5dae067642..d22a5db2ae 100644 --- a/phpBB/config/avatars.yml +++ b/phpBB/config/avatars.yml @@ -5,8 +5,8 @@ services: - @config - %core.root_path% - %core.php_ext% - - @cache.driver - @path_helper + - @cache.driver calls: - [set_name, [avatar.driver.gravatar]] tags: @@ -18,8 +18,8 @@ services: - @config - %core.root_path% - %core.php_ext% - - @cache.driver - @path_helper + - @cache.driver calls: - [set_name, [avatar.driver.local]] tags: @@ -31,8 +31,8 @@ services: - @config - %core.root_path% - %core.php_ext% - - @cache.driver - @path_helper + - @cache.driver calls: - [set_name, [avatar.driver.remote]] tags: @@ -44,8 +44,8 @@ services: - @config - %core.root_path% - %core.php_ext% - - @cache.driver - @path_helper + - @cache.driver calls: - [set_name, [avatar.driver.upload]] tags: diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index 95585ab13f..d682d7d114 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -83,7 +83,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface * @param string $php_ext PHP file extension * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null, \phpbb\path_helper $path_helper) + public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index ccb6a1085c..4afa594beb 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -35,7 +35,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase ); // $this->avatar_foobar will be needed later on - $this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache, $path_helper)); + $this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $path_helper, $cache)); $this->avatar_foobar->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.foobar')); @@ -48,7 +48,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase foreach ($this->avatar_drivers() as $driver) { - $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache, $path_helper)); + $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $path_helper, $cache)); $cur_avatar->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.' . $driver)); |