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 /phpBB/includes/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 'phpBB/includes/request')
| -rw-r--r-- | phpBB/includes/request/deactivated_super_global.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/request/interface.php (renamed from phpBB/includes/request/request_interface.php) | 0 | ||||
| -rw-r--r-- | phpBB/includes/request/request.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/request/type_cast_helper.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/request/type_cast_helper_interface.php | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/request/deactivated_super_global.php b/phpBB/includes/request/deactivated_super_global.php index 9152d10811..d7a5b3145f 100644 --- a/phpBB/includes/request/deactivated_super_global.php +++ b/phpBB/includes/request/deactivated_super_global.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -class phpbb_deactivated_super_global implements ArrayAccess, Countable, IteratorAggregate +class phpbb_request_deactivated_super_global implements ArrayAccess, Countable, IteratorAggregate { /** * @var string Holds the name of the superglobal this is replacing. diff --git a/phpBB/includes/request/request_interface.php b/phpBB/includes/request/interface.php index 7b5b600100..7b5b600100 100644 --- a/phpBB/includes/request/request_interface.php +++ b/phpBB/includes/request/interface.php diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php index a473e40426..7d284a9bf7 100644 --- a/phpBB/includes/request/request.php +++ b/phpBB/includes/request/request.php @@ -51,15 +51,15 @@ class phpbb_request implements phpbb_request_interface protected $input; /** - * @var phpbb_type_cast_helper_interface An instance of a type cast helper providing convenience methods for type conversions. + * @var phpbb_request_type_cast_helper_interface An instance of a type cast helper providing convenience methods for type conversions. */ protected $type_cast_helper; /** * Initialises the request class, that means it stores all input data in {@link $input input} - * and then calls {@link phpbb_deactivated_super_global phpbb_deactivated_super_global} + * and then calls {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global} */ - public function __construct(phpbb_type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true) + public function __construct(phpbb_request_type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true) { if ($type_cast_helper) { @@ -67,7 +67,7 @@ class phpbb_request implements phpbb_request_interface } else { - $this->type_cast_helper = new phpbb_type_cast_helper(); + $this->type_cast_helper = new phpbb_request_type_cast_helper(); } foreach ($this->super_globals as $const => $super_global) @@ -97,7 +97,7 @@ class phpbb_request implements phpbb_request_interface /** * Disables access of super globals specified in $super_globals. - * This is achieved by overwriting the super globals with instances of {@link phpbb_deactivated_super_global phpbb_deactivated_super_global} + * This is achieved by overwriting the super globals with instances of {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global} */ public function disable_super_globals() { @@ -106,7 +106,7 @@ class phpbb_request implements phpbb_request_interface foreach ($this->super_globals as $const => $super_global) { unset($GLOBALS[$super_global]); - $GLOBALS[$super_global] = new phpbb_deactivated_super_global($this, $super_global, $const); + $GLOBALS[$super_global] = new phpbb_request_deactivated_super_global($this, $super_global, $const); } $this->super_globals_disabled = true; diff --git a/phpBB/includes/request/type_cast_helper.php b/phpBB/includes/request/type_cast_helper.php index 7b8aacc5a9..c39bbebe01 100644 --- a/phpBB/includes/request/type_cast_helper.php +++ b/phpBB/includes/request/type_cast_helper.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -class phpbb_type_cast_helper implements phpbb_type_cast_helper_interface +class phpbb_request_type_cast_helper implements phpbb_request_type_cast_helper_interface { /** diff --git a/phpBB/includes/request/type_cast_helper_interface.php b/phpBB/includes/request/type_cast_helper_interface.php index 96e984003c..366bd2e6ce 100644 --- a/phpBB/includes/request/type_cast_helper_interface.php +++ b/phpBB/includes/request/type_cast_helper_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -interface phpbb_type_cast_helper_interface +interface phpbb_request_type_cast_helper_interface { /** * Recursively applies addslashes to a variable. |