diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
| commit | 2472271bc0cd7c15c77783c86ccaac643ab1756a (patch) | |
| tree | 0877d20f422411ed20b398c616b26b69ff30fdcd /tests/session/testable_facade.php | |
| parent | 21bbb5850349326464204bdb1bea7ecf5a88c10a (diff) | |
| download | forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.gz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.bz2 forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.xz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.zip | |
[ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
Diffstat (limited to 'tests/session/testable_facade.php')
| -rw-r--r-- | tests/session/testable_facade.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php index 9f0a3c5f59..f289c48f69 100644 --- a/tests/session/testable_facade.php +++ b/tests/session/testable_facade.php @@ -14,11 +14,11 @@ require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php'; * This class exists to expose session.php's functions in a more testable way. * * Since many functions in session.php have global variables inside the function, - * this exposes those functions through a testable facade that uses - * testable_factory's mock global variables to modify global variables used in + * this exposes those functions through a testable facade that uses + * testable_factory's mock global variables to modify global variables used in * the functions. * - * This is using the facade pattern to provide a testable "front" to the + * This is using the facade pattern to provide a testable "front" to the * functions in sessions.php. * */ @@ -35,17 +35,17 @@ class phpbb_session_testable_facade function extract_current_page( $root_path, - $php_self, + $php_self, $query_string, $request_uri - ) + ) { $this->session_factory->get_session($this->db); global $request; - $request->overwrite('PHP_SELF', $php_self, phpbb_request_interface::SERVER); - $request->overwrite('QUERY_STRING', $query_string, phpbb_request_interface::SERVER); - $request->overwrite('REQUEST_URI', $request_uri, phpbb_request_interface::SERVER); - return phpbb_session::extract_current_page($root_path); + $request->overwrite('PHP_SELF', $php_self, \phpbb\request\request_interface::SERVER); + $request->overwrite('QUERY_STRING', $query_string, \phpbb\request\request_interface::SERVER); + $request->overwrite('REQUEST_URI', $request_uri, \phpbb\request\request_interface::SERVER); + return \phpbb\session::extract_current_page($root_path); } function extract_current_hostname( @@ -58,8 +58,8 @@ class phpbb_session_testable_facade global $config, $request; $config['server_name'] = $server_name_config; $config['cookie_domain'] = $cookie_domain_config; - $request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER); - $request->overwrite('Host', $host, phpbb_request_interface::SERVER); + $request->overwrite('SERVER_NAME', $host, \phpbb\request\request_interface::SERVER); + $request->overwrite('Host', $host, \phpbb\request\request_interface::SERVER); // Note: There is a php_uname function used as a fallthrough // that this function doesn't override return $session->extract_current_hostname(); @@ -135,7 +135,7 @@ class phpbb_session_testable_facade $session->host = $host; $config['force_server_vars'] = $force_server_vars; $config['server_name'] = $server_name; - $request->overwrite('SERVER_PORT', $server_port, phpbb_request_interface::SERVER); + $request->overwrite('SERVER_PORT', $server_port, \phpbb\request\request_interface::SERVER); return $session->validate_referer($check_script_path); } } |