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/Acl/AclUser.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     use SoftDeletes, HasApiTokens;
     protected $table    = 'users';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
+    protected $hidden   = ['password', 'remember_token', 'deleted_at', 'two_factor_code'];
     protected $guarded  = ['id'];
     protected $fillable = ['name', 'email', 'password'];
     public $searchable  = ['name', 'email'];
@@ -43,7 +43,7 @@ 
 
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function receivesBroadcastNotificationsOn()
     {
-        return 'users.' . $this->id;
+        return 'users.'.$this->id;
     }
     
     public static function boot()

src/Modules/V1/Acl/Database/Seeds/AssignRelationsSeeder.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
 		 * Assign the permissions to the admin group.
 		 */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function ($permission) use ($adminGroupId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function($permission) use ($adminGroupId) {
         	\DB::table('groups_permissions')->insert(
 				[
 				'permission_id' => $permission->id,

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

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
                 $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
 
                 preg_match('/api\/v1\/([^#]+)\//iU', $route['uri'], $module);
-                $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/v1/' . $module[1] . '/') - 1)][] = $route;
+                $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/v1/'.$module[1].'/') - 1)][] = $route;
 
                 $this->getModels($classProperties['model'], $docData);
             }
@@ -79,7 +79,7 @@ 
      */
     protected function getRoutes()
     {
-        return collect(\Route::getRoutes())->map(function ($route) {
+        return collect(\Route::getRoutes())->map(function($route) {
             if (strpos($route->uri(), 'api/v') !== false) 
             {
                 return [
@@ -111,7 +111,7 @@ 
         ];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
+        if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
         {
             $route['headers']['Authrization'] = 'Bearer {token}';
         }
@@ -165,16 +165,16 @@ 
                 }
                 else
                 {
-                    $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
+                    $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';');
                 }
 
                 foreach ($route['body'] as &$rule) 
                 {
-                    if(strpos($rule, 'unique'))
+                    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);
                     }
@@ -247,10 +247,10 @@ 
             $model      = factory($modelClass)->make();
             $modelArr   = $model->toArray();
 
-            if ( $model->trans && ! $model->trans->count()) 
+            if ($model->trans && ! $model->trans->count()) 
             {
                 $modelArr['trans'] = [
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
+                    'en' => factory($modelClass.'Translation')->make()->toArray()
                 ];
             }
 

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

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
         $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
         $this->repo                = call_user_func_array("\Core::{$this->model}", []);
-        $route                     = explode('@',\Route::currentRouteAction())[1];
+        $route                     = explode('@', \Route::currentRouteAction())[1];
 
         $this->checkPermission($route);
         $this->setRelations($route);
@@ -253,7 +253,7 @@ 
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
             {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+            elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
             {}
             else
             {