makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15214] Add fixes for various other tests

Browse source 
Add new dispatch parameter to the template\twig\extension calls

PHPBB3-15214
This commit is contained in:
toxyy 2023-12-03 17:30:29 -05:00 • committed by rxu
parent 59b482a222
commit 71fe9d60c4
No known key found for this signature in database
GPG key ID: 8117904FEDEFDD17
7 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/extension/metadata_manager_test.php
View file

@ -117,7 +117,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$lang = new \phpbb\language\language($lang_loader); $lang = new \phpbb\language\language($lang_loader);
$this->user = new \phpbb\user($lang, '\phpbb\datetime'); $this->user = new \phpbb\user($lang, '\phpbb\datetime');
$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $phpbb_dispatcher)));
$twig->setLexer(new \phpbb\template\twig\lexer($twig)); $twig->setLexer(new \phpbb\template\twig\lexer($twig));
} }

5
tests/template/extension_test.php
View file

@ -102,6 +102,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$loader = new \phpbb\template\twig\loader([]); $loader = new \phpbb\template\twig\loader([]);
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -110,7 +111,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$cache_path, $cache_path,
null, null,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
[ [
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -126,7 +127,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$cache_path, $cache_path,
$this->user, $this->user,
[ [
new \phpbb\template\twig\extension($context, $twig, $this->lang), new \phpbb\template\twig\extension($context, $twig, $this->lang, $dispatcher),
new \phpbb\template\twig\extension\avatar($avatar_helper), new \phpbb\template\twig\extension\avatar($avatar_helper),
new \phpbb\template\twig\extension\config($config), new \phpbb\template\twig\extension\config($config),
new \phpbb\template\twig\extension\icon($this->user), new \phpbb\template\twig\extension\icon($this->user),

5
tests/template/template_allfolder_test.php
View file

@ -60,6 +60,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
$loader = new \phpbb\template\twig\loader(''); $loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -68,7 +69,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
$cache_path, $cache_path,
$this->extension_manager, $this->extension_manager,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
array( array(
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -76,7 +77,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
'autoescape' => false, 'autoescape' => false,
) )
); );
$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager); $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
$twig->setLexer(new \phpbb\template\twig\lexer($twig)); $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template_path = $this->test_path . '/templates'; $this->template_path = $this->test_path . '/templates';

5
tests/template/template_events_test.php
View file

@ -154,6 +154,7 @@ Zeta test event in all',
$loader = new \phpbb\template\twig\loader(''); $loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -162,7 +163,7 @@ Zeta test event in all',
$cache_path, $cache_path,
$this->extension_manager, $this->extension_manager,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
array( array(
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -170,7 +171,7 @@ Zeta test event in all',
'autoescape' => false, 'autoescape' => false,
) )
); );
$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager); $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
$twig->setLexer(new \phpbb\template\twig\lexer($twig)); $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path)); $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));

5
tests/template/template_includecss_test.php
View file

@ -46,6 +46,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$loader = new \phpbb\template\twig\loader(''); $loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -54,7 +55,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$cache_path, $cache_path,
null, null,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
array( array(
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -69,7 +70,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$twig, $twig,
$cache_path, $cache_path,
$this->user, $this->user,
array(new \phpbb\template\twig\extension($context, $twig, $this->user)), array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)),
new phpbb_mock_extension_manager( new phpbb_mock_extension_manager(
__DIR__ . '/', __DIR__ . '/',
array( array(

6
tests/template/template_test_case.php
View file

@ -97,6 +97,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$loader = new \phpbb\template\twig\loader(''); $loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -105,7 +106,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$cache_path, $cache_path,
null, null,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
array( array(
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -113,7 +114,8 @@ class phpbb_template_template_test_case extends phpbb_test_case
'autoescape' => false, 'autoescape' => false,
) )
); );
$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $lang)));
$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $lang, $dispatcher)));
$twig->setLexer(new \phpbb\template\twig\lexer($twig)); $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style('tests', $this->template_path); $this->template->set_custom_style('tests', $this->template_path);
} }

5
tests/template/template_test_case_with_tree.php
View file

@ -47,6 +47,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
$loader = new \phpbb\template\twig\loader(''); $loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy(); $log = new \phpbb\log\dummy();
$assets_bag = new \phpbb\template\assets_bag(); $assets_bag = new \phpbb\template\assets_bag();
$dispatcher = new \phpbb\event\dispatcher();
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$assets_bag, $assets_bag,
$config, $config,
@ -55,7 +56,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
$cache_path, $cache_path,
null, null,
$loader, $loader,
new \phpbb\event\dispatcher(), $dispatcher,
array( array(
'cache' => false, 'cache' => false,
'debug' => false, 'debug' => false,
@ -63,7 +64,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
'autoescape' => false, 'autoescape' => false,
) )
); );
$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)));
$twig->setLexer(new \phpbb\template\twig\lexer($twig)); $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
} }