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

Merge pull request #6504 from marc1706/ticket/17153

Browse Source 
[ticket/17153] Use avatar classes and twig to render avatars
This commit is contained in:
Marc Alexander
2024-06-06 16:23:41 +02:00
committed by GitHub
parent 272daae337 c495a26f98
commit d64eaad487
12 changed files with 148 additions and 196 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())

75
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
@@ -34,7 +32,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$this->user->style['style_parent_id'] = 0;
global $auth, $request, $symfony_request, $user;
$user = new phpbb_mock_user();
$user = $this->createMock(\phpbb\user::class);
$user->optionset('user_id', 2);
$user->style['style_path'] = '';
$user->data['user_id'] = 2;
@@ -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,
@@ -89,6 +86,14 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$enabled_drivers = $class->getProperty('enabled_drivers');
$enabled_drivers->setAccessible(true);
$enabled_drivers->setValue($class, false);
$avatar_helper = new phpbb\avatar\helper(
$config,
$phpbb_dispatcher,
$lang,
$phpbb_container->get('avatar.manager'),
$phpbb_path_helper,
$user
);
$this->template_path = $this->test_path . '/templates';
@@ -122,7 +127,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$this->user,
[
new \phpbb\template\twig\extension($context, $twig, $this->lang),
new \phpbb\template\twig\extension\avatar(),
new \phpbb\template\twig\extension\avatar($avatar_helper),
new \phpbb\template\twig\extension\config($config),
new \phpbb\template\twig\extension\icon($this->user),
new \phpbb\template\twig\extension\username(),
@@ -153,7 +158,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
],
[],
[],
'<img class="avatar" src="download/avatar/great_avatar.png" width="90" height="90" alt="foo" />',
'<img class="avatar" src="download/avatar/great_avatar.png" width="90" height="90" alt="foo">',
[]
],
[
@@ -171,7 +176,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
],
[],
[],
'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="download/avatar/great_avatar.png" width="90" height="90" alt="foo" />',
'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="download/avatar/great_avatar.png" width="90" height="90" alt="foo">',
[]
],
[
@@ -190,6 +195,56 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
'',
[]
],
[
'avatar_group.html',
[
'row' => [
'group_avatar' => 'great_avatar.png',
'group_avatar_type' => 'avatar.driver.upload',
'group_avatar_width' => 90,
'group_avatar_height' => 90,
],
'alt' => 'foo'
],
[],
[],
'<img class="avatar" src="download/avatar/great_avatar.png" width="90" height="90" alt="foo">',
[]
],
[
'avatar_group.html',
[
'row' => [
'group_avatar' => 'great_avatar.png',
'group_avatar_type' => 'avatar.driver.upload',
'group_avatar_width' => 90,
'group_avatar_height' => 90,
],
'alt' => 'foo',
'ignore_config' => true,
'lazy' => true,
],
[],
[],
'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="download/avatar/great_avatar.png" width="90" height="90" alt="foo">',
[]
],
[
'avatar_group.html',
[
'row' => [
'group_avatar' => 'foo@bar.com',
'group_avatar_type' => 'avatar.driver.gravatar',
'group_avatar_width' => 90,
'group_avatar_height' => 90,
],
'alt' => 'foo'
],
[],
[],
'',
[]
],
[
'extension_username_test.html',
[

1
tests/template/templates/avatar_group.html Normal file
View File

@@ -0,0 +1 @@
{{ avatar('group', row, alt, ignore_config, lazy) }}