View GitHub Repository librenmsv2

Schedule Inspection
Subscribe
Completed
Pull Request — develop (#57)
by Tony
07:24
created
Status
Category
Toggle Patches
app/Settings.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -76,8 +76,7 @@  discard block
 
 block discarded – undo
76 76 
                 DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]);
77 77 
                 Cache::tags(self::$cache_tag)->put($k, $v, $this->cache_time);
78 78 
             }
79 
-        }
80 
-        else {
79 
+        } else {
81 80 
             DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]);
82 81 
             Cache::tags(self::$cache_tag)->put($key, $value, $this->cache_time);
83 82 
         }
 
@@ -106,8 +105,7 @@  discard block
 
 block discarded – undo
106 105 
             $currentPath = array_merge($path, array($key));
107 106 
             if (is_array($val)) {
108 107 
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
109 
-            }
110 
-            else {
108 
+            } else {
111 109 
                 $result[$prefix . join('.', $currentPath)] = $val;
112 110 
             }
113 111 
         }
 
@@ -130,8 +128,7 @@  discard block
 
 block discarded – undo
130 128 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
131 129 
                 // return a bare value if we are getting one item
132 130 
                 return $db_data->first()->config_value;
133 
-            }
134 
-            elseif (count($db_data) >= 1) {
131 
+            } elseif (count($db_data) >= 1) {
135 132 
                 // convert collection to an array and merge with the config fallback
136 133 
                 $result = self::collectionToArray($db_data, $key);
137 134 
                 $config = Config::get('config.' . $key, $default);
 
@@ -139,8 +136,7 @@  discard block
 
 block discarded – undo
139 136 
                     $result = array_replace_recursive($config, $result);
140 137 
                 }
141 138 
                 return $result;
142 
-            }
143 
-            else {
139 
+            } else {
144 140 
                 // fallback to the config or return the default value
145 141 
                 return Config::get('config.' . $key, $default);
146 142 
             }
Please login to merge, or discard this patch.