From aeac3df4a1c07b927595f2bfccfadc01cc030192 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 8 Jan 2020 19:38:50 +0100
Subject: [PATCH] [ticket/16309] Fix smilies with a left square bracket

PHPBB3-16309
---
 phpBB/composer.lock                           | 16 +++++++------
 .../tickets_data/PHPBB3-16309.html            |  1 +
 .../tickets_data/PHPBB3-16309.txt             |  1 +
 .../tickets_data/PHPBB3-16309.xml             | 23 +++++++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-16309.html
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-16309.txt
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-16309.xml

diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 272c0fb9da..54a79d13f3 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -337,7 +337,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12T22:15:00+00:00"
+            "time": "2018-02-14T22:37:14+00:00"
         },
         {
             "name": "marc1706/fast-image-size",
@@ -810,16 +810,16 @@
         },
         {
             "name": "s9e/regexp-builder",
-            "version": "1.4.3",
+            "version": "1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/RegexpBuilder.git",
-                "reference": "59d0167a909659d718f53964f7653d2c83a5f8fe"
+                "reference": "605b33841a766abd40ba3d07c15d0f62b5e7f033"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/RegexpBuilder/zipball/59d0167a909659d718f53964f7653d2c83a5f8fe",
-                "reference": "59d0167a909659d718f53964f7653d2c83a5f8fe",
+                "url": "https://api.github.com/repos/s9e/RegexpBuilder/zipball/605b33841a766abd40ba3d07c15d0f62b5e7f033",
+                "reference": "605b33841a766abd40ba3d07c15d0f62b5e7f033",
                 "shasum": ""
             },
             "require": {
@@ -827,7 +827,7 @@
                 "php": ">=5.5.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "<5.8"
+                "phpunit/phpunit": "*"
             },
             "type": "library",
             "autoload": {
@@ -844,7 +844,7 @@
             "keywords": [
                 "regexp"
             ],
-            "time": "2019-04-26T17:55:23+00:00"
+            "time": "2020-01-08T02:46:22+00:00"
         },
         {
             "name": "s9e/text-formatter",
@@ -2218,6 +2218,7 @@
                 "code",
                 "zf"
             ],
+            "abandoned": "laminas/laminas-code",
             "time": "2019-12-10T19:21:15+00:00"
         },
         {
@@ -2272,6 +2273,7 @@
                 "events",
                 "zf2"
             ],
+            "abandoned": "laminas/laminas-eventmanager",
             "time": "2018-04-25T15:33:34+00:00"
         }
     ],
diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.html b/tests/text_processing/tickets_data/PHPBB3-16309.html
new file mode 100644
index 0000000000..d8ac3bfed2
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16309.html
@@ -0,0 +1 @@
+<img class="smilies" src="phpBB/images/smilies/lol.png" width="17" height="17" alt="[lol]" title="lol">
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.txt b/tests/text_processing/tickets_data/PHPBB3-16309.txt
new file mode 100644
index 0000000000..c10a809ea0
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16309.txt
@@ -0,0 +1 @@
+[lol]
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.xml b/tests/text_processing/tickets_data/PHPBB3-16309.xml
new file mode 100644
index 0000000000..a988e9df4a
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16309.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_smilies">
+		<column>smiley_id</column>
+		<column>code</column>
+		<column>emotion</column>
+		<column>smiley_url</column>
+		<column>smiley_width</column>
+		<column>smiley_height</column>
+		<column>smiley_order</column>
+		<column>display_on_posting</column>
+		<row>
+			<value>41</value>
+			<value>[lol]</value>
+			<value>lol</value>
+			<value>lol.png</value>
+			<value>17</value>
+			<value>17</value>
+			<value>41</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>