SherifElfadaly / Laravel-Api-Skeleton

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

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
         {
             $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
             return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
-        }
-        else
+        } else
         {
             $error = $this->errorHandler->loginFailed();
             abort($error['status'], $error['message']);

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Braces +7 added lines, -14 removed lines

@@ -213,8 +213,7 @@ 
                                     }
                                 }
                                 $relations[$relation][] = $relationModel;
-                            }
-                            else
+                            } else
                             {
                                 if (gettype($val) !== 'object' && gettype($val) !== 'array') 
                                 {
@@ -234,8 +233,7 @@ 
                             }
                         }
                     }
-                }
-                else if (array_search($key, $model->getFillable(), true) !== false)
+                } else if (array_search($key, $model->getFillable(), true) !== false)
                 {
                     $model->$key = $value;   
                 }
@@ -247,8 +245,7 @@ 
                 if ($value == 'delete' && $model->$key()->count())
                 {
                     $model->$key()->delete();
-                }
-                else if (gettype($value) == 'array') 
+                } else if (gettype($value) == 'array') 
                 {
                     $ids = [];
                     foreach ($value as $val) 
@@ -279,8 +276,7 @@ 
                             $model->$key()->attach($ids);
                             break;
                     }
-                }
-                else
+                } else
                 {
                     switch (class_basename($model->$key())) 
                     {
@@ -358,8 +354,7 @@ 
                 $model->delete();
                 $saveLog ? $this->logs->saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
             });
-    	}
-        else
+    	} else
         {
             \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -432,13 +427,11 @@ 
             {
                 $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else if ($key == 'or')
+            } else if ($key == 'or')
             {
                 $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else
+            } else
             {
                 $conditionString  .= $key . '=? {op} ';
                 $conditionValues[] = $value;

src/Exceptions/Handler.php

Braces +6 added lines, -12 removed lines

@@ -52,32 +52,26 @@
             {
                 $error = \ErrorHandler::dbQueryError();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \predis\connection\connectionexception) 
+            } else if ($e instanceof \predis\connection\connectionexception) 
             {
                 $error = \ErrorHandler::redisNotRunning();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
             {
                 $error = \ErrorHandler::tokenExpired();
                 return \Response::json($error['message'], $error['status']);
-            } 
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
             {
                 $error = \ErrorHandler::noPermissions();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
             {
                 $error = \ErrorHandler::unAuthorized();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof HttpException) 
+            } else if ($e instanceof HttpException) 
             {
                 return \Response::json($e->getMessage(), $e->getStatusCode());   
-            }
-            else
+            } else
             {
                 return parent::render($request, $e);
             }

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

Braces +2 added lines, -4 removed lines

@@ -190,8 +190,7 @@ 
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }
@@ -232,8 +231,7 @@ 
         {
             $error = $this->errorHandler->notFound('method');
             abort($error['status'], $error['message']);
-        }
-        else if ( ! in_array($permission, $this->skipLoginCheck)) 
+        } else if ( ! in_array($permission, $this->skipLoginCheck)) 
         {
             \JWTAuth::parseToken()->authenticate();
             if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))