SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/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))

src/Modules/V1/Acl/Repositories/UserRepository.php

Braces +7 added lines, -14 removed lines

@@ -76,24 +76,19 @@ 
         if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
+        } else if ($token = \JWTAuth::attempt($credentials))
         {
             return $token;
-        }
-        else
+        } else
         {
             \ErrorHandler::loginFailed();
         }
@@ -135,12 +130,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+        } else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->lists('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->lists('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

src/Modules/V1/Core/AbstractRepositories/AbstractRepository.php

Braces +3 added lines, -6 removed lines

@@ -435,8 +435,7 @@ 
                 $model->delete();
                 $saveLog ? \Logging::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){
@@ -509,13 +508,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;