Completed
Push — master ( 6ad044...8a4f85 )
by Sherif
03:22
created
src/Modules/Acl/Repositories/UserRepository.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $user        = \Core::users()->find(\Auth::id(), $relations);
29 29
         foreach ($user->groups()->get() as $group)
30 30
         {
31
-            $group->permissions->each(function ($permission) use (&$permissions){
31
+            $group->permissions->each(function($permission) use (&$permissions){
32 32
                 $permissions[$permission->model][$permission->id] = $permission->name;
33 33
             });
34 34
         }
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
52 52
         $permissions = [];
53 53
 
54
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
54
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
55 55
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
56 56
         });
57 57
         
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      */
82 82
     public function assignGroups($user_id, $group_ids)
83 83
     {
84
-        \DB::transaction(function () use ($user_id, $group_ids) {
84
+        \DB::transaction(function() use ($user_id, $group_ids) {
85 85
             $user = $this->find($user_id);
86 86
             $user->groups()->detach();
87 87
             $user->groups()->attach($group_ids);
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      */
249 249
     public function resetPassword($credentials)
250 250
     {
251
-        $response = \Password::reset($credentials, function ($user, $password) {
251
+        $response = \Password::reset($credentials, function($user, $password) {
252 252
             $user->password = $password;
253 253
             $user->save();
254 254
         });
Please login to merge, or discard this patch.
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -102,20 +102,16 @@  discard block
 block discarded – undo
102 102
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
103 103
         {
104 104
             \ErrorHandler::loginFailed();
105
-        }
106
-        else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
105
+        } else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
107 106
         {
108 107
             \ErrorHandler::loginFailed();
109
-        }
110
-        else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
108
+        } else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
111 109
         {
112 110
             \ErrorHandler::loginFailed();
113
-        }
114
-        else if ($user->blocked)
111
+        } else if ($user->blocked)
115 112
         {
116 113
             \ErrorHandler::userIsBlocked();
117
-        }
118
-        else if ( ! config('disable_confirm_email') && ! $user->confirmed)
114
+        } else if ( ! config('disable_confirm_email') && ! $user->confirmed)
119 115
         {
120 116
             \ErrorHandler::emailNotConfirmed();
121 117
         }
@@ -143,8 +139,7 @@  discard block
 block discarded – undo
143 139
         {
144 140
             $data = ['email' => $user->email, 'password' => ''];
145 141
             return $this->register($data);
146
-        }
147
-        else
142
+        } else
148 143
         {
149 144
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
150 145
             {
@@ -187,12 +182,10 @@  discard block
 block discarded – undo
187 182
         if ( ! $this->hasGroup(['Admin']))
188 183
         {
189 184
             \ErrorHandler::noPermissions();
190
-        }
191
-        else if (\Auth::id() == $user_id)
185
+        } else if (\Auth::id() == $user_id)
192 186
         {
193 187
             \ErrorHandler::noPermissions();
194
-        }
195
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
188
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
196 189
         {
197 190
             \ErrorHandler::noPermissions();
198 191
         }
Please login to merge, or discard this patch.
src/Modules/Notifications/Notifications/ResetPassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,6 +47,6 @@
 block discarded – undo
47 47
             ->subject('Reset passowrd')
48 48
             ->line('Reset passowrd')
49 49
             ->line('To reset your password click on the button below')
50
-            ->action('Reset password', config('reset_password_url') . '/' . $this->token);
50
+            ->action('Reset password', config('reset_password_url').'/'.$this->token);
51 51
     }
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Notifications/Notifications/ConfirmEmail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,6 +45,6 @@
 block discarded – undo
45 45
             ->subject('Email verification')
46 46
             ->line('Email verification')
47 47
             ->line('To validate your email click on the button below')
48
-            ->action('Verify your email', config('confrim_email_url') . '/' . $notifiable->confirmation_code));
48
+            ->action('Verify your email', config('confrim_email_url').'/'.$notifiable->confirmation_code));
49 49
     }
50 50
 }
51 51
\ No newline at end of file
Please login to merge, or discard this patch.
files/AuthServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
     {
27 27
         $this->registerPolicies();
28 28
 
29
-        Passport::routes(function ($router) {
29
+        Passport::routes(function($router) {
30 30
             $router->forAuthorization();
31 31
             $router->forAccessTokens();
32 32
             $router->forPersonalAccessTokens();
Please login to merge, or discard this patch.
files/Handler.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -57,29 +57,23 @@
 block discarded – undo
57 57
             if ($exception instanceof \Illuminate\Database\QueryException) 
58 58
             {
59 59
                 \ErrorHandler::dbQueryError();
60
-            }
61
-            else if ($exception instanceof \predis\connection\connectionexception) 
60
+            } else if ($exception instanceof \predis\connection\connectionexception) 
62 61
             {
63 62
                 \ErrorHandler::redisNotRunning();
64
-            }
65
-            else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
63
+            } else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
66 64
             {
67 65
                 \ErrorHandler::connectionError();
68
-            }
69
-            else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
66
+            } else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
70 67
             {
71 68
                 return \Response::json($exception->getMessage(), $exception->getStatusCode());   
72
-            }
73
-            else if ($exception instanceof \Illuminate\Validation\ValidationException) 
69
+            } else if ($exception instanceof \Illuminate\Validation\ValidationException) 
74 70
             {
75 71
                 return \Response::json($exception->errors(), 422);   
76
-            }
77
-            else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
72
+            } else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
78 73
             {
79 74
                 return parent::render($request, $exception);
80 75
             }
81
-        }
82
-        else
76
+        } else
83 77
         {
84 78
             return parent::render($request, $exception);
85 79
         }
Please login to merge, or discard this patch.