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

Merge pull request #6740 from marc1706/ticket/17304

Browse Source 
[ticket/17304] Use HiDPI smilies provided by rednoah and stop using twemoji
This commit is contained in:
Marc Alexander
2024-10-25 21:23:00 +02:00
committed by GitHub
parent 4985a27dcf 42eed1f917
commit a2b1cc57eb
33 changed files with 164 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/acp_smilies_test.php
View File

@@ -24,8 +24,8 @@ class phpbb_functional_acp_smilies_test extends phpbb_functional_test_case
// Create the BBCode
$crawler = self::request('GET', 'adm/index.php?i=acp_icons&sid=' . $this->sid . '&mode=smilies&action=edit&id=1');
$form = $crawler->selectButton('Submit')->form(array(
'code[icon_e_biggrin.gif]' => '>:D',
'emotion[icon_e_biggrin.gif]' => '>:D'
'code[icon_e_biggrin.svg]' => '>:D',
'emotion[icon_e_biggrin.svg]' => '>:D'
));
self::submit($form);

4
tests/text_formatter/s9e/default_formatting_test.php
View File

@@ -310,11 +310,11 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
),
array(
"Emoji: \xF0\x9F\x98\x80",
'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f600.svg">'
"Emoji: <span class=\"emoji\">\xF0\x9F\x98\x80</span>",
),
array(
"Emoji: \xF0\x9F\x98\x80",
"Emoji: \xF0\x9F\x98\x80",
"Emoji: <span class=\"emoji\">\xF0\x9F\x98\x80</span>",
function ($container)
{
$container->get('text_formatter.renderer')->set_viewsmilies(false);

2
tests/text_processing/tickets_data/PHPBB3-15348.html
View File

@@ -1 +1 @@
<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <img alt=":ok:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f197.svg">
<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <span class="emoji">:ok:</span>

2
tests/text_processing/tickets_data/PHPBB3-16074.html
View File

@@ -1 +1 @@
<img alt=":man_judge:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f468-200d-2696-fe0f.svg"> <img alt="👨‍⚖️" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f468-200d-2696-fe0f.svg">
<span class="emoji">:man_judge:</span> <span class="emoji">👨‍⚖️</span>