mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/14323] Moved autolink-related functions to a separate helper

Browse Source 
PHPBB3-14323
This commit is contained in:
JoshyPHP
2015-12-06 22:08:00 +01:00
parent f9d8866aee
commit ad2c032d3b
6 changed files with 150 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -469,16 +469,13 @@ class phpbb_test_case_helpers
}
// Set up the a minimum config
if (!isset($config))
if ($container->has('config'))
{
if ($container->has('config'))
{
$config = $container->get('config');
}
else
{
$config = new \phpbb\config\config(array());
}
$config = $container->get('config');
}
elseif (!isset($config))
{
$config = new \phpbb\config\config(array());
}
$default_config = array(
'allow_nocensors' => false,
@@ -504,7 +501,7 @@ class phpbb_test_case_helpers
}
// Create and register the text_formatter.s9e.factory service
$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, $cache_dir, $cache_key_parser, $cache_key_renderer);
$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\autolink_helper, $cache_dir, $cache_key_parser, $cache_key_renderer);
$container->set('text_formatter.s9e.factory', $factory);
// Create a user if none was provided, and add the common lang strings

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

@@ -50,6 +50,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
$this->cache,
$this->dispatcher,
new \phpbb\config\config(array('allowed_schemes_links' => 'http,https,ftp')),
new \phpbb\textformatter\s9e\autolink_helper,
$this->get_cache_dir(),
'_foo_parser',
'_foo_renderer'