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

取消 CONTROLLER_LAYER MODEL_LAYER VIEW_LAYER VALIDATE_LAYER 常量 增加url_controller_layer 配置参数

Browse Source
This commit is contained in:
thinkphp
2016-06-01 16:34:24 +08:00
parent bebe73e5a7
commit 12196d21b8
11 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/Loader.php
View File

@@ -267,7 +267,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @return Object
*/
public static function model($name = '', $layer = MODEL_LAYER, $appendSuffix = false)
public static function model($name = '', $layer = 'model', $appendSuffix = false)
{
static $_model = [];
if (isset($_model[$name . $layer])) {
@@ -301,10 +301,10 @@ class Loader
* @param string $empty 空控制器名称
* @return Object|false
*/
public static function controller($name, $layer = '', $appendSuffix = false, $empty = '')
public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
{
static $_instance = [];
$layer = $layer ?: CONTROLLER_LAYER;
if (isset($_instance[$name . $layer])) {
return $_instance[$name . $layer];
}
@@ -332,14 +332,14 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @return Object|false
*/
public static function validate($name = '', $layer = '', $appendSuffix = false)
public static function validate($name = '', $layer = 'validate', $appendSuffix = false)
{
$name = $name ?: Config::get('default_validate');
if (empty($name)) {
return new Validate;
}
static $_instance = [];
$layer = $layer ?: VALIDATE_LAYER;
if (isset($_instance[$name . $layer])) {
return $_instance[$name . $layer];
}
@@ -381,7 +381,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @return mixed
*/
public static function action($url, $vars = [], $layer = CONTROLLER_LAYER, $appendSuffix = false)
public static function action($url, $vars = [], $layer = 'controller', $appendSuffix = false)
{
$info = pathinfo($url);
$action = $info['basename'];