mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

[ticket/14323] Set up global objects required during testing

Browse Source 
PHPBB3-14323
This commit is contained in:
JoshyPHP
2015-12-06 15:23:27 +01:00
parent 9a8fb2e1df
commit f9d8866aee
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -315,7 +315,7 @@ class phpbb_test_case_helpers
public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
{
static $first_run;
global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
$cache_dir = __DIR__ . '/../tmp/';
@@ -469,18 +469,25 @@ class phpbb_test_case_helpers
}
// Set up the a minimum config
if ($container->has('config'))
if (!isset($config))
{
$config = $container->get('config');
}
else
{
$config = new \phpbb\config\config(array());
if ($container->has('config'))
{
$config = $container->get('config');
}
else
{
$config = new \phpbb\config\config(array());
}
}
$default_config = array(
'allow_nocensors' => false,
'allow_nocensors' => false,
'allowed_schemes_links' => 'http,https,ftp',
'smilies_path' => 'images/smilies',
'script_path' => '/phpbb',
'server_name' => 'localhost',
'server_port' => 80,
'server_protocol' => 'http://',
'smilies_path' => 'images/smilies',
);
foreach ($default_config as $config_name => $config_value)
{
@@ -519,7 +526,6 @@ class phpbb_test_case_helpers
->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
$user->date_format = 'Y-m-d H:i:s';
$user->host = 'localhost';
$user->optionset('viewcensors', true);
$user->optionset('viewflash', true);
$user->optionset('viewimg', true);