From a563b616e018088bcd2dd2fe1d6ba90c698caa3f Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 4 Jun 2019 18:21:11 +0200
Subject: [PATCH] [ticket/16074] Fix Twemoji URL for ZWJ sequences
PHPBB3-16074
---
phpBB/composer.lock | 10 +++++-----
tests/text_processing/tickets_data/PHPBB3-16074.html | 1 +
tests/text_processing/tickets_data/PHPBB3-16074.txt | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/text_processing/tickets_data/PHPBB3-16074.html
create mode 100644 tests/text_processing/tickets_data/PHPBB3-16074.txt
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index ea36d1ba8d..7d4f355e64 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -661,16 +661,16 @@
},
{
"name": "s9e/text-formatter",
- "version": "1.4.4",
+ "version": "1.4.5",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "504d538593350150e50c9de0a48418bb0a48e540"
+ "reference": "6857c53658929b66dc0d92daece17f211c64ea61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/504d538593350150e50c9de0a48418bb0a48e540",
- "reference": "504d538593350150e50c9de0a48418bb0a48e540",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/6857c53658929b66dc0d92daece17f211c64ea61",
+ "reference": "6857c53658929b66dc0d92daece17f211c64ea61",
"shasum": ""
},
"require": {
@@ -723,7 +723,7 @@
"parser",
"shortcodes"
],
- "time": "2019-05-15T00:08:12+00:00"
+ "time": "2019-06-04T15:47:55+00:00"
},
{
"name": "symfony/config",
diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.html b/tests/text_processing/tickets_data/PHPBB3-16074.html
new file mode 100644
index 0000000000..b588e2ac47
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16074.html
@@ -0,0 +1 @@
+<img alt=":man_judge:" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg"> <img alt="👨⚖️" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg">
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.txt b/tests/text_processing/tickets_data/PHPBB3-16074.txt
new file mode 100644
index 0000000000..f067a7294d
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16074.txt
@@ -0,0 +1 @@
+:man_judge: 👨⚖️
\ No newline at end of file