From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:01:09 +0200 Subject: [ticket/11700] Move all recent code to namespaces PHPBB3-11700 --- tests/session/continue_test.php | 8 ++++---- tests/session/creation_test.php | 8 ++++---- tests/session/testable_factory.php | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/session') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index e5a7f7a4a1..28019b54b5 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -56,11 +56,11 @@ class phpbb_session_continue_test extends phpbb_database_test_case global $phpbb_container, $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array()); - $request = $this->getMock('phpbb_request'); - $user = $this->getMock('phpbb_user'); + $config = new \phpbb\config\config(array()); + $request = $this->getMock('\phpbb\request\request'); + $user = $this->getMock('\phpbb\user'); - $auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + $auth_provider = new \phpbb\auth\provider\db($db, $config, $request, $user, $phpbb_root_path, $phpEx); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container->expects($this->any()) ->method('get') diff --git a/tests/session/creation_test.php b/tests/session/creation_test.php index fde76d6b06..6b1be61ade 100644 --- a/tests/session/creation_test.php +++ b/tests/session/creation_test.php @@ -23,11 +23,11 @@ class phpbb_session_creation_test extends phpbb_database_test_case global $phpbb_container, $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array()); - $request = $this->getMock('phpbb_request'); - $user = $this->getMock('phpbb_user'); + $config = new \phpbb\config\config(array()); + $request = $this->getMock('\phpbb\request\request'); + $user = $this->getMock('\phpbb\user'); - $auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + $auth_provider = new \phpbb\auth\provider\db($db, $config, $request, $user, $phpbb_root_path, $phpEx); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container->expects($this->any()) ->method('get') diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php index 1e2b194ece..1a7d27b30f 100644 --- a/tests/session/testable_factory.php +++ b/tests/session/testable_factory.php @@ -59,10 +59,10 @@ class phpbb_session_testable_factory /** * Retrieve the configured session class instance * - * @param phpbb_db_driver $dbal The database connection to use for session data + * @param \phpbb\db\driver\driver $dbal The database connection to use for session data * @return phpbb_mock_session_testable A session instance */ - public function get_session(phpbb_db_driver $dbal) + public function get_session(\phpbb\db\driver\driver $dbal) { // set up all the global variables used by session global $SID, $_SID, $db, $config, $cache, $request; @@ -75,7 +75,7 @@ class phpbb_session_testable_factory ); request_var(null, null, null, null, $request); - $config = $this->config = new phpbb_config($this->get_config_data()); + $config = $this->config = new \phpbb\config\config($this->get_config_data()); set_config(null, null, null, $config); $db = $dbal; -- cgit v1.2.1 From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 02:41:03 +0200 Subject: [ticket/11700] Fix tests after merging new develop code PHPBB3-11700 --- tests/session/check_ban_test.php | 4 ++-- tests/session/testable_facade.php | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/session') diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index 8d6c9a866d..3f13b9f216 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -43,8 +43,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case // Change the global cache object for this test because // the mock cache object does not hit the database as is needed // for this test. - $cache = new phpbb_cache_service( - new phpbb_cache_driver_file(), + $cache = new \phpbb\cache\service( + new \phpbb\cache\driver\file(), $config, $this->db, $phpbb_root_path, 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); } } -- cgit v1.2.1