SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Reppsitories/UserRepository.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
         $permissions = [];
         $user        = $this->find(\Auth::id(), $relations);
         foreach ($user->roles()->get() as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -51,7 +51,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
         $permissions = [];
 
-        $user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+        $user->roles->pluck('permissions')->each(function($permission) use (&$permissions, $model) {
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
         });
 
@@ -80,7 +80,7 @@ 
      */
     public function assignRoles($userId, $roleIds)
     {
-        \DB::transaction(function () use ($userId, $roleIds) {
+        \DB::transaction(function() use ($userId, $roleIds) {
             $user = $this->find($userId);
             $user->roles()->detach();
             $user->roles()->attach($roleIds);
@@ -99,15 +99,15 @@ 
      */
     public function login($credentials, $adminLogin = false)
     {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
+        if ( ! $user = $this->first(['email' => $credentials['email']])) {
             \ErrorHandler::loginFailed();
         } elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
+        } elseif ( ! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
         } elseif ($user->blocked) {
             \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \ErrorHandler::emailNotConfirmed();
         }
 
@@ -127,11 +127,11 @@ 
         $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user         = \Socialite::driver($type)->userFromToken($access_token);
 
-        if (! $user->email) {
+        if ( ! $user->email) {
             \ErrorHandler::noSocialEmail();
         }
 
-        if (! $this->model->where('email', $user->email)->first()) {
+        if ( ! $this->model->where('email', $user->email)->first()) {
             $this->register(['email' => $user->email, 'password' => ''], true);
         }
 
@@ -153,7 +153,7 @@ 
         if ($skipConfirmEmail) {
             $user->confirmed = 1;
             $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
+        } elseif ( ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -168,10 +168,10 @@ 
      */
     public function block($userId)
     {
-        if (! $user = $this->find($userId)) {
+        if ( ! $user = $this->find($userId)) {
             \ErrorHandler::notFound('user');
         }
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         } elseif (\Auth::id() == $userId) {
             \ErrorHandler::noPermissions();
@@ -193,7 +193,7 @@ 
      */
     public function unblock($userId)
     {
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->model->where('email', $email)->first()) {
+        if ( ! $user = $this->model->where('email', $email)->first()) {
             \ErrorHandler::notFound('email');
         }
 
@@ -236,7 +236,7 @@ 
             'password'              => $password, 
             'password_confirmation' => $passwordConfirmation, 
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $user->password = $password;
             $user->save();
         });
@@ -272,7 +272,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \ErrorHandler::invalidOldPassword();
         }
 
@@ -288,7 +288,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) {
             \ErrorHandler::invalidConfirmationCode();
         }
 
@@ -333,7 +333,7 @@ 
         $sort       = $desc ? 'desc' : 'asc';
         $model      = $this->model->with($relations);
 
-        $model->whereHas('roles', function ($q) use ($roleName) {
+        $model->whereHas('roles', function($q) use ($roleName) {
             $q->where('name', $roleName);
         });
 

src/Modules/Users/Http/Controllers/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
      */
     public function changePassword(ChangePassword $request)
     {
-        return new GeneralResource($this->repo->changePassword($request->get('password') , $request->get('old_password')));
+        return new GeneralResource($this->repo->changePassword($request->get('password'), $request->get('old_password')));
     }
 
     /**