diff options
| author | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:07:17 -0700 |
|---|---|---|
| committer | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:07:17 -0700 |
| commit | 87e65224d45c0571e90e00156abd165bd6bbe059 (patch) | |
| tree | 6c2f20ee9e0f576fa31ff4a08639bafc00cb7de7 /tests/session/testable_facade.php | |
| parent | 62d7a0570071bb572fa60e502596d21eaee57376 (diff) | |
| download | forums-87e65224d45c0571e90e00156abd165bd6bbe059.tar forums-87e65224d45c0571e90e00156abd165bd6bbe059.tar.gz forums-87e65224d45c0571e90e00156abd165bd6bbe059.tar.bz2 forums-87e65224d45c0571e90e00156abd165bd6bbe059.tar.xz forums-87e65224d45c0571e90e00156abd165bd6bbe059.zip | |
[ticket/11620] Cherry-Pick merge tests from session-storage-cache
PHPBB3-11620
Diffstat (limited to 'tests/session/testable_facade.php')
| -rw-r--r-- | tests/session/testable_facade.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php index b9f61b80cb..1cb1c94b52 100644 --- a/tests/session/testable_facade.php +++ b/tests/session/testable_facade.php @@ -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 = "" ) |