Completed
Pull Request — develop (#57)
by Tony
07:44
created
app/Models/DbConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
app/Settings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     private static function recursive_keys(array $array, $prefix = "", array $path = array())
100 100
     {
101 101
         if ($prefix != "") {
102
-            $prefix = trim($prefix, '.') . '.';
102
+            $prefix = trim($prefix, '.').'.';
103 103
         }
104 104
         $result = array();
105 105
         foreach ($array as $key => $val) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
109 109
             }
110 110
             else {
111
-                $result[$prefix . join('.', $currentPath)] = $val;
111
+                $result[$prefix.join('.', $currentPath)] = $val;
112 112
             }
113 113
         }
114 114
         return $result;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     public function get($key, $default = null)
125 125
     {
126 126
         // return value from cache or fetch it and return it
127
-        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) {
127
+        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) {
128 128
             $db_data = DbConfig::key($key)->get(['config_name', 'config_value']);
129 129
 
130 130
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
             elseif (count($db_data) >= 1) {
135 135
                 // convert collection to an array and merge with the config fallback
136 136
                 $result = self::collectionToArray($db_data, $key);
137
-                $config = Config::get('config.' . $key, $default);
137
+                $config = Config::get('config.'.$key, $default);
138 138
                 if (!is_null($config) && is_array($config)) {
139 139
                     $result = array_replace_recursive($config, $result);
140 140
                 }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             }
143 143
             else {
144 144
                 // fallback to the config or return the default value
145
-                return Config::get('config.' . $key, $default);
145
+                return Config::get('config.'.$key, $default);
146 146
             }
147 147
 
148 148
         });
Please login to merge, or discard this patch.