SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +3 added lines, -4 removed lines

@@ -61,8 +61,8 @@ 
     /**
      * Check if the logged in user has the given group.
      * 
-     * @param  string  $groupName
-     * @param  integer $userId
+     * @param  integer $user
+     * @param string[] $groups
      * @return boolean
      */
     public function hasGroup($groups, $user = false)
@@ -244,7 +244,7 @@ 
      * Reset the given user's password.
      *
      * @param  array  $credentials
-     * @return array
+     * @return string|null
      */
     public function resetPassword($credentials)
     {
@@ -361,7 +361,6 @@ 
     /**
      * Save the given data to the logged in user.
      *
-     * @param  array $credentials
      * @return void
      */
     public function saveProfile($data) 

Braces +7 added lines, -14 removed lines

@@ -102,20 +102,16 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
+        } else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
+        } else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ( ! config('disable_confirm_email') && ! $user->confirmed)
+        } else if ( ! config('disable_confirm_email') && ! $user->confirmed)
         {
             \ErrorHandler::emailNotConfirmed();
         }
@@ -143,8 +139,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -187,12 +182,10 @@ 
         if ( ! $this->hasGroup(['Admin']))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
+        } else if (\Auth::id() == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -50,7 +50,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -164,7 +164,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -182,7 +182,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -198,7 +198,7 @@ 
      * Save the given model to the storage.
      * 
      * @param  array   $data
-     * @return object
+     * @return boolean
      */
     public function save(array $data)
     {
@@ -516,7 +516,7 @@ 
      * id.
      * 
      * @param  integer $id
-     * @param  array   $relations
+     * @param  string[]   $relations
      * @param  array   $columns
      * @return object
      */
@@ -532,7 +532,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -564,7 +564,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */

Braces +11 added lines, -22 removed lines

@@ -453,8 +453,7 @@ 
         {
             $model = $this->model->lockForUpdate()->find($value);
             $model ? $model->update($data) : 0;
-        }
-        else
+        } else
         {
             call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
                 $model->update($data);
@@ -483,8 +482,7 @@ 
                 
                 $model->delete();
             });
-        }
-        else
+        } else
         {
             \DB::transaction(function () use ($value, $attribute, &$result) {
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -605,14 +603,12 @@ 
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else if ($key == 'or')
+            } else if ($key == 'or')
             {
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else
+            } else
             {
                 if (is_array($value)) 
                 {
@@ -621,13 +617,11 @@ 
                     {
                         $value1 = $value['val1'];
                         $value2 = $value['val2'];
-                    }
-                    else
+                    } else
                     {
                         $value = array_key_exists('val', $value) ? $value['val'] : '';
                     }
-                }
-                else
+                } else
                 {
                     $operator = '=';
                 }
@@ -639,29 +633,24 @@ 
 
                     $conditionString  .= $key . ' <= ? {op} ';
                     $conditionValues[] = $value2;
-                }
-                elseif (strtolower($operator) == 'in') 
+                } elseif (strtolower($operator) == 'in') 
                 {
                     $conditionValues  = array_merge($conditionValues, $value);
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
                     $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
-                }
-                elseif (strtolower($operator) == 'null') 
+                } elseif (strtolower($operator) == 'null') 
                 {
                     $conditionString .= $key . ' is null {op} ';
-                }
-                elseif (strtolower($operator) == 'not null') 
+                } elseif (strtolower($operator) == 'not null') 
                 {
                     $conditionString .= $key . ' is not null {op} ';
-                }
-                elseif (strtolower($operator) == 'has') 
+                } elseif (strtolower($operator) == 'has') 
                 {
                     $sql              = $model->withTrashed()->has($key)->toSql();
                     $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
                     $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                }
-                else
+                } else
                 {
                     $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
                     $conditionValues[] = $value;

src/Modules/Core/Console/Commands/GenerateDoc.php

Doc Comments +2 added lines, -1 removed lines

@@ -123,6 +123,7 @@ 
      * 
      * @param  array  &$route
      * @param  object $reflectionMethod]
+     * @param \ReflectionMethod $reflectionMethod
      * @return void
      */
     protected function processDocBlock(&$route, $reflectionMethod)
@@ -145,7 +146,7 @@ 
      * Generate post body for the given route.
      * 
      * @param  array  &$route
-     * @param  object $reflectionMethod
+     * @param  \ReflectionMethod $reflectionMethod
      * @param  array  $validationRules
      * @return void
      */

Braces +3 added lines, -6 removed lines

@@ -162,8 +162,7 @@ 
                 if ($match[1] == '$this->validationRules')
                 {
                     $route['body'] = $validationRules;
-                }
-                else
+                } else
                 {
                     $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
                 }
@@ -173,14 +172,12 @@ 
                     if(strpos($rule, 'unique'))
                     {
                         $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-                    }
-                    elseif(strpos($rule, 'exists'))
+                    } elseif(strpos($rule, 'exists'))
                     {
                         $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
                     }
                 }
-            }
-            else
+            } else
             {
                 $route['body'] = 'conditions';
             }

src/Modules/Notifications/Notifications/ResetPassword.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

src/Modules/Notifications/Repositories/PushNotificationDeviceRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      * Register the given device to the logged in user.
      *
      * @param  string $data
-     * @return void
+     * @return boolean
      */
     public function registerDevice($data)
     {

src/Modules/Reporting/Repositories/ReportRepository.php

Braces +2 added lines, -4 removed lines

@@ -39,8 +39,7 @@ 
         if ( ! $report) 
         {
             \ErrorHandler::notFound('report');
-        }
-        else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+        } else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
         {
             \ErrorHandler::noPermissions();
         }
@@ -61,8 +60,7 @@ 
         if ($perPage) 
         {
             return $report->paginate($perPage);
-        }
-        else
+        } else
         {
             return $report->get();  
         }

src/Modules/Acl/AclUser.php

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
                 }
 
                 $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 $device->forceDelete();
             }

src/Modules/Core/Decorators/CachingDecorator.php

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->repo, $name], $arguments);
             });
-        }
-        else if ($this->cacheConfig)
+        } else if ($this->cacheConfig)
         {
             $this->cache->tags($this->cacheConfig)->flush();
             return call_user_func_array([$this->repo, $name], $arguments);
@@ -93,8 +92,7 @@ 
         if ($cacheConfig && in_array($name, $cacheConfig['cache']))
         {
             $this->cacheConfig = 'cache';
-        }
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+        } else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
         {
             $this->cacheConfig = $cacheConfig['clear'][$name];
         }

src/Modules/Core/Http/Controllers/BaseApiController.php

Braces +3 added lines, -6 removed lines

@@ -173,8 +173,7 @@ 
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }
@@ -252,10 +251,8 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-            {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
-            {}
-            else
+            {} elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+            {} else
             {
 
                 \ErrorHandler::noPermissions();