hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-08-26 21:30:18 +02:00
Code Issues Releases Wiki Activity

removed unnecessary checks in Config

Browse Source
This commit is contained in:
Vladimir Grigor 2014-07-27 22:53:49 +03:00
parent eaccc0dab8
commit 6ecaf41336
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mage/Config.php
View File

@ -170,20 +170,17 @@ class Config
{
$environment = $this->getEnvironment();
$configFilePath = getcwd() . '/.mage/config/environment/' . $environment . '.yml';
if(!empty($environment))
{
$configFilePath = getcwd() . '/.mage/config/environment/' . $environment . '.yml';
$parameters = $this->getParameters();
try {
$this->environmentConfig = $this->loadEnvironment($configFilePath);
} catch (ConfigNotFoundException $e) {
throw new RequiredConfigNotFoundException("Not found required config $configFilePath for environment $environment", 0 , $e);
}
if (empty($environment) && (!empty($parameters) || !$this->isRunInSpecialMode($parameters))) {
throw new RuntimeException('Environment is not set');
}
try {
$this->environmentConfig = $this->loadEnvironment($configFilePath);
} catch (ConfigNotFoundException $e) {
throw new RequiredConfigNotFoundException("Not found required config $configFilePath for environment $environment", 0 , $e);
}
}
/**