aboutsummaryrefslogtreecommitdiffstats
path: root/tests/text_formatter
diff options
context:
space:
mode:
Diffstat (limited to 'tests/text_formatter')
-rw-r--r--tests/text_formatter/s9e/parser_test.php10
-rw-r--r--tests/text_formatter/s9e/renderer_test.php54
2 files changed, 44 insertions, 20 deletions
diff --git a/tests/text_formatter/s9e/parser_test.php b/tests/text_formatter/s9e/parser_test.php
index 71966f9d36..3b72e713e1 100644
--- a/tests/text_formatter/s9e/parser_test.php
+++ b/tests/text_formatter/s9e/parser_test.php
@@ -35,7 +35,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$parser = new \phpbb\textformatter\s9e\parser(
$cache,
'_foo_parser',
- $this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
$factory,
new phpbb_mock_event_dispatcher
);
@@ -63,7 +62,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$parser = new \phpbb\textformatter\s9e\parser(
$cache,
'_foo_parser',
- $this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
$factory,
new phpbb_mock_event_dispatcher
);
@@ -92,7 +90,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$parser = new \phpbb\textformatter\s9e\parser(
new phpbb_mock_cache,
'_foo_parser',
- $this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
$factory,
new phpbb_mock_event_dispatcher
);
@@ -126,7 +123,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$parser = new \phpbb\textformatter\s9e\parser(
$cache,
'_foo_parser',
- $this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
$factory,
new phpbb_mock_event_dispatcher
);
@@ -191,7 +187,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
new \phpbb\textformatter\s9e\parser(
$container->get('cache.driver'),
'_foo_parser',
- $container->get('user'),
$container->get('text_formatter.s9e.factory'),
$dispatcher
);
@@ -200,9 +195,7 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
public function setup_event_callback($vars)
{
return isset($vars['parser'])
- && $vars['parser'] instanceof \phpbb\textformatter\s9e\parser
- && isset($vars['user'])
- && $vars['user'] instanceof \phpbb\user;
+ && $vars['parser'] instanceof \phpbb\textformatter\s9e\parser;
}
/**
@@ -236,7 +229,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$parser = new \phpbb\textformatter\s9e\parser(
$container->get('cache.driver'),
'_foo_parser',
- $container->get('user'),
$container->get('text_formatter.s9e.factory'),
$dispatcher
);
diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php
index 91458541d3..3c0bbb96c7 100644
--- a/tests/text_formatter/s9e/renderer_test.php
+++ b/tests/text_formatter/s9e/renderer_test.php
@@ -157,7 +157,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
'banana',
function ($phpbb_container)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('viewcensors', false);
$phpbb_container->set('user', $user);
@@ -168,7 +172,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
'banana',
function ($phpbb_container)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('viewcensors', false);
$config = new \phpbb\config\config(array('allow_nocensors' => true));
@@ -182,7 +190,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
'apple',
function ($phpbb_container, $test)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('viewcensors', false);
$config = new \phpbb\config\config(array('allow_nocensors' => true));
@@ -207,7 +219,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
'http://localhost/foo.swf',
function ($phpbb_container)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('viewflash', false);
$phpbb_container->set('user', $user);
@@ -222,7 +238,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
'<a href="http://localhost/mrgreen.gif" class="postlink">http://localhost/mrgreen.gif</a>',
function ($phpbb_container)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('viewimg', false);
$phpbb_container->set('user', $user);
@@ -237,7 +257,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
':)',
function ($phpbb_container)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $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');
$user->optionset('smilies', false);
$phpbb_container->set('user', $user);
@@ -291,9 +315,13 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
2 => '<b>bold</b>'
);
+ global $phpbb_root_path, $phpEx;
+
foreach ($tests as $style_id => $expected)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ $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');
$user->style = array('style_id' => $style_id);
$phpbb_container = new phpbb_mock_container_builder;
@@ -311,10 +339,12 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
public function test_style_inheritance1()
{
- global $phpbb_container;
+ global $phpbb_container, $phpbb_root_path, $phpEx;
// Style 3 inherits from 2 which inherits from 1. Only style 1 has a bbcode.html
- $user = new \phpbb\user('\\phpbb\\datetime');
+ $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');
$user->style = array('style_id' => 3);
$phpbb_container = new phpbb_mock_container_builder;
@@ -331,7 +361,7 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
public function test_style_inheritance2()
{
- global $phpbb_container;
+ global $phpbb_container, $phpbb_root_path, $phpEx;
// Style 5 inherits from 4, but both have a bbcode.html
$tests = array(
@@ -341,7 +371,9 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
foreach ($tests as $style_id => $expected)
{
- $user = new \phpbb\user('\\phpbb\\datetime');
+ $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');
$user->style = array('style_id' => $style_id);
$phpbb_container = new phpbb_mock_container_builder;
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-18 11:01:11 +0000