@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
13 | 13 | |
14 | 14 | if (!isset($_SERVER['CIIMS_ENV'])) |
15 | - $_SERVER['CIIMS_ENV'] = 'main'; |
|
15 | + $_SERVER['CIIMS_ENV'] = 'main'; |
|
16 | 16 | |
17 | 17 | $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
18 | 18 | $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | |
32 | 32 | // Set the request component in the test script |
33 | 33 | $config['components']['request'] = array( |
34 | - 'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest' |
|
34 | + 'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest' |
|
35 | 35 | ); |
36 | 36 | |
37 | 37 | // Return for Codeception |
38 | 38 | return array( |
39 | - 'class' => 'CWebApplication', |
|
40 | - 'config' => $config |
|
39 | + 'class' => 'CWebApplication', |
|
40 | + 'config' => $config |
|
41 | 41 | ); |
@@ -1,31 +1,31 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Set Error Reporting Levels |
4 | -error_reporting(-1); |
|
5 | -ini_set('display_errors', 'true'); |
|
6 | -date_default_timezone_set('UTC'); |
|
4 | +error_reporting (-1); |
|
5 | +ini_set ('display_errors', 'true'); |
|
6 | +date_default_timezone_set ('UTC'); |
|
7 | 7 | |
8 | 8 | // Definitions |
9 | -defined('DS') or define('DS', DIRECTORY_SEPARATOR); |
|
10 | -defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS); |
|
11 | -defined('YII_DEBUG') or define('YII_DEBUG',true); |
|
12 | -defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
|
9 | +defined ('DS') or define ('DS', DIRECTORY_SEPARATOR); |
|
10 | +defined ('BASEDIR') or define ('BASEDIR', __DIR__ . DS . '..' . DS); |
|
11 | +defined ('YII_DEBUG') or define ('YII_DEBUG', true); |
|
12 | +defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', 3); |
|
13 | 13 | |
14 | 14 | if (!isset($_SERVER['CIIMS_ENV'])) |
15 | 15 | $_SERVER['CIIMS_ENV'] = 'main'; |
16 | 16 | |
17 | -$config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
|
18 | -$defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
|
17 | +$config = require BASEDIR . 'protected' . DS . 'config' . DS . $_SERVER['CIIMS_ENV'] . '.php'; |
|
18 | +$defaultConfig = require BASEDIR . 'protected' . DS . 'config' . DS . 'main.default.php'; |
|
19 | 19 | |
20 | 20 | // Load Yii and Composer extensions |
21 | -require_once BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yii.php'; |
|
22 | -require_once BASEDIR.'vendor'.DS.'autoload.php'; |
|
21 | +require_once BASEDIR . 'vendor' . DS . 'yiisoft' . DS . 'yii' . DS . 'framework' . DS . 'yii.php'; |
|
22 | +require_once BASEDIR . 'vendor' . DS . 'autoload.php'; |
|
23 | 23 | |
24 | -Yii::setPathOfAlias('vendor', BASEDIR.'vendor'); |
|
25 | -Yii::setPathOfAlias('base', BASEDIR); |
|
26 | -Yii::setPathOfAlias('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
24 | +Yii::setPathOfAlias ('vendor', BASEDIR . 'vendor'); |
|
25 | +Yii::setPathOfAlias ('base', BASEDIR); |
|
26 | +Yii::setPathOfAlias ('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias ('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
27 | 27 | |
28 | -$config = CMap::mergeArray($defaultConfig, $config); |
|
28 | +$config = CMap::mergeArray ($defaultConfig, $config); |
|
29 | 29 | |
30 | 30 | $_SERVER['SERVER_NAME'] = 'localhost'; |
31 | 31 |
@@ -11,8 +11,9 @@ |
||
11 | 11 | defined('YII_DEBUG') or define('YII_DEBUG',true); |
12 | 12 | defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
13 | 13 | |
14 | -if (!isset($_SERVER['CIIMS_ENV'])) |
|
14 | +if (!isset($_SERVER['CIIMS_ENV'])) { |
|
15 | 15 | $_SERVER['CIIMS_ENV'] = 'main'; |
16 | +} |
|
16 | 17 | |
17 | 18 | $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
18 | 19 | $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |