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

改进Route的请求类型参数 支持小写传入

Browse Source
This commit is contained in:
thinkphp
2016-05-16 10:41:22 +08:00
parent cf6836b56d
commit 891c1f99f2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Route.php
View File

@@ -120,7 +120,7 @@ class Route
self::resource($rule['__rest__']); self::resource($rule['__rest__']);
unset($rule['__rest__']); unset($rule['__rest__']);
} }
$type = strtoupper($type);
foreach ($rule as $key => $val) { foreach ($rule as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
$key = array_shift($val); $key = array_shift($val);
@@ -146,6 +146,7 @@ class Route
$group = $group ?: self::$group; $group = $group ?: self::$group;
$option = $option ?: self::$option; $option = $option ?: self::$option;
$type = strtoupper($type);
if (strpos($type, '|')) { if (strpos($type, '|')) {
foreach (explode('|', $type) as $val) { foreach (explode('|', $type) as $val) {
self::rule($rule, $route, $val, $option, $pattern, $group); self::rule($rule, $route, $val, $option, $pattern, $group);
@@ -197,6 +198,7 @@ class Route
$option = $name; $option = $name;
$name = isset($option['name']) ? $option['name'] : ''; $name = isset($option['name']) ? $option['name'] : '';
} }
$type = strtoupper($type);
if (!empty($name)) { if (!empty($name)) {
if ($routes instanceof \Closure) { if ($routes instanceof \Closure) {
self::setGroup($name); self::setGroup($name);