mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 22:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加url_param_type配置参数 用于配置操作方法的参数绑定方式

Browse Source
This commit is contained in:
thinkphp
2016-06-01 14:13:21 +08:00
parent 3420eb5f60
commit dfa5143dad
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Route.php
View File

@@ -827,9 +827,10 @@ class Route
* @param string $url URL地址
* @param string $depr URL分隔符
* @param bool $autoSearch 是否自动深度搜索控制器
* @param integer $paramType URL参数解析方式 0 名称解析 1 顺序解析
* @return array
*/
public static function parseUrl($url, $depr = '/', $autoSearch = false)
public static function parseUrl($url, $depr = '/', $autoSearch = false, $paramType = 0)
{
if (isset(self::$bind['module'])) {
// 如果有模块/控制器绑定
@@ -840,7 +841,7 @@ class Route
$url = str_replace($depr, '/', $url);
}
$result = self::parseRoute($url, $autoSearch, true);
$result = self::parseRoute($url, $autoSearch, true, $paramType);
if (!empty($result['var'])) {
$_GET = array_merge($result['var'], $_GET);
@@ -854,9 +855,10 @@ class Route
* @param string $url URL地址
* @param bool $autoSearch 是否自动深度搜索控制器
* @param bool $reverse 是否反转解析URL
* @param integer $paramType URL参数解析方式 0 名称解析 1 顺序解析
* @return array
*/
private static function parseRoute($url, $autoSearch = false, $reverse = false)
private static function parseRoute($url, $autoSearch = false, $reverse = false, $paramType = 0)
{
$url = trim($url, '/');
$var = [];
@@ -901,9 +903,13 @@ class Route
$action = !empty($path) ? array_shift($path) : null;
// 解析额外参数
if (!empty($path)) {
preg_replace_callback('/([^\/]+)\/([^\/]+)/', function ($match) use (&$var) {
$var[strtolower($match[1])] = strip_tags($match[2]);
}, implode('/', $path));
if ($paramType) {
$var += $path;
} else {
preg_replace_callback('/([^\/]+)\/([^\/]+)/', function ($match) use (&$var) {
$var[strtolower($match[1])] = strip_tags($match[2]);
}, implode('/', $path));
}
}
} else {
$action = array_pop($path);