Completed
Pull Request — develop (#57)
by Tony
08:32
created
app/Settings/DatabaseRepository.php 2 patches
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -32,11 +32,17 @@  discard block
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
         elseif (count($results) == 1) {
47 47
             $entry = $results->first();
48
-            if($entry->config_name != $key) { //FIXME: better test
48
+            if ($entry->config_name != $key) { //FIXME: better test
49 49
                 // trim the prefix
50 50
                 $local_key = substr($entry->config_name, strlen($key) + 1);
51 51
                 return [$local_key => $entry->config_value];
Please login to merge, or discard this patch.
app/Settings/Settings.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,13 +64,13 @@  discard block
 block discarded – undo
64 64
             $value = $this->database->get($key, $default);
65 65
             if (is_array($value)) {
66 66
                 $value = self::pathToArray($value, $key);
67
-                $config = Config::get('config.' . $key, $default);
67
+                $config = Config::get('config.'.$key, $default);
68 68
                 if (!is_null($config)) {
69 69
                     $value = array_replace_recursive($config, $value);
70 70
                 }
71 71
             }
72 72
             elseif (is_null($value)) {
73
-                $value = Config::get('config.' . $key);
73
+                $value = Config::get('config.'.$key);
74 74
             }
75 75
 
76 76
 //FIXME: insert cache
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         return array_replace_recursive($config_settings, $db_settings);
102 102
     }
103 103
 
104
-    protected static function pathToArray($data, $prefix="")
104
+    protected static function pathToArray($data, $prefix = "")
105 105
     {
106 106
         $tree = array();
107 107
         foreach ($data as $key => $value) {
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
         return $tree;
121 121
     }
122 122
 
123
-    protected static function arrayToPath($array, $prefix="")
123
+    protected static function arrayToPath($array, $prefix = "")
124 124
     {
125 125
         return self::recursive_keys($array, $prefix);
126 126
     }
127 127
 
128
-    private static function recursive_keys(array $array, $prefix="", array $path = array())
128
+    private static function recursive_keys(array $array, $prefix = "", array $path = array())
129 129
     {
130 130
         if ($prefix != "") {
131
-            $prefix = trim($prefix, '.') . '.';
131
+            $prefix = trim($prefix, '.').'.';
132 132
         }
133 133
         $result = array();
134 134
         foreach ($array as $key => $val) {
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
138 138
             }
139 139
             else {
140
-                $result[$prefix . join('.', $currentPath)] = $val;
140
+                $result[$prefix.join('.', $currentPath)] = $val;
141 141
             }
142 142
         }
143 143
         return $result;
Please login to merge, or discard this patch.
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.