mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-18 22:58:10 +01:00
[ticket/15457] Updated s9e/text-formatter dependency
PHPBB3-15457
This commit is contained in:
JoshyPHP
parent
2643e851f2
commit
b9dce3fa65
@ -33,7 +33,7 @@
|
||||
"marc1706/fast-image-size": "^1.1",
|
||||
"paragonie/random_compat": "^1.4",
|
||||
"patchwork/utf8": "^1.1",
|
||||
"s9e/text-formatter": "~0.11.0",
|
||||
"s9e/text-formatter": "~0.13.0",
|
||||
"symfony/config": "^2.8",
|
||||
"symfony/console": "^2.8",
|
||||
"symfony/debug": "^2.8",
|
||||
@ -69,7 +69,7 @@
|
||||
},
|
||||
"config": {
|
||||
"platform": {
|
||||
"php": "5.4"
|
||||
"php": "5.4.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
20
phpBB/composer.lock
generated
20
phpBB/composer.lock
generated
@ -4,8 +4,8 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "7c30306b2abcb79a206bf6497ef45a02",
|
||||
"content-hash": "d559dd0af2317fb0fc15720a18834e33",
|
||||
"hash": "f14915a2ccaf76ccd6d3ea725721a8a8",
|
||||
"content-hash": "c843abc1344cd9df37f63c08a125cad0",
|
||||
"packages": [
|
||||
{
|
||||
"name": "bantu/ini-get-wrapper",
|
||||
@ -661,27 +661,27 @@
|
||||
},
|
||||
{
|
||||
"name": "s9e/text-formatter",
|
||||
"version": "0.11.2",
|
||||
"version": "0.13.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/s9e/TextFormatter.git",
|
||||
"reference": "735a56076e29348d838ce6c2658996daae86718f"
|
||||
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/735a56076e29348d838ce6c2658996daae86718f",
|
||||
"reference": "735a56076e29348d838ce6c2658996daae86718f",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
|
||||
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-dom": "*",
|
||||
"ext-filter": "*",
|
||||
"lib-pcre": ">=7.2",
|
||||
"php": ">=5.3.3"
|
||||
"php": ">=5.4.7"
|
||||
},
|
||||
"require-dev": {
|
||||
"matthiasmullie/minify": "*",
|
||||
"php": ">=5.3.3",
|
||||
"php": ">=5.4.7",
|
||||
"s9e/regexp-builder": ">=1.3.0"
|
||||
},
|
||||
"suggest": {
|
||||
@ -722,7 +722,7 @@
|
||||
"parser",
|
||||
"shortcodes"
|
||||
],
|
||||
"time": "2017-10-02 16:58:51"
|
||||
"time": "2017-12-10 00:55:53"
|
||||
},
|
||||
{
|
||||
"name": "symfony/config",
|
||||
@ -3577,6 +3577,6 @@
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-overrides": {
|
||||
"php": "5.4"
|
||||
"php": "5.4.7"
|
||||
}
|
||||
}
|
||||
|
||||
@ -266,7 +266,8 @@ class factory implements \phpbb\textformatter\cache_interface
|
||||
->addParameterByName('logger')
|
||||
->addParameterByName('max_img_height')
|
||||
->addParameterByName('max_img_width')
|
||||
->markAsSafeAsURL();
|
||||
->markAsSafeAsURL()
|
||||
->setJS('UrlFilter.filter');
|
||||
|
||||
// Add default BBCodes
|
||||
foreach ($this->get_default_bbcodes($configurator) as $bbcode)
|
||||
@ -355,8 +356,6 @@ class factory implements \phpbb\textformatter\cache_interface
|
||||
$configurator->registeredVars['max_img_width'] = 0;
|
||||
|
||||
// Load the Emoji plugin and modify its tag's template to obey viewsmilies
|
||||
$configurator->Emoji->omitImageSize();
|
||||
$configurator->Emoji->useSVG();
|
||||
$tag = $configurator->Emoji->getTag();
|
||||
$tag->template = '<xsl:choose><xsl:when test="$S_VIEWSMILIES">' . str_replace('class="emoji"', 'class="emoji smilies"', $tag->template) . '</xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>';
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
namespace phpbb\textformatter\s9e;
|
||||
|
||||
use s9e\TextFormatter\Parser\BuiltInFilters;
|
||||
use s9e\TextFormatter\Parser\AttributeFilters\UrlFilter;
|
||||
use s9e\TextFormatter\Parser\Logger;
|
||||
|
||||
/**
|
||||
@ -196,7 +196,7 @@ class parser implements \phpbb\textformatter\parser_interface
|
||||
public function get_errors()
|
||||
{
|
||||
$errors = array();
|
||||
foreach ($this->parser->getLogger()->get() as $entry)
|
||||
foreach ($this->parser->getLogger()->getLogs() as $entry)
|
||||
{
|
||||
list(, $msg, $context) = $entry;
|
||||
|
||||
@ -365,7 +365,7 @@ class parser implements \phpbb\textformatter\parser_interface
|
||||
static public function filter_img_url($url, array $url_config, Logger $logger, $max_height, $max_width)
|
||||
{
|
||||
// Validate the URL
|
||||
$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
|
||||
$url = UrlFilter::filter($url, $url_config, $logger);
|
||||
if ($url === false)
|
||||
{
|
||||
return false;
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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>
|
||||
@ -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>
|
||||
|
||||
@ -1 +1 @@
|
||||
<code>[color=#FF0000]</code> - <span style="color: #FF0000">red</span>
|
||||
<code>[color=#FF0000]</code> - <span style="color:#FF0000">red</span>
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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">
|
||||
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user