[ticket/10939] Modified mock request class to handle deactivated $_FILES

PHPBB3-10939
This commit is contained in:
Fyorl 2012-08-15 15:36:41 +01:00
parent 94ed66c777
commit 348554cc29

View file

@ -11,13 +11,14 @@ class phpbb_mock_request implements phpbb_request_interface
{ {
protected $data; protected $data;
public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false) public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array())
{ {
$this->data[phpbb_request_interface::GET] = $get; $this->data[phpbb_request_interface::GET] = $get;
$this->data[phpbb_request_interface::POST] = $post; $this->data[phpbb_request_interface::POST] = $post;
$this->data[phpbb_request_interface::COOKIE] = $cookie; $this->data[phpbb_request_interface::COOKIE] = $cookie;
$this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request; $this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
$this->data[phpbb_request_interface::SERVER] = $server; $this->data[phpbb_request_interface::SERVER] = $server;
$this->data[phpbb_request_interface::FILES] = $files;
} }
public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST) public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST)
@ -42,6 +43,12 @@ class phpbb_mock_request implements phpbb_request_interface
return $this->server($var_name, $default); return $this->server($var_name, $default);
} }
public function file($form_name)
{
$super_global = phpbb_request_interface::FILES;
return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array();
}
public function is_set_post($name) public function is_set_post($name)
{ {
return $this->is_set($name, phpbb_request_interface::POST); return $this->is_set($name, phpbb_request_interface::POST);