@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | use Yii; |
| 15 | 15 | |
| 16 | 16 | // PHP Constants |
| 17 | -$version = is_file(__DIR__ . '/../src/version') ? trim(file_get_contents(__DIR__ . '/../src/version')) : 'dev'; |
|
| 17 | +$version = is_file(__DIR__.'/../src/version') ? trim(file_get_contents(__DIR__.'/../src/version')) : 'dev'; |
|
| 18 | 18 | defined('APP_VERSION') or define('APP_VERSION', $version); |
| 19 | 19 | $projectVersion = is_file(__DIR__.'/../project/version') ? trim(file_get_contents(__DIR__.'/../project/version')) : 'vanilla'; |
| 20 | 20 | defined('PROJECT_VERSION') or define('PROJECT_VERSION', $projectVersion); |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | Yii::setAlias('@webroot', '@root/web'); |
| 28 | 28 | |
| 29 | 29 | // Use a closure to not pollute the global namespace |
| 30 | -return call_user_func(function () { |
|
| 30 | +return call_user_func(function() { |
|
| 31 | 31 | |
| 32 | 32 | /*function checkFile(){ |
| 33 | 33 | if (file_exists($file)) { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | "{$configDir}/".APP_TYPE.'.php' => true, |
| 42 | 42 | "{$configDir}/common-".YII_ENV.'.php' => false, |
| 43 | 43 | "{$configDir}/".APP_TYPE.'-'.YII_ENV.'.php' => false, |
| 44 | - "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG)?'debug':'release').'.php' => false, |
|
| 44 | + "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG) ? 'debug' : 'release').'.php' => false, |
|
| 45 | 45 | ]; |
| 46 | 46 | |
| 47 | 47 | if (!empty(getenv('APP_CONFIG_FILE'))) { |
@@ -49,12 +49,12 @@ discard block |
||
| 49 | 49 | // Merge additional configurations |
| 50 | 50 | foreach ($additionalConfigFiles as $alias) { |
| 51 | 51 | $file = Yii::getAlias($alias); |
| 52 | - $configFiles[$file] = true; |
|
| 52 | + $configFiles[ $file ] = true; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Merge configurations |
| 57 | - $config = []; |
|
| 57 | + $config = [ ]; |
|
| 58 | 58 | //var_dump($configFiles);exit; |
| 59 | 59 | Yii::trace($configFiles, __METHOD__); |
| 60 | 60 | foreach ($configFiles as $file => $isRequired) { |