@@ -17,8 +17,6 @@ |
||
| 17 | 17 | |
| 18 | 18 | namespace App\Http\Controllers; |
| 19 | 19 | |
| 20 | -use App\Http\Requests; |
|
| 21 | -use App\Models\DbConfig; |
|
| 22 | 20 | use Illuminate\Http\Request; |
| 23 | 21 | use Settings; |
| 24 | 22 | |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | public function scopeKey($query, $key) |
| 51 | 51 | { |
| 52 | - return $query->where('config_name', 'LIKE', $key . '%'); |
|
| 52 | + return $query->where('config_name', 'LIKE', $key.'%'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function scopeExactKey($query, $key) |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | use App\Models\DbConfig; |
| 29 | 29 | use Cache; |
| 30 | 30 | use Config; |
| 31 | -use Illuminate\Contracts\Config\Repository as ConfigContract; // adds the possibility to replace the default Config facade |
|
| 31 | +use Illuminate\Contracts\Config\Repository as ConfigContract; // adds the possibility to replace the default Config facade |
|
| 32 | 32 | |
| 33 | 33 | class Settings implements ConfigContract |
| 34 | 34 | { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | public function get($key, $default = null) |
| 86 | 86 | { |
| 87 | 87 | // return value from cache or fetch it and return it |
| 88 | - return Cache::remember($key, $this->cache_time, function () use ($key, $default) { |
|
| 88 | + return Cache::remember($key, $this->cache_time, function() use ($key, $default) { |
|
| 89 | 89 | $db_data = DbConfig::key($key)->get(['config_name', 'config_value']); |
| 90 | 90 | |
| 91 | 91 | if (count($db_data) == 1 && $db_data->first()->config_name == $key) { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | elseif (count($db_data) >= 1) { |
| 96 | 96 | // convert collection to an array and merge with the config fallback |
| 97 | 97 | $result = self::collectionToArray($db_data, $key); |
| 98 | - $config = Config::get('config.' . $key, $default); |
|
| 98 | + $config = Config::get('config.'.$key, $default); |
|
| 99 | 99 | if (!is_null($config) && is_array($config)) { |
| 100 | 100 | $result = array_replace_recursive($config, $result); |
| 101 | 101 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | } |
| 104 | 104 | else { |
| 105 | 105 | // fallback to the config or return the default value |
| 106 | - return Config::get('config.' . $key, $default); |
|
| 106 | + return Config::get('config.'.$key, $default); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | }); |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | private static function recursive_keys(array $array, $prefix = "", array $path = array()) |
| 213 | 213 | { |
| 214 | 214 | if ($prefix != "") { |
| 215 | - $prefix = trim($prefix, '.') . '.'; |
|
| 215 | + $prefix = trim($prefix, '.').'.'; |
|
| 216 | 216 | } |
| 217 | 217 | $result = array(); |
| 218 | 218 | foreach ($array as $key => $val) { |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath)); |
| 222 | 222 | } |
| 223 | 223 | else { |
| 224 | - $result[$prefix . join('.', $currentPath)] = $val; |
|
| 224 | + $result[$prefix.join('.', $currentPath)] = $val; |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | return $result; |