mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-12-27 18:16:29 +01:00
parent 93beaa8a3a 9632294730
commit 1656ca4011
14 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,27 +50,27 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
return array(
array(
'[b]bold[/b]',
'<span style="font-weight: bold">bold</span>'
'<span style="font-weight:bold">bold</span>'
),
array(
'[u]underlined[/u]',
'<span style="text-decoration: underline">underlined</span>'
'<span style="text-decoration:underline">underlined</span>'
),
array(
'[i]italic[/i]',
'<span style="font-style: italic">italic</span>'
'<span style="font-style:italic">italic</span>'
),
array(
'[color=#FF0000]colored[/color]',
'<span style="color: #FF0000">colored</span>'
'<span style="color:#FF0000">colored</span>'
),
array(
'[color=red]colored[/color]',
'<span style="color: red">colored</span>'
'<span style="color:red">colored</span>'
),
array(
'[size=75]smaller[/size]',
'<span style="font-size: 75%; line-height: normal">smaller</span>'
'<span style="font-size:75%;line-height:normal">smaller</span>'
),
array(
'[quote]quoted[/quote]',
@@ -102,31 +102,31 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
),
array(
'[list=1][*]item[/list]',
'<ol style="list-style-type: decimal"><li>item</li></ol>'
'<ol style="list-style-type:decimal"><li>item</li></ol>'
),
array(
'[list=a][*]item[/list]',
'<ol style="list-style-type: lower-alpha"><li>item</li></ol>'
'<ol style="list-style-type:lower-alpha"><li>item</li></ol>'
),
array(
'[list=i][*]item[/list]',
'<ol style="list-style-type: lower-roman"><li>item</li></ol>'
'<ol style="list-style-type:lower-roman"><li>item</li></ol>'
),
array(
'[list=I][*]item[/list]',
'<ol style="list-style-type: upper-roman"><li>item</li></ol>'
'<ol style="list-style-type:upper-roman"><li>item</li></ol>'
),
array(
'[list=disc][*]item[/list]',
'<ul style="list-style-type: disc"><li>item</li></ul>'
'<ul style="list-style-type:disc"><li>item</li></ul>'
),
array(
'[list=circle][*]item[/list]',
'<ul style="list-style-type: circle"><li>item</li></ul>'
'<ul style="list-style-type:circle"><li>item</li></ul>'
),
array(
'[list=square][*]item[/list]',
'<ul style="list-style-type: square"><li>item</li></ul>'
'<ul style="list-style-type:square"><li>item</li></ul>'
),
array(
'[img]https://area51.phpbb.com/images/area51.png[/img]',
@@ -180,17 +180,17 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
array(
// Allow textual bbcodes in textual bbcodes
'[b]bold [i]bold + italic[/i][/b]',
'<span style="font-weight: bold">bold <span style="font-style: italic">bold + italic</span></span>'
'<span style="font-weight:bold">bold <span style="font-style:italic">bold + italic</span></span>'
),
array(
// Allow textual bbcodes in url with description
'[url=https://area51.phpbb.com/]Area51 [i]italic[/i][/url]',
'<a href="https://area51.phpbb.com/" class="postlink">Area51 <span style="font-style: italic">italic</span></a>'
'<a href="https://area51.phpbb.com/" class="postlink">Area51 <span style="font-style:italic">italic</span></a>'
),
array(
// Allow url with description in textual bbcodes
'[i]italic [url=https://area51.phpbb.com/]Area51[/url][/i]',
'<span style="font-style: italic">italic <a href="https://area51.phpbb.com/" class="postlink">Area51</a></span>'
'<span style="font-style:italic">italic <a href="https://area51.phpbb.com/" class="postlink">Area51</a></span>'
),
array(
// Do not parse textual bbcodes in code
@@ -205,7 +205,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
array(
// Textual bbcode nesting into textual bbcode
'[b]bold [i]bold + italic[/b] italic[/i]',
'<span style="font-weight: bold">bold <span style="font-style: italic">bold + italic</span></span><span style="font-style: italic"> italic</span>'
'<span style="font-weight:bold">bold <span style="font-style:italic">bold + italic</span></span><span style="font-style:italic"> italic</span>'
),
array(
"[code]\tline1\n line2[/code]",
@@ -298,7 +298,7 @@ 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/emojione/assets/svg/1f600.svg">'
'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/emojione/assets/3.1/png/64/1f600.png">'
),
array(
"Emoji: \xF0\x9F\x98\x80",

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

@@ -1 +1 @@
<ul style="list-style-type: none"><li>This is my indented text</li></ul>
<ul style="list-style-type:none"><li>This is my indented text</li></ul>

4
tests/text_processing/tickets_data/PHPBB3-10268.html
View File

@@ -1,4 +1,4 @@
<blockquote><div><cite><a href="http://phpbb.com" class="postlink">http://phpbb.com</a> wrote:</cite>...</div></blockquote>
<blockquote><div><cite><a href="http://phpbb.com" class="postlink"> http://phpbb.com</a> wrote:</cite>...</div></blockquote>
<span style="font-weight: bold"><a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br>
<span style="font-weight: bold"> <a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br>
<span style="font-weight:bold"><a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br>
<span style="font-weight:bold"> <a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br>

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

@@ -1 +1 @@
<code>[color=#FF0000]</code> - <span style="color: #FF0000">red</span>
<code>[color=#FF0000]</code> - <span style="color:#FF0000">red</span>

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

@@ -1 +1 @@
<span style="font-size: 200%; line-height: normal"></span><div style="text-align:center"><span style="font-size: 200%; line-height: normal">xxx</span></div>
<span style="font-size:200%;line-height:normal"></span><div style="text-align:center"><span style="font-size:200%;line-height:normal">xxx</span></div>

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

@@ -1 +1 @@
<ul><li><ol style="list-style-type: lower-alpha"><li>a</li><li>b</li><li>c</li><li>d</li><li>e</li></ol></li><li>outer</li></ul>
<ul><li><ol style="list-style-type:lower-alpha"><li>a</li><li>b</li><li>c</li><li>d</li><li>e</li></ol></li><li>outer</li></ul>

8
tests/text_processing/tickets_data/PHPBB3-14790.html
View File

@@ -1,4 +1,4 @@
<span style="color: #0000FF"></span><ul><li><span style="color: #0000FF">text</span></li>
<li><span style="color: #0000FF">text</span></li>
<li><span style="color: #0000FF">text</span></li>
<li><span style="color: #0000FF">text</span></li></ul>
<span style="color:#0000FF"></span><ul><li><span style="color:#0000FF">text</span></li>
<li><span style="color:#0000FF">text</span></li>
<li><span style="color:#0000FF">text</span></li>
<li><span style="color:#0000FF">text</span></li></ul>

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

@@ -1 +1 @@
<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">moderator text<div style="font-weight: bold; text-align: right">- Mickroz</div></div>
<div style="padding:.2em .5em;font-size:.8em;width:200px;background:#ffd">moderator text<div style="font-weight:bold;text-align:right">- Mickroz</div></div>

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/emojione/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:"> <img alt=":ok:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/emojione/assets/3.1/png/64/1f197.png">

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

@@ -1 +1 @@
<span style="font-style: italic"><span style="font-weight: bold"><span style="color: #FF0000">tę </span></span></span>przykład
<span style="font-style:italic"><span style="font-weight:bold"><span style="color:red">tę </span></span></span>przykład