mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Request类 避免数据批量赋值的时候 影响原始数据获取

Browse Source
This commit is contained in:
thinkphp
2016-08-17 14:27:30 +08:00
parent 8a8ef98e92
commit 40582d4012
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
library/think/Request.php
View File

@@ -655,11 +655,12 @@ class Request
*/
public function get($name = '', $default = null, $filter = null)
{
if (empty($this->get)) {
$this->get = $_GET;
}
if (is_array($name)) {
$this->param = [];
return $this->get = array_merge($this->get, $name);
} elseif (empty($this->get)) {
$this->get = $_GET;
}
return $this->input($this->get, $name, $default, $filter);
}
@@ -674,11 +675,12 @@ class Request
*/
public function post($name = '', $default = null, $filter = null)
{
if (empty($this->post)) {
$this->post = $_POST;
}
if (is_array($name)) {
$this->param = [];
return $this->post = array_merge($this->post, $name);
} elseif (empty($this->post)) {
$this->post = $_POST;
}
return $this->input($this->post, $name, $default, $filter);
}
@@ -693,10 +695,6 @@ class Request
*/
public function put($name = '', $default = null, $filter = null)
{
if (is_array($name)) {
$this->param = [];
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
}
if (is_null($this->put)) {
$content = file_get_contents('php://input');
if (strpos($content, '":')) {
@@ -705,6 +703,11 @@ class Request
parse_str($content, $this->put);
}
}
if (is_array($name)) {
$this->param = [];
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
}
return $this->input($this->put, $name, $default, $filter);
}
@@ -743,11 +746,12 @@ class Request
*/
public function request($name = '', $default = null, $filter = null)
{
if (empty($this->request)) {
$this->request = $_REQUEST;
}
if (is_array($name)) {
$this->param = [];
return $this->request = array_merge($this->request, $name);
} elseif (empty($this->request)) {
$this->request = $_REQUEST;
}
return $this->input($this->request ?: $_REQUEST, $name, $default, $filter);
}
@@ -762,10 +766,11 @@ class Request
*/
public function session($name = '', $default = null, $filter = null)
{
if (empty($this->session)) {
$this->session = Session::get();
}
if (is_array($name)) {
return $this->session = array_merge($this->session, $name);
} elseif (empty($this->session)) {
$this->session = Session::get();
}
return $this->input($this->session, $name, $default, $filter);
}
@@ -780,10 +785,11 @@ class Request
*/
public function cookie($name = '', $default = null, $filter = null)
{
if (empty($this->cookie)) {
$this->cookie = $_COOKIE;
}
if (is_array($name)) {
return $this->cookie = array_merge($this->cookie, $name);
} elseif (empty($this->cookie)) {
$this->cookie = $_COOKIE;
}
return $this->input($this->cookie, $name, $default, $filter);
}
@@ -798,10 +804,11 @@ class Request
*/
public function server($name = '', $default = null, $filter = null)
{
if (empty($this->server)) {
$this->server = $_SERVER;
}
if (is_array($name)) {
return $this->server = array_merge($this->server, $name);
} elseif (empty($this->server)) {
$this->server = $_SERVER;
}
return $this->input($this->server, false === $name ? false : strtoupper($name), $default, $filter);
}
@@ -814,10 +821,11 @@ class Request
*/
public function file($name = '')
{
if (empty($this->file)) {
$this->file = isset($_FILES) ? $_FILES : [];
}
if (is_array($name)) {
return $this->file = array_merge($this->file, $name);
} elseif (empty($this->file)) {
$this->file = isset($_FILES) ? $_FILES : [];
}
$files = $this->file;
if (!empty($files)) {
@@ -874,10 +882,11 @@ class Request
*/
public function env($name = '', $default = null, $filter = null)
{
if (empty($this->env)) {
$this->env = $_ENV;
}
if (is_array($name)) {
return $this->env = array_merge($this->env, $name);
} elseif (empty($this->env)) {
$this->env = $_ENV;
}
return $this->input($this->env, false === $name ? false : strtoupper($name), $default, $filter);
}
@@ -891,9 +900,7 @@ class Request
*/
public function header($name = '', $default = null)
{
if (is_array($name)) {
return $this->header = array_merge($this->header, $name);
} elseif (empty($this->header)) {
if (empty($this->header)) {
$header = [];
$server = $this->server ?: $_SERVER;
foreach ($server as $key => $val) {
@@ -910,6 +917,9 @@ class Request
}
$this->header = array_change_key_case($header);
}
if (is_array($name)) {
return $this->header = array_merge($this->header, $name);
}
if ('' === $name) {
return $this->header;
}