Completed
Push — develop ( 14b839...fedce8 )
by Tony
09:09 queued 02:52
created
app/Models/DbConfig.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * DbConfig.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * DbConfig.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Models;
26 26
 
27 27
 use Illuminate\Database\Eloquent\Model;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      */
65 65
     public function scopeKey(Builder $query, $key)
66 66
     {
67
-        return $query->where('config_name', 'LIKE', $key . '%');
67
+        return $query->where('config_name', 'LIKE', $key.'%');
68 68
     }
69 69
 
70 70
     /**
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
         if (!empty($value)) {
100 100
             try {
101 101
                 return unserialize($value);
102
-            } catch(\Exception $e) {
103
-                if(starts_with($e->getMessage(), 'unserialize():')) {
102
+            } catch (\Exception $e) {
103
+                if (starts_with($e->getMessage(), 'unserialize():')) {
104 104
                     return $value;
105 105
                 } else {
106 106
                     throw $e;
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,8 @@
 block discarded – undo
102 102
             } catch(\Exception $e) {
103 103
                 if(starts_with($e->getMessage(), 'unserialize():')) {
104 104
                     return $value;
105
-                } else {
105
+                }
106
+                else {
106 107
                     throw $e;
107 108
                 }
108 109
             }
Please login to merge, or discard this patch.
app/Settings.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * Settings.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * Settings.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Settings;
26 26
 
27 27
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -220,7 +220,7 @@
 block discarded – undo
220 220
      * Clear the settings cache.
221 221
      * If path is set, only clear the path and it's parents.
222 222
      *
223
-     * @param null $key The path to clear.
223
+     * @param string $key The path to clear.
224 224
      */
225 225
     public function flush($key = null)
226 226
     {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
                 if (!empty($key)) {
70 70
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
71 71
                         // check that we aren't trying to set an array onto an existing value only setting
72
-                        throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
72
+                        throw new \Exception("Attempting to set array value to existing non-array value at the key '".$key."'");
73 73
                     }
74 74
                     else {
75 75
                         // we are not at the leaf yet, add this chunk to the key and recurse
76
-                        $this->set($key . '.' . $k, $v);
76
+                        $this->set($key.'.'.$k, $v);
77 77
                     }
78 78
                 }
79 79
                 else {
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         else {
86 86
             // make sure we can save this
87 87
             if ($this->isReadOnly($key)) {
88
-                throw new \Exception("The setting '" . $key . "' is read only");
88
+                throw new \Exception("The setting '".$key."' is read only");
89 89
             }
90 90
 
91 91
             // flush the cache and save the value in db and cache
@@ -106,10 +106,10 @@  discard block
 block discarded – undo
106 106
     public function get($key, $default = null)
107 107
     {
108 108
         // return value from cache or fetch it and return it
109
-        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) {
109
+        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) {
110 110
             // fetch the value from config.php first
111
-            if (Config::has('config.' . $key)) {
112
-                $config_data = Config::get('config.' . $key, $default);
111
+            if (Config::has('config.'.$key)) {
112
+                $config_data = Config::get('config.'.$key, $default);
113 113
                 if (!is_array($config_data)) {
114 114
                     // return the value from config.php if it is a value
115 115
                     return $config_data;
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
      */
176 176
     public function has($key)
177 177
     {
178
-        return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.' . $key) || DbConfig::key($key)->exists());
178
+        return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.'.$key) || DbConfig::key($key)->exists());
179 179
     }
180 180
 
181 181
     /**
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
      */
187 187
     public function isReadOnly($key)
188 188
     {
189
-        return Config::has('config.' . $key);
189
+        return Config::has('config.'.$key);
190 190
     }
191 191
 
192 192
     /**
Please login to merge, or discard this patch.
app/Console/Commands/AddUser.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         // set username
50 50
         $user->username = $this->argument('username');
51 51
         if (User::where('username', $user->username)->exists()) {
52
-            $this->error('User ' . $user->username . ' exists.');
52
+            $this->error('User '.$user->username.' exists.');
53 53
             return;
54 54
         }
55 55
 
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 
89 89
         // save user
90 90
         if ($user->save()) {
91
-            $this->info('User ' . $user->username . ' created.');
91
+            $this->info('User '.$user->username.' created.');
92 92
         }
93 93
         else {
94
-            $this->error('Failed to create user ' . $user->username);
94
+            $this->error('Failed to create user '.$user->username);
95 95
         }
96 96
     }
97 97
 }
Please login to merge, or discard this patch.
app/Providers/SettingsServiceProvider.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * SettingsServiceProvider.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * SettingsServiceProvider.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 
26 26
 namespace App\Providers;
27 27
 
Please login to merge, or discard this patch.
app/Console/Commands/DeleteUser.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,18 +40,18 @@
 block discarded – undo
40 40
     public function handle()
41 41
     {
42 42
         $user = $this->argument('user');
43
-        $user_list = User::select('username')->where('username', 'like', '%'.$user.'%')->orWhere('realname','like', '%'.$user.'%')->get();
43
+        $user_list = User::select('username')->where('username', 'like', '%'.$user.'%')->orWhere('realname', 'like', '%'.$user.'%')->get();
44 44
         $names = [];
45 45
 
46
-        if (count($user_list) < 1 ) {
46
+        if (count($user_list) < 1) {
47 47
             $this->info('No user found.');
48 48
             return;
49 49
         }
50 50
         foreach ($user_list as $i) {
51
-            array_push($names,$i->username);
51
+            array_push($names, $i->username);
52 52
         }
53 53
         if (count($names) > 1) {
54
-            $name = $this->choice('Who would you like to remove?',$names, false);
54
+            $name = $this->choice('Who would you like to remove?', $names, false);
55 55
         }
56 56
         else {
57 57
             $name = $names[0];
Please login to merge, or discard this patch.
app/Http/Middleware/Authenticate.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
         if (Auth::guard($guard)->guest()) {
21 21
             if ($request->ajax() || $request->wantsJson()) {
22 22
                 return response('Unauthorized.', 401);
23
-            } else {
23
+            }
24
+            else {
24 25
                 return redirect()->guest('login');
25 26
             }
26 27
         }
Please login to merge, or discard this patch.