diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-08-31 21:26:50 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-09-17 14:08:14 +0200 |
| commit | 456de639123ae3da6320bed6140ab69ac9925e74 (patch) | |
| tree | 599778c0a452f6180de82e13288f7b7ed8e686ac /tests/request | |
| parent | b3558b50786dd8a66e4c4011647c048612bbfa7f (diff) | |
| download | forums-456de639123ae3da6320bed6140ab69ac9925e74.tar forums-456de639123ae3da6320bed6140ab69ac9925e74.tar.gz forums-456de639123ae3da6320bed6140ab69ac9925e74.tar.bz2 forums-456de639123ae3da6320bed6140ab69ac9925e74.tar.xz forums-456de639123ae3da6320bed6140ab69ac9925e74.zip | |
[feature/request-class] Refactor request classes to use autoloading
All class names have been adjusted to use a phpbb_request prefix,
allowing them to be autoloaded.
Also introduces some improvements to autoloading in general.
PHPBB3-9716
Diffstat (limited to 'tests/request')
| -rw-r--r-- | tests/request/deactivated_super_global.php | 3 | ||||
| -rw-r--r-- | tests/request/request.php | 4 | ||||
| -rw-r--r-- | tests/request/request_var.php | 2 | ||||
| -rw-r--r-- | tests/request/type_cast_helper.php | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/tests/request/deactivated_super_global.php b/tests/request/deactivated_super_global.php index 2991badd1a..3c7a638e38 100644 --- a/tests/request/deactivated_super_global.php +++ b/tests/request/deactivated_super_global.php @@ -9,6 +9,7 @@ */ require_once 'test_framework/framework.php'; +require_once '../phpBB/includes/request/interface.php'; require_once '../phpBB/includes/request/deactivated_super_global.php'; class phpbb_deactivated_super_global_test extends phpbb_test_case @@ -19,7 +20,7 @@ class phpbb_deactivated_super_global_test extends phpbb_test_case public function test_write_triggers_error() { $this->setExpectedTriggerError(E_USER_ERROR); - $obj = new phpbb_deactivated_super_global($this->getMock('phpbb_request_interface'), 'obj', phpbb_request_interface::POST); + $obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_interface'), 'obj', phpbb_request_interface::POST); $obj->offsetSet(0, 0); } } diff --git a/tests/request/request.php b/tests/request/request.php index ebfc3ba2b0..cf275e763c 100644 --- a/tests/request/request.php +++ b/tests/request/request.php @@ -10,7 +10,7 @@ require_once 'test_framework/framework.php'; require_once '../phpBB/includes/request/type_cast_helper_interface.php'; -require_once '../phpBB/includes/request/request_interface.php'; +require_once '../phpBB/includes/request/interface.php'; require_once '../phpBB/includes/request/deactivated_super_global.php'; require_once '../phpBB/includes/request/request.php'; @@ -28,7 +28,7 @@ class phpbb_request_test extends phpbb_test_case $_REQUEST['test'] = 3; $_GET['unset'] = ''; - $this->type_cast_helper = $this->getMock('phpbb_type_cast_helper_interface'); + $this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); $this->request = new phpbb_request($this->type_cast_helper); } diff --git a/tests/request/request_var.php b/tests/request/request_var.php index 5bdcb5d4e7..857dbe55a5 100644 --- a/tests/request/request_var.php +++ b/tests/request/request_var.php @@ -11,7 +11,7 @@ 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/deactivated_super_global.php'; -require_once '../phpBB/includes/request/request_interface.php'; +require_once '../phpBB/includes/request/interface.php'; require_once '../phpBB/includes/request/request.php'; require_once '../phpBB/includes/functions.php'; diff --git a/tests/request/type_cast_helper.php b/tests/request/type_cast_helper.php index aba8523ec3..51687c186d 100644 --- a/tests/request/type_cast_helper.php +++ b/tests/request/type_cast_helper.php @@ -18,7 +18,7 @@ class phpbb_type_cast_helper_test extends phpbb_test_case protected function setUp() { - $this->type_cast_helper = new phpbb_type_cast_helper(); + $this->type_cast_helper = new phpbb_request_type_cast_helper(); } public function test_addslashes_recursively() |