mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-12 20:02:08 +02:00
[ticket/15921] Updated dependencies to latest textformatter
PHPBB3-15921
This commit is contained in:
JoshyPHP
Marc Alexander
parent
95424f1b98
commit
31c0466815
@ -33,7 +33,7 @@
|
||||
"marc1706/fast-image-size": "^1.1",
|
||||
"paragonie/random_compat": "^1.4",
|
||||
"patchwork/utf8": "^1.1",
|
||||
"s9e/text-formatter": "~0.13.0",
|
||||
"s9e/text-formatter": "^1.3",
|
||||
"symfony/config": "^2.8",
|
||||
"symfony/console": "^2.8",
|
||||
"symfony/debug": "^2.8",
|
||||
|
||||
27
phpBB/composer.lock
generated
27
phpBB/composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "c843abc1344cd9df37f63c08a125cad0",
|
||||
"content-hash": "6daa2f5f7a161377dee1835bd4d5b463",
|
||||
"packages": [
|
||||
{
|
||||
"name": "bantu/ini-get-wrapper",
|
||||
@ -342,7 +342,7 @@
|
||||
"oauth",
|
||||
"security"
|
||||
],
|
||||
"time": "2016-07-12T22:15:00+00:00"
|
||||
"time": "2018-02-14T22:37:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "marc1706/fast-image-size",
|
||||
@ -505,7 +505,7 @@
|
||||
"pseudorandom",
|
||||
"random"
|
||||
],
|
||||
"time": "2017-03-13T16:22:52+00:00"
|
||||
"time": "2018-04-04T21:48:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "patchwork/utf8",
|
||||
@ -661,16 +661,16 @@
|
||||
},
|
||||
{
|
||||
"name": "s9e/text-formatter",
|
||||
"version": "0.13.1",
|
||||
"version": "1.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/s9e/TextFormatter.git",
|
||||
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f"
|
||||
"reference": "640b65b0d4c1de93bc98000c003998c08b2e7256"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
|
||||
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/640b65b0d4c1de93bc98000c003998c08b2e7256",
|
||||
"reference": "640b65b0d4c1de93bc98000c003998c08b2e7256",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -681,8 +681,8 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"matthiasmullie/minify": "*",
|
||||
"php": ">=5.4.7",
|
||||
"s9e/regexp-builder": ">=1.3.0"
|
||||
"php-coveralls/php-coveralls": "*",
|
||||
"s9e/regexp-builder": "1.*"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-curl": "Improves the performance of the MediaEmbed plugin and some JavaScript minifiers",
|
||||
@ -722,7 +722,7 @@
|
||||
"parser",
|
||||
"shortcodes"
|
||||
],
|
||||
"time": "2017-12-10T00:55:53+00:00"
|
||||
"time": "2018-12-23T20:27:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/config",
|
||||
@ -2293,7 +2293,8 @@
|
||||
"authors": [
|
||||
{
|
||||
"name": "Michiel Rook",
|
||||
"email": "mrook@php.net"
|
||||
"email": "mrook@php.net",
|
||||
"role": "Lead"
|
||||
},
|
||||
{
|
||||
"name": "Phing Community",
|
||||
@ -2891,9 +2892,7 @@
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com",
|
||||
"homepage": "http://fabien.potencier.org",
|
||||
"role": "Lead Developer"
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
|
||||
|
||||
@ -23,14 +23,16 @@ class link_helper
|
||||
*
|
||||
* @param \s9e\TextFormatter\Parser\Tag $tag LINK_TEXT tag
|
||||
* @param \s9e\TextFormatter\Parser $parser Parser
|
||||
* @return bool Whether the tag is valid
|
||||
* @return void
|
||||
*/
|
||||
public function cleanup_tag(\s9e\TextFormatter\Parser\Tag $tag, \s9e\TextFormatter\Parser $parser)
|
||||
{
|
||||
// Invalidate if the content of the tag matches the text attribute
|
||||
$text = substr($parser->getText(), $tag->getPos(), $tag->getLen());
|
||||
|
||||
return ($text !== $tag->getAttribute('text'));
|
||||
if ($text === $tag->getAttribute('text'))
|
||||
{
|
||||
$tag->invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -40,7 +42,7 @@ class link_helper
|
||||
*
|
||||
* @param \s9e\TextFormatter\Parser\Tag $tag URL tag (start tag)
|
||||
* @param \s9e\TextFormatter\Parser $parser Parser
|
||||
* @return bool Always true to indicate that the tag is valid
|
||||
* @return void
|
||||
*/
|
||||
public function generate_link_text_tag(\s9e\TextFormatter\Parser\Tag $tag, \s9e\TextFormatter\Parser $parser)
|
||||
{
|
||||
@ -49,7 +51,7 @@ class link_helper
|
||||
// the [url] BBCode when its content is used for the URL
|
||||
if (!$tag->getEndTag() || !$this->should_shorten($tag, $parser->getText()))
|
||||
{
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
// Capture the text between the start tag and its end tag
|
||||
@ -60,8 +62,6 @@ class link_helper
|
||||
|
||||
// Create a tag that consumes the link's text
|
||||
$parser->addSelfClosingTag('LINK_TEXT', $start, $length)->setAttribute('text', $text);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -84,7 +84,7 @@ class link_helper
|
||||
*
|
||||
* @param \s9e\TextFormatter\Parser\Tag $tag LINK_TEXT tag
|
||||
* @param string $board_url Forum's root URL (with trailing slash)
|
||||
* @return bool Always true to indicate that the tag is valid
|
||||
* @return void
|
||||
*/
|
||||
public function truncate_local_url(\s9e\TextFormatter\Parser\Tag $tag, $board_url)
|
||||
{
|
||||
@ -93,15 +93,13 @@ class link_helper
|
||||
{
|
||||
$tag->setAttribute('text', substr($text, strlen($board_url)));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Truncate the replacement text set in a LINK_TEXT tag
|
||||
*
|
||||
* @param \s9e\TextFormatter\Parser\Tag $tag LINK_TEXT tag
|
||||
* @return bool Always true to indicate that the tag is valid
|
||||
* @return void
|
||||
*/
|
||||
public function truncate_text(\s9e\TextFormatter\Parser\Tag $tag)
|
||||
{
|
||||
@ -109,10 +107,7 @@ class link_helper
|
||||
if (utf8_strlen($text) > 55)
|
||||
{
|
||||
$text = utf8_substr($text, 0, 39) . ' ... ' . utf8_substr($text, -10);
|
||||
$tag->setAttribute('text', $text);
|
||||
}
|
||||
|
||||
$tag->setAttribute('text', $text);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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/3.1/png/64/1f600.png">'
|
||||
'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/emojione/assets/4.0/png/64/1f600.png">'
|
||||
),
|
||||
array(
|
||||
"Emoji: \xF0\x9F\x98\x80",
|
||||
|
||||
@ -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/3.1/png/64/1f197.png">
|
||||
<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/4.0/png/64/1f197.png">
|
||||
Loading…
x
Reference in New Issue
Block a user