Skip to content

Commit c67c66e

Browse files
committed
Fix all errors in test file
1 parent 909bf14 commit c67c66e

1 file changed

Lines changed: 42 additions & 21 deletions

File tree

tests/template/status_icon_test.php

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,73 +10,94 @@
1010

1111
namespace phpbb\ideas\tests\template;
1212

13+
use phpbb\config\config;
14+
use phpbb\event\dispatcher;
15+
use phpbb\filesystem\filesystem;
16+
use phpbb\ideas\template\twig\extension\ideas_status_icon;
17+
use phpbb\language\language;
18+
use phpbb\language\language_file_loader;
19+
use phpbb\path_helper;
20+
use phpbb\symfony_request;
21+
use phpbb\template\assets_bag;
22+
use phpbb\template\context;
23+
use phpbb\template\twig\environment;
24+
use phpbb\template\twig\extension;
25+
use phpbb\template\twig\lexer;
26+
use phpbb\template\twig\loader;
27+
use phpbb\template\twig\twig;
28+
use phpbb\user;
29+
use phpbb_mock_request;
30+
use phpbb_template_template_test_case;
31+
use phpbb\datetime;
32+
use phpbb\request\request;
33+
1334
require_once __DIR__ . '/../../../../../../tests/template/template_test_case.php';
1435

15-
class status_icon_test extends \phpbb_template_template_test_case
36+
class status_icon_test extends phpbb_template_template_test_case
1637
{
1738
protected $test_path = __DIR__;
1839

19-
protected function setup_engine(array $new_config = array())
40+
public function setup_engine(array $new_config = [], string $template_path = ''): void
2041
{
2142
global $phpbb_root_path, $phpEx;
2243

2344
$defaults = $this->config_defaults();
24-
$config = new \phpbb\config\config(array_merge($defaults, $new_config));
25-
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
26-
$this->lang = $lang = new \phpbb\language\language($lang_loader);
27-
$user = new \phpbb\user($lang, '\phpbb\datetime');
45+
$config = new config(array_merge($defaults, $new_config));
46+
$lang_loader = new language_file_loader($phpbb_root_path, $phpEx);
47+
$this->lang = $lang = new language($lang_loader);
48+
$user = new user($lang, datetime::class);
2849
$this->user = $user;
2950

30-
$filesystem = new \phpbb\filesystem\filesystem();
51+
$filesystem = new filesystem();
3152

32-
$path_helper = new \phpbb\path_helper(
33-
new \phpbb\symfony_request(
34-
new \phpbb_mock_request()
53+
$path_helper = new path_helper(
54+
new symfony_request(
55+
new phpbb_mock_request()
3556
),
36-
$this->createMock('\phpbb\request\request'),
57+
$this->createMock(request::class),
3758
$phpbb_root_path,
3859
$phpEx
3960
);
4061

4162
$this->template_path = $this->test_path . '/templates';
4263

4364
$cache_path = $phpbb_root_path . 'cache/twig';
44-
$context = new \phpbb\template\context();
45-
$loader = new \phpbb\template\twig\loader();
46-
$assets_bag = new \phpbb\template\assets_bag();
47-
$twig = new \phpbb\template\twig\environment(
65+
$context = new context();
66+
$loader = new loader();
67+
$assets_bag = new assets_bag();
68+
$twig = new environment(
4869
$assets_bag,
4970
$config,
5071
$filesystem,
5172
$path_helper,
5273
$cache_path,
5374
null,
5475
$loader,
55-
new \phpbb\event\dispatcher(),
76+
new dispatcher(),
5677
[
5778
'cache' => false,
5879
'debug' => false,
5980
'auto_reload' => true,
6081
'autoescape' => false,
6182
]
6283
);
63-
$this->template = new \phpbb\template\twig\twig(
84+
$this->template = new twig(
6485
$path_helper,
6586
$config,
6687
$context,
6788
$twig,
6889
$cache_path,
6990
$this->user,
7091
[
71-
new \phpbb\template\twig\extension($context, $twig, $this->lang),
72-
new \phpbb\ideas\template\twig\extension\ideas_status_icon(),
92+
new extension($context, $twig, $this->lang),
93+
new ideas_status_icon(),
7394
]
7495
);
75-
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
96+
$twig->setLexer(new lexer($twig));
7697
$this->template->set_custom_style('tests', $this->template_path);
7798
}
7899

79-
public function data_template_status_icons()
100+
public function data_template_status_icons(): array
80101
{
81102
return [
82103
[0, ''],

0 commit comments

Comments
 (0)