diff options
Diffstat (limited to 'lib/Minz/Configuration.php')
| -rw-r--r-- | lib/Minz/Configuration.php | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index 72e2cedc0..572b9984d 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -69,8 +69,24 @@ class Minz_Configuration { public static function salt () { return self::$salt; } - public static function environment () { - return self::$environment; + public static function environment ($str = false) { + $env = self::$environment; + + if ($str) { + switch (self::$environment) { + case self::SILENT: + $env = 'silent'; + break; + case self::DEVELOPMENT: + $env = 'development'; + break; + case self::PRODUCTION: + default: + $env = 'production'; + } + } + + return $env; } public static function baseUrl () { return self::$base_url; @@ -147,7 +163,7 @@ class Minz_Configuration { public static function writeFile() { $ini_array = array( 'general' => array( - 'environment' => self::$environment, + 'environment' => self::environment(true), 'use_url_rewriting' => self::$use_url_rewriting, 'salt' => self::$salt, 'base_url' => self::$base_url, @@ -205,23 +221,26 @@ class Minz_Configuration { if (isset ($general['environment'])) { switch ($general['environment']) { - case Minz_Configuration::SILENT: case 'silent': self::$environment = Minz_Configuration::SILENT; break; - case Minz_Configuration::DEVELOPMENT: case 'development': self::$environment = Minz_Configuration::DEVELOPMENT; break; - case Minz_Configuration::PRODUCTION: case 'production': self::$environment = Minz_Configuration::PRODUCTION; break; default: - throw new Minz_BadConfigurationException ( - 'environment', - Minz_Exception::ERROR - ); + if ($general['environment'] >= 0 && + $general['environment'] <= 2) { + // fallback 0.7-beta + self::$environment = $general['environment']; + } else { + throw new Minz_BadConfigurationException ( + 'environment', + Minz_Exception::ERROR + ); + } } } |