From 33f1934b727ce71e272447356941de18f999d53f Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 2 Nov 2016 09:19:35 +0100
Subject: [PATCH] [ticket/14846] Updated s9e\TextFormatter
PHPBB3-14846
---
phpBB/composer.lock | 10 +++----
.../tickets_data/PHPBB3-14846.html | 1 +
.../tickets_data/PHPBB3-14846.txt | 1 +
.../tickets_data/PHPBB3-14846.xml | 28 +++++++++++++++++++
4 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 tests/text_processing/tickets_data/PHPBB3-14846.html
create mode 100644 tests/text_processing/tickets_data/PHPBB3-14846.txt
create mode 100644 tests/text_processing/tickets_data/PHPBB3-14846.xml
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 9e698f939f..175aa6f7d3 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -649,16 +649,16 @@
},
{
"name": "s9e/text-formatter",
- "version": "0.8.1",
+ "version": "0.8.3",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf"
+ "reference": "34668fccbe259fbca0331e7a34409c4502ee71bd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
- "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34668fccbe259fbca0331e7a34409c4502ee71bd",
+ "reference": "34668fccbe259fbca0331e7a34409c4502ee71bd",
"shasum": ""
},
"require": {
@@ -705,7 +705,7 @@
"parser",
"shortcodes"
],
- "time": "2016-10-09 23:40:32"
+ "time": "2016-11-02 08:14:58"
},
{
"name": "symfony/config",
diff --git a/tests/text_processing/tickets_data/PHPBB3-14846.html b/tests/text_processing/tickets_data/PHPBB3-14846.html
new file mode 100644
index 0000000000..461ca25bc6
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14846.html
@@ -0,0 +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>
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14846.txt b/tests/text_processing/tickets_data/PHPBB3-14846.txt
new file mode 100644
index 0000000000..ded7b3f1fe
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14846.txt
@@ -0,0 +1 @@
+[mod=Mickroz]moderator text[/mod]
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14846.xml b/tests/text_processing/tickets_data/PHPBB3-14846.xml
new file mode 100644
index 0000000000..94b094f0e3
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14846.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+ <table name="phpbb_bbcodes">
+ <column>bbcode_id</column>
+ <column>bbcode_tag</column>
+ <column>bbcode_helpline</column>
+ <column>display_on_posting</column>
+ <column>bbcode_match</column>
+ <column>bbcode_tpl</column>
+ <column>first_pass_match</column>
+ <column>first_pass_replace</column>
+ <column>second_pass_match</column>
+ <column>second_pass_replace</column>
+
+ <row>
+ <value>13</value>
+ <value>mod=</value>
+ <value></value>
+ <value>1</value>
+ <value>[mod={TEXT1}]{TEXT2}[/mod]</value>
+ <value><![CDATA[<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">{TEXT2}<div style="font-weight: bold; text-align: right">- {TEXT1}</div></div>]]></value>
+ <value><\[/mod\]!ies]]></value>
+ <value><![CDATA['[mod='.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', ''', '(', ')'), trim('${1}')).':$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', ''', '(', ')'), trim('${2}')).'[/mod:$uid]']]></value>
+ <value><\[/mod:$uid\]!s]]></value>
+ <value><![CDATA[<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">${2}<div style="font-weight: bold; text-align: right">- ${1}</div></div>]]></value>
+ </row>
+ </table>
+</dataset>