SherifElfadaly / Laravel-Api-Skeleton

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

Doc Comments +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
     /**
      * Return the logged in user account.
      * 
-     * @return object
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getAccount()
     {
@@ -52,7 +52,7 @@ 
     /**
      * Logout the user.
      * 
-     * @return void
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getLogout()
     {
@@ -63,7 +63,7 @@ 
      * Handle a registration request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function postRegister(Request $request)
     {
@@ -76,7 +76,7 @@ 
      * Handle a login request to the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postLogin(Request $request)
     {
@@ -96,7 +96,7 @@ 
      * Handle an assign groups to user request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function postAssigngroups(Request $request)
     {

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))