[ticket/15905] Adjust tests for twig extensions for master branch

PHPBB3-15905
This commit is contained in:
Marc Alexander 2019-09-28 21:18:39 +02:00
parent 3a9ab9fe69
commit d856c5c8c1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -46,16 +46,18 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
); );
$phpbb_path_helper = new \phpbb\path_helper( $phpbb_path_helper = new \phpbb\path_helper(
$symfony_request, $symfony_request,
$filesystem,
$request, $request,
$phpbb_root_path, $phpbb_root_path,
$phpEx $phpEx
); );
$storage = $this->getMockBuilder('\phpbb\storage\storage')
->disableOriginalConstructor()
->getMock();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_container = new phpbb_mock_container_builder(); $phpbb_container = new phpbb_mock_container_builder();
$files = new phpbb\files\factory($phpbb_container); $files = new phpbb\files\factory($phpbb_container);
$upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $filesystem, $phpbb_path_helper, $phpbb_dispatcher, $files); $upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper());
$upload_avatar_driver->set_name('avatar.driver.upload'); $upload_avatar_driver->set_name('avatar.driver.upload');
$phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [ $phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [
$upload_avatar_driver, $upload_avatar_driver,
@ -71,7 +73,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$cache_path = $phpbb_root_path . 'cache/twig'; $cache_path = $phpbb_root_path . 'cache/twig';
$context = new \phpbb\template\context(); $context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader($filesystem); $loader = new \phpbb\template\twig\loader('');
$twig = new \phpbb\template\twig\environment( $twig = new \phpbb\template\twig\environment(
$config, $config,
$filesystem, $filesystem,