1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00

[ticket/11620] Cherry-Pick merge tests from session-storage-cache

PHPBB3-11620
This commit is contained in:
Andy Chase
2013-07-22 11:07:17 -07:00
parent 62d7a05700
commit 87e65224d4
2 changed files with 57 additions and 7 deletions

View File

@@ -77,14 +77,16 @@ class phpbb_session_testable_facade
function session_begin (
$update_session_page = true,
$config_overrides = array(),
$request_overrides = array()
$request_overrides = array(),
$cookies_overrides = array()
)
{
$this->session_factory->merge_config_data($config_overrides);
$this->session_factory->merge_server_data($request_overrides);
$this->session_factory->set_cookies($cookies_overrides);
$session = $this->session_factory->get_session($this->db);
global $config, $request;
$request->merge(phpbb_request_interface::SERVER, $request_overrides);
$config = array_merge($config, $config_overrides);
return $session->session_begin($update_session_page);
$session->session_begin($update_session_page);
return $session;
}
function session_create (
@@ -93,8 +95,8 @@ class phpbb_session_testable_facade
$persist_login = false,
$viewonline = true,
array $config_overrides = array(),
$user_agent,
$ip_address,
$user_agent = 'user agent',
$ip_address = '127.0.0.1',
array $bot_overrides = array(),
$uri_sid = ""
)