mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/17153] Use routing helper instead of controller helper in upload avatar

Browse Source 
The controller helper class is not needed, routing helper brings all the
needed functionality already.

PHPBB3-17153
This commit is contained in:
Marc Alexander
2023-07-01 19:31:00 +02:00
parent 4db4a5571b
commit aac7d5a99c
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/avatar/manager_test.php
View File

@@ -58,6 +58,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
$phpbb_dispatcher = $dispatcher;
$controller_helper = $this->createMock('\phpbb\controller\helper');
$routing_helper = $this->createMock('\phpbb\routing\helper');
// $this->avatar_foobar will be needed later on
$this->avatar_foobar = $this->getMockBuilder('\phpbb\avatar\driver\foobar')
@@ -96,7 +97,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
{
$cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver)
->setMethods(array('get_name'))
->setConstructorArgs(array($this->config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $php_ini))
->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $routing_helper, $dispatcher, $files_factory, $php_ini))
->getMock();
}
$cur_avatar->expects($this->any())

9
tests/template/extension_test.php
View File

@@ -11,8 +11,6 @@
*
*/
use phpbb\controller\helper;
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_extension_test extends phpbb_template_template_test_case
@@ -68,9 +66,8 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
->disableOriginalConstructor()
->getMock();
$controller_helper = $this->createMock(helper::class);
$controller_helper
->method('route')
$routing_helper = $this->createMock(\phpbb\routing\helper::class);
$routing_helper->method('route')
->willReturnCallback(function($route, $params) {
return 'download/avatar/' . $params['file'];
});
@@ -78,7 +75,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_container = new phpbb_mock_container_builder();
$files = new phpbb\files\factory($phpbb_container);
$upload_avatar_driver = new phpbb\avatar\driver\upload($config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper());
$upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $routing_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper());
$upload_avatar_driver->set_name('avatar.driver.upload');
$phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [
$upload_avatar_driver,