mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进闭包路由的参数或者 改进路由参数的获取 支持单独获取路由

Browse Source
This commit is contained in:
thinkphp
2016-07-06 18:17:11 +08:00
parent 41844561be
commit 72c56548e8
2 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
library/think/Request.php
View File

@@ -62,7 +62,7 @@ class Request
/**
* @var array 当前路由信息
*/
protected $route = [];
protected $routeInfo = [];
/**
* @var array 当前调度信息
@@ -81,6 +81,7 @@ class Request
protected $get = [];
protected $post = [];
protected $request = [];
protected $route = [];
protected $put;
protected $delete;
protected $session = [];
@@ -620,11 +621,27 @@ class Request
$vars = [];
}
// 当前请求参数和URL地址中的参数合并
$this->param = array_merge($this->get(), $vars);
$this->param = array_merge($this->route(), $this->get(), $vars);
}
return $this->input($this->param, $name, $default, $filter);
}
/**
* 设置获取获取路由参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
* @param string|array $filter 过滤方法
* @return mixed
*/
public function route($name = '', $default = null, $filter = null)
{
if (is_array($name)) {
return $this->route = array_merge($this->route, $name);
}
return $this->input($this->route, $name, $default, $filter);
}
/**
* 设置获取获取GET参数
* @access public
@@ -882,25 +899,6 @@ class Request
return isset($this->header[$name]) ? $this->header[$name] : $default;
}
/**
* 获取PATH_INFO
* @param string $name 数据名称
* @param string $default 默认值
* @param string|array $filter 过滤方法
* @return mixed
*/
public function pathParam($name = '', $default = null, $filter = null)
{
$pathinfo = $this->pathinfo();
if (!empty($pathinfo)) {
$depr = Config::get('pathinfo_depr');
$input = explode($depr, trim($pathinfo, $depr));
return $this->input($input, $name, $default, $filter);
} else {
return $default;
}
}
/**
* 获取变量 支持过滤和默认值
* @param array $data 数据源
@@ -1279,17 +1277,17 @@ class Request
}
/**
* 获取当前请求的路由
* 获取当前请求的路由信息
* @access public
* @param array $route 路由名称
* @return array
*/
public function route($route = [])
public function routeInfo($route = [])
{
if (!empty($route)) {
$this->route = $route;
$this->routeInfo = $route;
} else {
return $this->route;
return $this->routeInfo;
}
}