@@ -32,11 +32,17 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // 'config_name', 'config_value' |
| 34 | 34 | |
| 35 | + /** |
|
| 36 | + * @param string $key |
|
| 37 | + */ |
|
| 35 | 38 | public function has($key) |
| 36 | 39 | { |
| 37 | 40 | return DbConfig::exactKey($key)->exists(); |
| 38 | 41 | } |
| 39 | 42 | |
| 43 | + /** |
|
| 44 | + * @param string $key |
|
| 45 | + */ |
|
| 40 | 46 | public function get($key, $default = null) |
| 41 | 47 | { |
| 42 | 48 | $results = DbConfig::key($key)->get(['config_name', 'config_value']); |
@@ -100,6 +106,9 @@ discard block |
||
| 100 | 106 | return $ret; |
| 101 | 107 | } |
| 102 | 108 | |
| 109 | + /** |
|
| 110 | + * @param \Illuminate\Database\Eloquent\Collection $objs |
|
| 111 | + */ |
|
| 103 | 112 | private function objsToArray($objs) |
| 104 | 113 | { |
| 105 | 114 | $ret = array(); |
@@ -42,8 +42,7 @@ discard block |
||
| 42 | 42 | $results = DbConfig::key($key)->get(['config_name', 'config_value']); |
| 43 | 43 | if (count($results) > 1) { |
| 44 | 44 | return $this->collectionToArray($results); |
| 45 | - } |
|
| 46 | - elseif (count($results) == 1) { |
|
| 45 | + } elseif (count($results) == 1) { |
|
| 47 | 46 | $entry = $results->first(); |
| 48 | 47 | if($entry->config_name != $key) { //FIXME: better test |
| 49 | 48 | // trim the prefix |
@@ -53,8 +52,7 @@ discard block |
||
| 53 | 52 | |
| 54 | 53 | $value = $entry->config_value; |
| 55 | 54 | return is_null($value) ? $default : $value; |
| 56 | - } |
|
| 57 | - else { |
|
| 55 | + } else { |
|
| 58 | 56 | return $default; |
| 59 | 57 | } |
| 60 | 58 | } |
@@ -49,8 +49,7 @@ discard block |
||
| 49 | 49 | $this->database->set($k, $v); |
| 50 | 50 | // Cache::put($key, $v); |
| 51 | 51 | } |
| 52 | - } |
|
| 53 | - else { |
|
| 52 | + } else { |
|
| 54 | 53 | $this->database->set($key, $value); |
| 55 | 54 | } |
| 56 | 55 | // Cache::put($key, $v); |
@@ -68,8 +67,7 @@ discard block |
||
| 68 | 67 | if (!is_null($config)) { |
| 69 | 68 | $value = array_replace_recursive($config, $value); |
| 70 | 69 | } |
| 71 | - } |
|
| 72 | - elseif (is_null($value)) { |
|
| 70 | + } elseif (is_null($value)) { |
|
| 73 | 71 | $value = Config::get('config.' . $key); |
| 74 | 72 | } |
| 75 | 73 | |
@@ -135,8 +133,7 @@ discard block |
||
| 135 | 133 | $currentPath = array_merge($path, array($key)); |
| 136 | 134 | if (is_array($val)) { |
| 137 | 135 | $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath)); |
| 138 | - } |
|
| 139 | - else { |
|
| 136 | + } else { |
|
| 140 | 137 | $result[$prefix . join('.', $currentPath)] = $val; |
| 141 | 138 | } |
| 142 | 139 | } |