makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/request-class] Request class test now uses a type cast helper mock.

Browse source 
Removed the dependency of the request class test on having an actual
phpbb_type_cast_helper instance, by replacing it with an object mocking
the phpbb_type_cast_helper_interface.

PHPBB3-9716
This commit is contained in:
Nils Adermann 2010-03-13 11:28:41 +01:00
parent ea919ad8b2
commit 0ae7df8a51
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/common.php
View file

@ -195,6 +195,8 @@ require($phpbb_root_path . 'includes/template.' . $phpEx);
require($phpbb_root_path . 'includes/session.' . $phpEx);
require($phpbb_root_path . 'includes/auth.' . $phpEx);
require($phpbb_root_path . 'includes/request/type_cast_helper_interface.' . $phpEx);
require($phpbb_root_path . 'includes/request/type_cast_helper.' . $phpEx);
require($phpbb_root_path . 'includes/request/deactivated_super_global.' . $phpEx);
require($phpbb_root_path . 'includes/request/request_interface.' . $phpEx);
require($phpbb_root_path . 'includes/request/request.' . $phpEx);
@ -209,7 +211,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Instantiate some basic classes
$request = new phpbb_request();
$request = new phpbb_request(new phpbb_type_cast_helper());
$user = new user();
$auth = new auth();
$template = new template();
@ -220,7 +222,7 @@ $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache);
$class_loader->register();
// make sure request_var uses this request instance
request_var($request, 0); // "dependency injection" for a function
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Connect to DB
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false);

6
phpBB/install/database_update.php
View file

@ -66,6 +66,8 @@ require($phpbb_root_path . 'includes/template.' . $phpEx);
require($phpbb_root_path . 'includes/session.' . $phpEx);
require($phpbb_root_path . 'includes/auth.' . $phpEx);
require($phpbb_root_path . 'includes/request/type_cast_helper_interface.' . $phpEx);
require($phpbb_root_path . 'includes/request/type_cast_helper.' . $phpEx);
require($phpbb_root_path . 'includes/request/deactivated_super_global.' . $phpEx);
require($phpbb_root_path . 'includes/request/request_interface.' . $phpEx);
require($phpbb_root_path . 'includes/request/request.' . $phpEx);
@ -95,13 +97,13 @@ else
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
}
$request = new phpbb_request();
$request = new phpbb_request(new phpbb_type_cast_helper());
$user = new user();
$cache = new cache();
$db = new $sql_db();
// make sure request_var uses this request instance
request_var($request, 0); // "dependency injection" for a function
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Add own hook handler, if present. :o
if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))

5
phpBB/install/index.php
View file

@ -171,10 +171,11 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
$class_loader->register();
$request = new phpbb_request();
$request = new phpbb_request(new phpbb_type_cast_helper());
// make sure request_var uses this request instance
request_var($request, 0); // "dependency injection" for a function
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Try and load an appropriate language if required
$language = basename(request_var('language', ''));

6
tests/request/request.php
View file

@ -10,13 +10,13 @@
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/request/type_cast_helper_interface.php';
require_once '../phpBB/includes/request/type_cast_helper.php';
require_once '../phpBB/includes/request/request_interface.php';
require_once '../phpBB/includes/request/deactivated_super_global.php';
require_once '../phpBB/includes/request/request.php';
class phpbb_request_test extends phpbb_test_case
{
private $type_cast_helper;
private $request;
protected function setUp()
@ -28,7 +28,9 @@ class phpbb_request_test extends phpbb_test_case
$_REQUEST['test'] = 3;
$_GET['unset'] = '';
$this->request = new phpbb_request();
$this->type_cast_helper = $this->getMock('phpbb_type_cast_helper_interface');
$this->request = new phpbb_request($this->type_cast_helper);
}
public function test_toggle_super_globals()