1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

[ticket/11768] Renamed service vars

The name of the variable that holds the service instance is now consistent
across events.

PHPBB3-11768
This commit is contained in:
JoshyPHP
2015-03-27 01:29:09 +01:00
parent 3e04e643df
commit d8e7e11ee3
4 changed files with 26 additions and 32 deletions

View File

@@ -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>';
}

View File

@@ -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()