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

去掉 COMMON_MODULE 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-02 10:51:10 +08:00
parent 8deabb737a
commit bf7e974fae
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
base.php
View File

@@ -28,7 +28,6 @@ defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH . 'log' . DS);
defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH . 'cache' . DS);
defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp' . DS);
defined('APP_NAMESPACE') or define('APP_NAMESPACE', 'app');
defined('COMMON_MODULE') or define('COMMON_MODULE', 'common');
defined('CONF_PATH') or define('CONF_PATH', APP_PATH); // 配置文件目录
defined('CONF_EXT') or define('CONF_EXT', EXT); // 配置文件后缀
defined('APP_MULTI_MODULE') or define('APP_MULTI_MODULE', true); // 是否多模块

2
convention.php
View File

@@ -39,7 +39,7 @@ return [
// 默认模块名
'default_module' => 'index',
// 禁止访问模块
'deny_module_list' => [COMMON_MODULE],
'deny_module_list' => ['common'],
// 默认控制器名
'default_controller' => 'Index',
// 默认操作名

10
library/think/App.php
View File

@@ -48,8 +48,8 @@ class App
define('IS_AJAX', $request->isAjax());
define('__EXT__', $request->ext());
// 初始化应用（公共模块）
$config = self::initModule(COMMON_MODULE, Config::get());
// 初始化应用
$config = self::init('', Config::get());
// 注册根命名空间
if (!empty($config['root_namespace'])) {
@@ -305,16 +305,16 @@ class App
}
/**
* 初始化模块
* 初始化应用或模块
* @access public
* @param string $module 模块名
* @param array $config 配置参数
* @return void
*/
private static function initModule($module, $config)
private static function init($module, $config)
{
// 定位模块目录
$module = (COMMON_MODULE == $module || !APP_MULTI_MODULE) ? '' : $module . DS;
$module = ($module && APP_MULTI_MODULE) ? $module . DS : '';
// 加载初始化文件
if (is_file(APP_PATH . $module . 'init' . EXT)) {

16
library/think/Loader.php
View File

@@ -266,9 +266,10 @@ class Loader
* @param string $name Model名称
* @param string $layer 业务层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object
*/
public static function model($name = '', $layer = 'model', $appendSuffix = false)
public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
{
static $_model = [];
if (isset($_model[$name . $layer])) {
@@ -277,13 +278,13 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name, 2);
} else {
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
$module = Request::instance()->module();
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
$model = new $class();
} else {
$class = str_replace('\\' . $module . '\\', '\\' . COMMON_MODULE . '\\', $class);
$class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);
if (class_exists($class)) {
$model = new $class();
} else {
@@ -312,7 +313,7 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name);
} else {
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
$module = Request::instance()->module();
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
@@ -331,9 +332,10 @@ class Loader
* @param string $name 资源地址
* @param string $layer 验证层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object|false
*/
public static function validate($name = '', $layer = 'validate', $appendSuffix = false)
public static function validate($name = '', $layer = 'validate', $appendSuffix = false, $common = 'common')
{
$name = $name ?: Config::get('default_validate');
if (empty($name)) {
@@ -347,13 +349,13 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name);
} else {
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
$module = Request::instance()->module();
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
$validate = new $class;
} else {
$class = str_replace('\\' . $module . '\\', '\\' . COMMON_MODULE . '\\', $class);
$class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);
if (class_exists($class)) {
$validate = new $class;
} else {

1
tests/thinkphp/baseTest.php
View File

@@ -28,7 +28,6 @@ class baseTest extends \PHPUnit_Framework_TestCase
$this->assertNotEmpty(TRAIT_PATH);
$this->assertNotEmpty(APP_PATH);
$this->assertNotEmpty(APP_NAMESPACE);
$this->assertNotEmpty(COMMON_MODULE);
$this->assertNotEmpty(RUNTIME_PATH);
$this->assertNotEmpty(LOG_PATH);
$this->assertNotEmpty(CACHE_PATH);