diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-05-27 20:50:53 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-27 20:50:53 +0200 |
| commit | b4d36e323563f2518f969a9153e0b407c8b832ca (patch) | |
| tree | 480c1bbe435ac1a7588084657b4cda9c07e8437b | |
| parent | b9a40be9b402b059309c64680b65889a00e4d887 (diff) | |
| parent | 95ab32525102743374277d5c0134635361ef57b5 (diff) | |
| download | forums-b4d36e323563f2518f969a9153e0b407c8b832ca.tar forums-b4d36e323563f2518f969a9153e0b407c8b832ca.tar.gz forums-b4d36e323563f2518f969a9153e0b407c8b832ca.tar.bz2 forums-b4d36e323563f2518f969a9153e0b407c8b832ca.tar.xz forums-b4d36e323563f2518f969a9153e0b407c8b832ca.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/composer.lock | 18 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-16053.html | 1 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-16053.txt | 1 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-16053.xml | 28 |
4 files changed, 40 insertions, 8 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 1759288199..58f70b02dd 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -331,7 +331,7 @@ "oauth", "security" ], - "time": "2016-07-12T22:15:00+00:00" + "time": "2018-02-14T22:37:14+00:00" }, { "name": "marc1706/fast-image-size", @@ -550,7 +550,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13T16:22:52+00:00" + "time": "2018-04-04T21:48:54+00:00" }, { "name": "patchwork/utf8", @@ -799,16 +799,16 @@ }, { "name": "s9e/text-formatter", - "version": "1.4.3", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "76138c98161b2a063ecb28f5a46f9212a04aad1a" + "reference": "504d538593350150e50c9de0a48418bb0a48e540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/76138c98161b2a063ecb28f5a46f9212a04aad1a", - "reference": "76138c98161b2a063ecb28f5a46f9212a04aad1a", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/504d538593350150e50c9de0a48418bb0a48e540", + "reference": "504d538593350150e50c9de0a48418bb0a48e540", "shasum": "" }, "require": { @@ -820,6 +820,7 @@ "require-dev": { "matthiasmullie/minify": "*", "php-coveralls/php-coveralls": "*", + "phpunit/phpunit": "<6", "s9e/regexp-builder": "1.*" }, "suggest": { @@ -860,7 +861,7 @@ "parser", "shortcodes" ], - "time": "2019-04-26T12:32:18+00:00" + "time": "2019-05-15T00:08:12+00:00" }, { "name": "symfony/config", @@ -2509,7 +2510,8 @@ "authors": [ { "name": "Michiel Rook", - "email": "mrook@php.net" + "email": "mrook@php.net", + "role": "Lead" }, { "name": "Phing Community", diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.html b/tests/text_processing/tickets_data/PHPBB3-16053.html new file mode 100644 index 0000000000..af70ddf7eb --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.html @@ -0,0 +1 @@ +<a href="http://ea117.com" alt="Test">Test</a>
\ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.txt b/tests/text_processing/tickets_data/PHPBB3-16053.txt new file mode 100644 index 0000000000..c786665eb9 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.txt @@ -0,0 +1 @@ +[test=http://ea117.com]Test[/test]
\ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.xml b/tests/text_processing/tickets_data/PHPBB3-16053.xml new file mode 100644 index 0000000000..25f7c9e34e --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.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>test</value> + <value></value> + <value>1</value> + <value>[test={URL}]{TEXT}[/test]</value> + <value><![CDATA[<a href="{URL}" alt="{TEXT}">{TEXT}</a>]]></value> + <value>((?!))</value> + <value></value> + <value>((?!))</value> + <value></value> + </row> + </table> +</dataset> |