7 files changed, 182 insertions, 1 deletions
diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php
new file mode 100644
index 0000000000..351a38514f
--- /dev/null
+++ b/tests/email/email_parsing_test.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+class phpbb_email_parsing_test extends phpbb_test_case
+{
+	/** @var \messenger */
+	protected $messenger;
+
+	/** @var \ReflectionProperty */
+	protected $reflection_template_property;
+
+	public function setUp()
+	{
+		global $phpbb_container, $config, $phpbb_root_path, $phpEx, $request, $user;
+
+		$phpbb_container = new phpbb_mock_container_builder;
+
+		$config = new \phpbb\config\config(array(
+			'board_email_sig'     => '-- Thanks, The Management',
+			'sitename' 			=> 'yourdomain.com',
+			'default_lang'		=> 'en',
+		));
+		$phpbb_container->set('config', $config);
+
+		$request = new phpbb_mock_request;
+		$symfony_request = new \phpbb\symfony_request(
+			$request
+		);
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$phpbb_path_helper = new \phpbb\path_helper(
+			$symfony_request,
+			$filesystem,
+			$request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$phpbb_container->set('path_helper', $phpbb_path_helper);
+		$phpbb_container->set('filesystem', $filesystem);
+
+		$cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$phpbb_container->setParameter('core.template.cache_path', $cache_path);
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$phpbb_container->set('user', $user);
+		$extension_manager = new phpbb_mock_extension_manager(
+			dirname(__FILE__) . '/',
+			array(
+				'vendor2/foo' => array(
+					'ext_name' => 'vendor2/foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/vendor2/foo/',
+				),
+			)
+		);
+		$phpbb_container->set('ext.manager', $extension_manager);
+
+		$context = new \phpbb\template\context();
+		$twig_extension = new \phpbb\template\twig\extension($context, $lang);
+		$phpbb_container->set('template.twig.extensions.phpbb', $twig_extension);
+
+		$twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
+		$twig_extensions_collection->add('template.twig.extensions.phpbb');
+		$phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection);
+
+		$twig = new \phpbb\template\twig\environment(
+			$config,
+			$filesystem,
+			$phpbb_path_helper,
+			$cache_path,
+			null,
+			new \phpbb\template\twig\loader($filesystem, ''),
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$twig->addExtension($twig_extension);
+		$phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+
+		if (!class_exists('messenger'))
+		{
+			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+		}
+
+		$this->messenger = new \messenger();
+
+		$reflection = new ReflectionObject($this->messenger);
+		$this->reflection_template_property = $reflection->getProperty('template');
+		$this->reflection_template_property->setAccessible(true);
+	}
+
+	public function email_parsing_data()
+	{
+		return array(
+			array('Author username', 'Any forum', 'The topic title', 'Dear user'),
+			array('0', 'Any forum', 'The topic title', 'Dear user'),
+		);
+	}
+
+	/**
+	 * @dataProvider email_parsing_data
+	 */
+	public function test_email_parsing($author_name, $forum_name, $topic_title, $username)
+	{
+		global $config, $phpEx, $user;
+
+		$this->messenger->set_addresses($user->data);
+
+		$this->messenger->assign_vars(array(
+			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
+			'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
+
+			'AUTHOR_NAME'				=> $author_name,
+			'FORUM_NAME'				=> $forum_name,
+			'TOPIC_TITLE'				=> $topic_title,
+			'USERNAME'					=> $username,
+
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$phpEx}?f=1",
+			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$phpEx}?uid=2&f=1&unwatch=forum",
+		));
+		$this->messenger->template('newtopic_notify', $user->data['user_lang'], '', '');
+
+		$reflection_template = $this->reflection_template_property->getValue($this->messenger);
+		$msg = trim($reflection_template->assign_display('body'));
+
+		$this->assertContains($author_name, $msg);
+		$this->assertContains($forum_name, $msg);
+		$this->assertContains($topic_title, $msg);
+		$this->assertContains($username, $msg);
+		$this->assertContains(htmlspecialchars_decode($config['sitename']), $msg);
+		$this->assertContains(str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])), $msg);
+		$this->assertNotContains('EMAIL_SIG', $msg);
+		$this->assertNotContains('U_STOP_WATCHING_FORUM', $msg);
+	}
+}
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index a41e5da507..5bd1123bba 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -86,7 +86,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
 			),
 			array(
 				'[list]no item[/list]',
-				'<ul>no item</ul>'
+				'<ul><li>no item</li></ul>'
 			),
 			array(
 				'[*]unparsed',
diff --git a/tests/text_processing/tickets_data/PHPBB3-14663.html b/tests/text_processing/tickets_data/PHPBB3-14663.html
new file mode 100644
index 0000000000..b18bcfd52b
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14663.html
@@ -0,0 +1 @@
+<input type="button" value="Кнопка!"> Тест
+\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14663.txt b/tests/text_processing/tickets_data/PHPBB3-14663.txt
new file mode 100644
index 0000000000..5443ae3046
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14663.txt
@@ -0,0 +1 @@
+[test]Тест[/test]
+\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14663.xml b/tests/text_processing/tickets_data/PHPBB3-14663.xml
new file mode 100644
index 0000000000..423d01e242
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14663.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]{TEXT}[/test]</value>
+			<value><![CDATA[<input type=button value="Кнопка!" /> {TEXT}]]></value>
+			<value><![CDATA[!\[test\](.*?)\[/test\]!ies]]></value>
+			<value><![CDATA['[test:$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${1}')).'[/test:$uid]']]></value>
+			<value><![CDATA[!\[test:$uid\](.*?)\[/test:$uid\]!s]]></value>
+			<value><![CDATA[<input type=button value="Кнопка!" /> ${1}]]></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/text_processing/tickets_data/PHPBB3-14706.html b/tests/text_processing/tickets_data/PHPBB3-14706.html
new file mode 100644
index 0000000000..b8f74c9e93
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14706.html
@@ -0,0 +1 @@
+<ul><li><ol style="list-style-type: lower-alpha"><li>a</li><li>b</li><li>c</li><li>d</li><li>e</li></ol></li><li>outer</li></ul>
+\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14706.txt b/tests/text_processing/tickets_data/PHPBB3-14706.txt
new file mode 100644
index 0000000000..8ec2e9cd35
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14706.txt
@@ -0,0 +1 @@
+[list][list=a][*]a[*]b[*]c[*]d[*]e[/list][*]outer[/list]
+\ No newline at end of file