diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2017-01-15 11:24:15 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2017-01-15 11:24:15 +0100 |
| commit | 52d53ef3de93f1d840f82520848a8d6b113da64a (patch) | |
| tree | 1c9bddd6dbf90c69da85d088b58f59b7436ca668 | |
| parent | 42e78004fbe9cce9a77f718a281d95b2c9b1e5d2 (diff) | |
| download | forums-52d53ef3de93f1d840f82520848a8d6b113da64a.tar forums-52d53ef3de93f1d840f82520848a8d6b113da64a.tar.gz forums-52d53ef3de93f1d840f82520848a8d6b113da64a.tar.bz2 forums-52d53ef3de93f1d840f82520848a8d6b113da64a.tar.xz forums-52d53ef3de93f1d840f82520848a8d6b113da64a.zip | |
[ticket/15016] Fixed an issue with some parentheses in smilies
PHPBB3-15016
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 19 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-15016.html | 1 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-15016.txt | 1 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-15016.xml | 43 |
5 files changed, 58 insertions, 8 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 15cbd2d052..976c3a74cd 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -33,7 +33,7 @@ "marc1706/fast-image-size": "^1.1", "paragonie/random_compat": "^1.4", "patchwork/utf8": "^1.1", - "s9e/text-formatter": "~0.8.0", + "s9e/text-formatter": "~0.9.0", "symfony/config": "^2.8", "symfony/console": "^2.8", "symfony/debug": "^2.8", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 70f65a290e..c105fbdf6c 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -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": "8d03337c5b9f6ae7cc1a26f84ba0270b", - "content-hash": "be4cb6437adc268d96f99bcbaad66d03", + "hash": "fa77bb5667bcac933b072b639a44aec0", + "content-hash": "da4fd9fbb589d2cffaa3f0168875475d", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -658,16 +658,16 @@ }, { "name": "s9e/text-formatter", - "version": "0.8.4", + "version": "0.9.0", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6" + "reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/919fd772aae4dd889618da1cb18ae746f2a14bb6", - "reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9dc4227779f8a753dbf0c4f8cb129320522d325c", + "reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c", "shasum": "" }, "require": { @@ -676,6 +676,11 @@ "lib-pcre": ">=7.2", "php": ">=5.3.3" }, + "require-dev": { + "matthiasmullie/minify": "*", + "php": ">=5.3.3", + "s9e/regexp-builder": ">=1.3.0" + }, "suggest": { "ext-curl": "Improves the performance of the MediaEmbed plugin and some JavaScript minifiers", "ext-intl": "Allows international URLs to be accepted by the URL filter", @@ -714,7 +719,7 @@ "parser", "shortcodes" ], - "time": "2016-11-22 20:10:24" + "time": "2017-01-15 10:15:45" }, { "name": "symfony/config", diff --git a/tests/text_processing/tickets_data/PHPBB3-15016.html b/tests/text_processing/tickets_data/PHPBB3-15016.html new file mode 100644 index 0000000000..47b66ad771 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-15016.html @@ -0,0 +1 @@ +<img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")--(" title=")--("> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")-(" title=")-("> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")--" title=")--">
\ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-15016.txt b/tests/text_processing/tickets_data/PHPBB3-15016.txt new file mode 100644 index 0000000000..081d9e3dc9 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-15016.txt @@ -0,0 +1 @@ +)--( )-( )--
\ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-15016.xml b/tests/text_processing/tickets_data/PHPBB3-15016.xml new file mode 100644 index 0000000000..644481861e --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-15016.xml @@ -0,0 +1,43 @@ +<?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>1</value> + <value>)--(</value> + <value>)--(</value> + <value>icon_lol.gif</value> + <value>15</value> + <value>17</value> + <value>22</value> + <value>1</value> + </row> + <row> + <value>2</value> + <value>)--</value> + <value>)--</value> + <value>icon_lol.gif</value> + <value>15</value> + <value>17</value> + <value>22</value> + <value>1</value> + </row> + <row> + <value>3</value> + <value>)-(</value> + <value>)-(</value> + <value>icon_lol.gif</value> + <value>15</value> + <value>17</value> + <value>22</value> + <value>1</value> + </row> + </table> +</dataset> |