Completed
Push — master ( ae7a17...a23113 )
by Sherif
14:07
created
src/Modules/Core/AbstractRepositories/AbstractRepository.php 1 patch
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      *
33 33
      * @param  array   $relations
34 34
      * @param  string  $sortBy
35
-     * @param  boolean $desc
35
+     * @param  integer $desc
36 36
      * @param  array   $columns
37 37
      * @return collection
38 38
      */
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      * @param  integer $perPage
51 51
      * @param  array   $relations
52 52
      * @param  string  $sortBy
53
-     * @param  boolean $desc
53
+     * @param  integer $desc
54 54
      * @param  array   $columns
55 55
      * @return collection
56 56
      */
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      * @param  integer $perPage
165 165
      * @param  array   $relations
166 166
      * @param  string  $sortBy
167
-     * @param  boolean $desc
167
+     * @param  integer $desc
168 168
      * @param  array   $columns
169 169
      * @return collection
170 170
      */
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      * @param  integer $perPage
183 183
      * @param  array   $relations
184 184
      * @param  string  $sortBy
185
-     * @param  boolean $desc
185
+     * @param  integer $desc
186 186
      * @param  array   $columns
187 187
      * @return collection
188 188
      */
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * Save the given model to the storage.
199 199
      * 
200 200
      * @param  array   $data
201
-     * @return object
201
+     * @return boolean
202 202
      */
203 203
     public function save(array $data)
204 204
     {
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
      * @param  array   $conditions array of conditions
534 534
      * @param  array   $relations
535 535
      * @param  string  $sortBy
536
-     * @param  boolean $desc
536
+     * @param  integer $desc
537 537
      * @param  array   $columns
538 538
      * @return collection
539 539
      */
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
      * @param  array   $conditions array of conditions
566 566
      * @param  integer $perPage
567 567
      * @param  string  $sortBy
568
-     * @param  boolean $desc
568
+     * @param  integer $desc
569 569
      * @param  array   $columns
570 570
      * @return collection
571 571
      */
Please login to merge, or discard this patch.
src/Modules/Acl/Repositories/UserRepository.php 1 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('skeleton.disable_confirm_email') && ! $user->confirmed)
114
+        } else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
119 115
         {
120 116
             \ErrorHandler::emailNotConfirmed();
121 117
         }
@@ -165,8 +161,7 @@  discard block
 block discarded – undo
165 161
         {
166 162
             $user->confirmed = 1;
167 163
             $user->save();
168
-        }
169
-        else if ( ! config('skeleton.disable_confirm_email'))  
164
+        } else if ( ! config('skeleton.disable_confirm_email'))  
170 165
         {
171 166
             $this->sendConfirmationEmail($user->email);
172 167
         }
@@ -189,12 +184,10 @@  discard block
 block discarded – undo
189 184
         if ( ! $this->hasGroup(['Admin']))
190 185
         {
191 186
             \ErrorHandler::noPermissions();
192
-        }
193
-        else if (\Auth::id() == $userId)
187
+        } else if (\Auth::id() == $userId)
194 188
         {
195 189
             \ErrorHandler::noPermissions();
196
-        }
197
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
190
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
198 191
         {
199 192
             \ErrorHandler::noPermissions();
200 193
         }
Please login to merge, or discard this patch.