SherifElfadaly / Laravel-Api-Skeleton

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

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  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function refreshtoken(Request $request)
     {
@@ -232,8 +232,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)
     {
@@ -244,7 +244,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

@@ -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/V1/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();