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

[ticket/11444] Update tests and cleanup types/methods

Browse Source 
PHPBB3-11444
This commit is contained in:
Tristan Darricau
2015-07-09 17:04:40 +02:00
parent f29b12e353
commit fc34057f28
18 changed files with 309 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -426,24 +426,34 @@ class phpbb_test_case_helpers
$cache_key_parser = $prefix . '_parser';
$cache_key_renderer = $prefix . '_renderer';
$container->set('cache.driver', $cache);
$container->setParameter('cache.dir', $cache_dir);
if (!$container->isFrozen())
{
$container->setParameter('cache.dir', $cache_dir);
}
// Create a path_helper
if (!$container->has('path_helper'))
if (!$container->has('path_helper') || $container->getDefinition('path_helper')->isSynthetic())
{
$path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request(
new phpbb_mock_request()
),
new \phpbb\filesystem(),
$this->test_case->getMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
$container->set(
'path_helper',
new \phpbb\path_helper(
new \phpbb\symfony_request(
new phpbb_mock_request()
),
new \phpbb\filesystem(),
$this->test_case->getMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
)
$path_helper
);
}
else
{
$path_helper = $container->get('path_helper');
}
// Create an event dispatcher
if ($container->has('dispatcher'))
@@ -534,7 +544,7 @@ class phpbb_test_case_helpers
// Calls configured in services.yml
$renderer->configure_quote_helper($quote_helper);
$renderer->configure_smilies_path($config, $container->get('path_helper'));
$renderer->configure_smilies_path($config, $path_helper);
$renderer->configure_user($user, $config, $auth);
$container->set('text_formatter.renderer', $renderer);