[Standards] Updated Codebase to reflect new coding standards. See CONTRIBUTING.md for standards.

This commit is contained in:
Thomas Coleman
2014-11-27 16:05:00 +00:00
parent f662352f66
commit 107a4c2a6e
30 changed files with 646 additions and 606 deletions
+39 -37
View File
@@ -1,42 +1,44 @@
<?php
class Setting extends Eloquent {
/**
* Returns a setting from the database.
* @param string $settingName
* @param bool $checkEnv
* @return string
*/
public static function get($settingName, $checkEnv = true) {
// Default setting value.
$setting = null;
namespace CachetHQ\Cachet\Models;
// First try finding the setting in the database.
try {
$setting = self::whereName($settingName)->first()->value;
} catch (\ErrorException $e) {
// If we don't have a setting, check the env (fallback for original version)
if ($checkEnv) {
if (!($setting = getenv(strtoupper($settingName)))) {
return $setting;
}
} else {
return $setting;
}
}
class Setting extends Eloquent {
/**
* Returns a setting from the database.
* @param string $settingName
* @param bool $checkEnv
* @return string
*/
public static function get($settingName, $checkEnv = true) {
// Default setting value.
$setting = null;
return $setting;
}
// First try finding the setting in the database.
try {
$setting = self::whereName($settingName)->first()->value;
} catch (\ErrorException $e) {
// If we don't have a setting, check the env (fallback for original version)
if ($checkEnv) {
if (!($setting = getenv(strtoupper($settingName)))) {
return $setting;
}
} else {
return $setting;
}
}
/**
* Throws an Exception
* @param string $setting
* @throws Exception
* @return void
*/
public static function unknownSettingException($setting) {
throw new \Exception(
sprintf('Unknown setting %s', $setting)
);
}
}
return $setting;
}
/**
* Throws an Exception
* @param string $setting
* @throws Exception
* @return void
*/
public static function unknownSettingException($setting) {
throw new \Exception(
sprintf('Unknown setting %s', $setting)
);
}
}