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

调整Loader::addNamespace方法的位置 修正configTest

Browse Source
This commit is contained in:
thinkphp
2016-03-23 15:51:01 +08:00
parent eff3dd828c
commit 235e9f847f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
start.php
View File

@@ -30,9 +30,6 @@ if (!defined('APP_DEBUG')) {
define('APP_DEBUG', $debug); define('APP_DEBUG', $debug);
} }
// 注册自动加载
Loader::register();
// 加载模式定义文件 // 加载模式定义文件
$mode = require MODE_PATH . APP_MODE . EXT; $mode = require MODE_PATH . APP_MODE . EXT;
@@ -41,6 +38,9 @@ if (isset($mode['namespace'])) {
Loader::addNamespace($mode['namespace']); Loader::addNamespace($mode['namespace']);
} }
// 注册自动加载
Loader::register();
// 加载模式别名定义 // 加载模式别名定义
if (isset($mode['alias'])) { if (isset($mode['alias'])) {
Loader::addMap($mode['alias']); Loader::addMap($mode['alias']);

7
tests/thinkphp/library/think/configTest.php
View File

@@ -94,10 +94,9 @@ class configTest extends \PHPUnit_Framework_TestCase
$this->assertEquals([], Config::get(null, $range)); $this->assertEquals([], Config::get(null, $range));
$this->assertEquals(null, Config::get(null, 'does_not_exist')); $this->assertEquals(null, Config::get(null, 'does_not_exist'));
// test $_ENV configuration // test $_ENV configuration
defined('ENV_PREFIX') or define('ENV_PREFIX', '_TEST_'); $name = 'test_name';
$name = 'test_name'; $value = 'value';
$value = 'value'; putenv(ENV_PREFIX . $name . '=' . $value);
$_ENV[ENV_PREFIX . $name] = $value;
$this->assertEquals($value, Config::get($name, $range)); $this->assertEquals($value, Config::get($name, $range));
// test getting configuration // test getting configuration
$reflectedPropertyConfig->setValue([$range => ['abcd' => 'efg']]); $reflectedPropertyConfig->setValue([$range => ['abcd' => 'efg']]);