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.php12
-rw-r--r--tests/text_formatter/s9e/renderer_test.php12
2 files changed, 10 insertions, 14 deletions
diff --git a/tests/text_formatter/s9e/parser_test.php b/tests/text_formatter/s9e/parser_test.php
index 2904df25b4..71966f9d36 100644
--- a/tests/text_formatter/s9e/parser_test.php
+++ b/tests/text_formatter/s9e/parser_test.php
@@ -200,9 +200,7 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
public function setup_event_callback($vars)
{
return isset($vars['parser'])
- && $vars['parser'] instanceof \s9e\TextFormatter\Parser
- && isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\parser
+ && $vars['parser'] instanceof \phpbb\textformatter\s9e\parser
&& isset($vars['user'])
&& $vars['user'] instanceof \phpbb\user;
}
@@ -247,16 +245,16 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
public function parse_before_event_callback($vars)
{
- return isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\parser
+ return isset($vars['parser'])
+ && $vars['parser'] instanceof \phpbb\textformatter\s9e\parser
&& isset($vars['text'])
&& $vars['text'] === '...';
}
public function parse_after_event_callback($vars)
{
- return isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\parser
+ return isset($vars['parser'])
+ && $vars['parser'] instanceof \phpbb\textformatter\s9e\parser
&& isset($vars['xml'])
&& $vars['xml'] === '<t>...</t>';
}
diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php
index 8835a80d9d..91458541d3 100644
--- a/tests/text_formatter/s9e/renderer_test.php
+++ b/tests/text_formatter/s9e/renderer_test.php
@@ -385,9 +385,7 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
public function setup_event_callback($vars)
{
return isset($vars['renderer'])
- && $vars['renderer'] instanceof \s9e\TextFormatter\Renderer
- && isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\renderer;
+ && $vars['renderer'] instanceof \phpbb\textformatter\s9e\renderer;
}
/**
@@ -430,8 +428,8 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
public function render_before_event_callback($vars)
{
- return isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\renderer
+ return isset($vars['renderer'])
+ && $vars['renderer'] instanceof \phpbb\textformatter\s9e\renderer
&& isset($vars['xml'])
&& $vars['xml'] === '<t>...</t>';
}
@@ -440,8 +438,8 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
{
return isset($vars['html'])
&& $vars['html'] === '...'
- && isset($vars['self'])
- && $vars['self'] instanceof \phpbb\textformatter\s9e\renderer;
+ && isset($vars['renderer'])
+ && $vars['renderer'] instanceof \phpbb\textformatter\s9e\renderer;
}
public function test_get_renderer()