mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/16549] Rewrite at() calls

Browse Source 
See https://github.com/sebastianbergmann/phpunit/issues/4297

PHPBB3-16549
This commit is contained in:
rxu
2020-11-14 22:21:15 +07:00
parent eb754e3a84
commit f1c178b544
6 changed files with 100 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/text_formatter/s9e/factory_test.php
View File

@@ -288,22 +288,13 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
{
$this->dispatcher = $this->createMock('phpbb\\event\\dispatcher_interface');
$this->dispatcher
->expects($this->at(0))
->expects($this->exactly(2))
->method('trigger_event')
->with(
'core.text_formatter_s9e_configure_before',
$this->callback(array($this, 'configure_event_callback'))
->withConsecutive(
['core.text_formatter_s9e_configure_before', $this->callback(array($this, 'configure_event_callback'))],
['core.text_formatter_s9e_configure_after', $this->callback(array($this, 'configure_event_callback'))]
)
->will($this->returnArgument(1));
$this->dispatcher
->expects($this->at(1))
->method('trigger_event')
->with(
'core.text_formatter_s9e_configure_after',
$this->callback(array($this, 'configure_event_callback'))
)
->will($this->returnArgument(1));
$this->get_factory()->get_configurator();
}

52
tests/text_formatter/s9e/parser_test.php
View File

@@ -101,15 +101,19 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
public function test_options($adapter_method, $adapter_arg, $concrete_method, $concrete_arg)
{
$mock = $this->getMockBuilder('s9e\\TextFormatter\\Parser')
->setMethods(array($concrete_method))
->setMethods([$concrete_method])
->disableOriginalConstructor()
->getMock();
foreach ((array) $concrete_arg as $i => $concrete_arg)
{
$mock->expects($this->at($i))
->method($concrete_method)
->with($concrete_arg);
}
$concrete_args = (array) $concrete_arg;
array_walk($concrete_args, function(&$value)
{
$value = (array) $value;
}
);
$mock->expects($this->exactly(count($concrete_args)))
->method($concrete_method)
->withConsecutive(...$concrete_args);
$cache = new phpbb_mock_cache;
$cache->put('_foo_parser', $mock);
@@ -141,11 +145,11 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
),
array(
'disable_magic_url', null,
'disablePlugin', array('Autoemail', 'Autolink')
'disablePlugin', ['Autoemail', 'Autolink']
),
array(
'disable_smilies', null,
'disablePlugin', 'Emoticons'
'disablePlugin', ['Emoticons', 'Emoji']
),
array(
'enable_bbcode', 'url',
@@ -157,11 +161,11 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
),
array(
'enable_magic_url', null,
'enablePlugin', array('Autoemail', 'Autolink')
'enablePlugin', ['Autoemail', 'Autolink']
),
array(
'enable_smilies', null,
'enablePlugin', 'Emoticons'
'enablePlugin', ['Emoticons', 'Emoji']
)
);
}
@@ -207,22 +211,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
->expects($this->any())
->method('trigger_event')
->will($this->returnArgument(1));
$dispatcher
->expects($this->at(1))
->method('trigger_event')
->with(
'core.text_formatter_s9e_parse_before',
$this->callback(array($this, 'parse_before_event_callback'))
)
->will($this->returnArgument(1));
$dispatcher
->expects($this->at(2))
->method('trigger_event')
->with(
'core.text_formatter_s9e_parse_after',
$this->callback(array($this, 'parse_after_event_callback'))
)
->will($this->returnArgument(1));
$parser = new \phpbb\textformatter\s9e\parser(
$container->get('cache.driver'),
@@ -230,6 +218,16 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
$container->get('text_formatter.s9e.factory'),
$dispatcher
);
$dispatcher
->expects($this->exactly(2))
->method('trigger_event')
->withConsecutive(
['core.text_formatter_s9e_parse_before', $this->callback(array($this, 'parse_before_event_callback'))],
['core.text_formatter_s9e_parse_after', $this->callback(array($this, 'parse_after_event_callback'))]
)
->will($this->returnArgument(1));
$parser->parse('...');
}

26
tests/text_formatter/s9e/renderer_test.php
View File

@@ -438,22 +438,6 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
->expects($this->any())
->method('trigger_event')
->will($this->returnArgument(1));
$dispatcher
->expects($this->at(1))
->method('trigger_event')
->with(
'core.text_formatter_s9e_render_before',
$this->callback(array($this, 'render_before_event_callback'))
)
->will($this->returnArgument(1));
$dispatcher
->expects($this->at(2))
->method('trigger_event')
->with(
'core.text_formatter_s9e_render_after',
$this->callback(array($this, 'render_after_event_callback'))
)
->will($this->returnArgument(1));
$renderer = new \phpbb\textformatter\s9e\renderer(
$container->get('cache.driver'),
@@ -462,6 +446,16 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
$container->get('text_formatter.s9e.factory'),
$dispatcher
);
$dispatcher
->expects($this->exactly(2))
->method('trigger_event')
->withConsecutive(
['core.text_formatter_s9e_render_before', $this->callback(array($this, 'render_before_event_callback'))],
['core.text_formatter_s9e_render_after', $this->callback(array($this, 'render_after_event_callback'))]
)
->will($this->returnArgument(1));
$renderer->render('<t>...</t>');
}