SherifElfadaly / Laravel-Api-Skeleton

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

Braces +1 added lines, -2 removed lines

@@ -170,8 +170,7 @@
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }

src/Modules/V1/Reporting/Repositories/ReportRepository.php

Braces +2 added lines, -4 removed lines

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

src/Modules/V1/Acl/Http/Controllers/UsersController.php

Braces +1 added lines, -2 removed lines

@@ -170,8 +170,7 @@
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }

Doc Comments +15 added lines, -15 removed lines

@@ -56,7 +56,7 @@ 
     /**
      * Return the logged in user account.
      * 
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function account()
     {
@@ -67,7 +67,7 @@ 
      * Block the user.
      *
      * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function block($id)
     {
@@ -78,7 +78,7 @@ 
      * Unblock the user.
      *
      * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function unblock($id)
     {
@@ -88,7 +88,7 @@ 
     /**
      * Logout the user.
      * 
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function logout()
     {
@@ -99,7 +99,7 @@ 
      * Handle a registration request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -116,7 +116,7 @@ 
      * Handle a login request to the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function login(Request $request)
     {
@@ -133,7 +133,7 @@ 
      * Handle a social login request of the none admin to the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function loginSocial(Request $request)
     {
@@ -150,7 +150,7 @@ 
      * Assign the given groups to the given user.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function assigngroups(Request $request)
     {
@@ -166,7 +166,7 @@ 
      * Send a reset link to the given user.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function sendreset(Request $request)
     {
@@ -179,7 +179,7 @@ 
      * Reset the given user's password.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function resetpassword(Request $request)
     {
@@ -197,7 +197,7 @@ 
      * Change the logged in user password.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function changePassword(Request $request)
     {
@@ -214,7 +214,7 @@ 
      * Refresh the expired login token.
      *
      * @param  string $refreshToken
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function refreshtoken($refreshToken)
     {
@@ -228,8 +228,8 @@ 
      * @param  string $groupName The name of the requested group.
      * @param  integer $perPage  Number of rows per page default 15.
      * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc     Sort ascending or descinding (1: desc, 0: asc).
+     * @return \Illuminate\Http\JsonResponse
      */
     public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
     {
@@ -240,7 +240,7 @@ 
      * Save the given data to the logged in user.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function saveProfile(Request $request) 
     {

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

Braces +3 added lines, -6 removed lines

@@ -156,8 +156,7 @@ 
                 if ($match[1] == '$this->validationRules')
                 {
                     $route['body'] = $validationRules;
-                }
-                else
+                } else
                 {
                     $route['body'] = eval('return ' . $match[1] . ';');
                 }
@@ -167,14 +166,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';
             }

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
      */

src/Modules/V1/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/V1/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
      */
@@ -197,7 +197,7 @@ 
     /**
      * Save the given model to the storage.
      * 
-     * @param  array   $data
+     * @param  string   $data
      * @return void
      */
     public function save(array $data)
@@ -442,7 +442,7 @@ 
      * Update record in the storage based on the given
      * condition.
      * 
-     * @param  var $value condition value
+     * @param  integer $value condition value
      * @param  array $data
      * @param  string $attribute condition column name
      * @return void
@@ -515,7 +515,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -547,7 +547,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/V1/Acl/Repositories/UserRepository.php

Braces +6 added lines, -12 removed lines

@@ -122,16 +122,13 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
         }
@@ -159,8 +156,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -198,12 +194,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/V1/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();
             }