Route类的rest方法支持覆盖定义

This commit is contained in:
thinkphp
2016-12-24 09:12:55 +08:00
parent c8712192be
commit d1637a9e51

View File

@@ -663,14 +663,14 @@ class Route
/** /**
* rest方法定义和修改 * rest方法定义和修改
* @access public * @access public
* @param string $name 方法名称 * @param string $name 方法名称
* @param array $resource 资源 * @param array|bool $resource 资源
* @return void * @return void
*/ */
public static function rest($name, $resource = []) public static function rest($name, $resource = [])
{ {
if (is_array($name)) { if (is_array($name)) {
self::$rest = array_merge(self::$rest, $name); self::$rest = $resource ? $name : array_merge(self::$rest, $name);
} else { } else {
self::$rest[$name] = $resource; self::$rest[$name] = $resource;
} }