php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-18 01:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added more YII_ENV constants.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-31 07:18:59 -04:00
parent 5d9c23c67b
commit eda171e1be
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/basic/config/web.php
View File

@ -7,7 +7,7 @@ return array(
'modules' => array( 'modules' => array(
'debug' => array( 'debug' => array(
'class' => 'yii\debug\Module', 'class' => 'yii\debug\Module',
'enabled' => YII_DEBUG && YII_ENV === 'dev', 'enabled' => YII_DEBUG && YII_ENV_DEV,
), ),
), ),
'components' => array( 'components' => array(

2
apps/basic/controllers/SiteController.php
View File

@ -14,7 +14,7 @@ class SiteController extends Controller
return array( return array(
'captcha' => array( 'captcha' => array(
'class' => 'yii\web\CaptchaAction', 'class' => 'yii\web\CaptchaAction',
'fixedVerifyCode' => YII_ENV === 'test' ? 'testme' : null, 'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : null,
), ),
); );
} }

17
framework/yii/YiiBase.php
View File

@ -16,6 +16,10 @@ use yii\log\Logger;
* Gets the application start timestamp. * Gets the application start timestamp.
*/ */
defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true)); defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
/**
* This constant defines the framework installation directory.
*/
defined('YII_PATH') or define('YII_PATH', __DIR__);
/** /**
* This constant defines whether the application should be in debug mode or not. Defaults to false. * This constant defines whether the application should be in debug mode or not. Defaults to false.
*/ */
@ -26,9 +30,18 @@ defined('YII_DEBUG') or define('YII_DEBUG', false);
*/ */
defined('YII_ENV') or define('YII_ENV', 'prod'); defined('YII_ENV') or define('YII_ENV', 'prod');
/** /**
* This constant defines the framework installation directory. * Whether the the application is running in production environment
*/ */
defined('YII_PATH') or define('YII_PATH', __DIR__); defined('YII_ENV_PROD') or define('YII_ENV_PROD', YII_ENV === 'prod');
/**
* Whether the the application is running in development environment
*/
defined('YII_ENV_DEV') or define('YII_ENV_DEV', YII_ENV === 'dev');
/**
* Whether the the application is running in testing environment
*/
defined('YII_ENV_TEST') or define('YII_ENV_TEST', YII_ENV === 'test');
/** /**
* This constant defines whether error handling should be enabled. Defaults to true. * This constant defines whether error handling should be enabled. Defaults to true.
*/ */

2
framework/yii/base/ErrorHandler.php
View File

@ -82,7 +82,7 @@ class ErrorHandler extends Component
*/ */
protected function renderException($exception) protected function renderException($exception)
{ {
if (Yii::$app instanceof \yii\console\Application || YII_ENV === 'test') { if (Yii::$app instanceof \yii\console\Application || YII_ENV_TEST) {
echo Yii::$app->renderException($exception); echo Yii::$app->renderException($exception);
return; return;
} }

5
framework/yii/data/IDataProvider.php
View File

@ -10,9 +10,8 @@ namespace yii\data;
/** /**
* IDataProvider is the interface that must be implemented by data provider classes. * IDataProvider is the interface that must be implemented by data provider classes.
* *
* Data providers are components that can provide data that are sorted and paginated. * Data providers are components that sort and paginate data, and provide them to widgets
* Data providers are often used with widgets, such as [[GridView]], [[ListView]] * such as [[GridView]], [[ListView]].
* that display data and support sorting and pagination.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0

2
framework/yii/log/Logger.php
View File

@ -150,7 +150,7 @@ class Logger extends Component
{ {
parent::init(); parent::init();
if ($this->traceLevel === null) { if ($this->traceLevel === null) {
$this->traceLevel = YII_ENV === 'dev' ? 3 : 0; $this->traceLevel = YII_ENV_DEV ? 3 : 0;
} }
foreach ($this->targets as $name => $target) { foreach ($this->targets as $name => $target) {
if (!$target instanceof Target) { if (!$target instanceof Target) {

2
framework/yii/web/User.php
View File

@ -416,7 +416,7 @@ class User extends Component
public function switchIdentity($identity, $duration = 0) public function switchIdentity($identity, $duration = 0)
{ {
$session = Yii::$app->getSession(); $session = Yii::$app->getSession();
if (YII_ENV !== 'test') { if (!YII_ENV_TEST) {
$session->regenerateID(true); $session->regenerateID(true);
} }
$this->setIdentity($identity); $this->setIdentity($identity);