SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Http/Requests/StoreUser.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         return [
             'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,' . $this->route('id'),
+            'email'    => 'required|email|unique:users,email,'.$this->route('id'),
             'password' => 'nullable|min:6'
         ];
     }

src/Modules/Users/Database/Seeds/UsersTableSeeder.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
          */
         Role::updateOrInsert([
             'name' => 'Admin',
-        ],[
+        ], [
             'created_at' => \DB::raw('NOW()'),
             'updated_at' => \DB::raw('NOW()')
         ]);
@@ -30,7 +30,7 @@ 
          */
         AclUser::updateOrInsert([
             'email' => 'admin@user.com',
-        ],[
+        ], [
             'name'       => 'Admin',
             'password'   => \Hash::make('123456'),
             'confirmed'  => 1,

src/Modules/Users/Services/UserService.php

Spacing +11 added lines, -11 removed lines

@@ -67,7 +67,7 @@ 
         $permissions = [];
         $user        = $this->repo->find(\Auth::id(), $relations);
         foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->repo][$permission->id] = $permission->name;
             });
         }
@@ -130,7 +130,7 @@ 
     public function assignRoles($userId, $roleIds)
     {
         $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
+        \DB::transaction(function() use ($userId, $roleIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachRoles($user);
             $this->repo->attachRoles($user, $roleIds);
@@ -148,11 +148,11 @@ 
      */
     public function login($email, $password)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::loginFailed();
         } elseif ($user->blocked) {
             \Errors::userIsBlocked();
-        } elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('user.disable_confirm_email') && ! $user->confirmed) {
             \Errors::emailNotConfirmed();
         }
 
@@ -171,11 +171,11 @@ 
         $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
 
-        if (! \Arr::has($user, 'email')) {
+        if ( ! \Arr::has($user, 'email')) {
             \Errors::noSocialEmail();
         }
 
-        if (! $this->repo->first(['email' => $user['email']])) {
+        if ( ! $this->repo->first(['email' => $user['email']])) {
             $this->register($user['name'], $user['email'], '', true);
         }
 
@@ -200,7 +200,7 @@ 
             'confirmed' => $skipConfirmEmail
         ]);
 
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -241,7 +241,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -265,7 +265,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -298,7 +298,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -313,7 +313,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }
 

src/Modules/Roles/Http/Requests/StoreRole.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function rules()
     {
         return [
-            'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
+            'name' => 'required|string|max:100|unique:roles,name,'.$this->route('id')
         ];
     }
 }

src/Modules/Roles/Services/RoleService.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function assignPermissions($roleId, $permissionIds)
     {
         $role = false;
-        \DB::transaction(function () use ($roleId, $permissionIds, &$role) {
+        \DB::transaction(function() use ($roleId, $permissionIds, &$role) {
             $role = $this->repo->find($roleId);
             $this->repo->detachPermissions($role);
             $this->repo->attachPermissions($role, $permissionIds);

src/Modules/OauthClients/Services/OauthClientService.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function revoke($clientId)
     {
-        \DB::transaction(function () use ($clientId) {
+        \DB::transaction(function() use ($clientId) {
             $client = $this->repo->find($clientId);
             $this->repo->revokeClientTokens($client);
             $this->repo->save(['id'=> $clientId, 'revoked' => true]);

src/Modules/Core/Core.php

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
     public function __call($name, $arguments)
     {
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
             $model = ucfirst(\Str::singular($name));
-            if(count($arguments) == 1 && $arguments[0]) {
-                $class = $nameSpace . '\\Services\\' . $model . 'Service';
+            if (count($arguments) == 1 && $arguments[0]) {
+                $class = $nameSpace.'\\Services\\'.$model.'Service';
             } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+                $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
             }
 
             if (class_exists($class)) {

src/Modules/Core/Traits/Translatable.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             return $values;
         }
 
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
             return $values ? (isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values) : '';
         }
 

src/Modules/Core/BaseClasses/BaseService.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
     {
         $translatable = $this->repo->model->translatable ?? [];
         $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . \Session::get('locale') : $sortBy;
+        $sortBy = in_array($sortBy, $translatable) ? $sortBy.'->'.\Session::get('locale') : $sortBy;
 
         if ($trashed) {
             return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
@@ -202,22 +202,22 @@ 
         $translatable = $this->repo->model->translatable ?? [];
         foreach ($conditions as $key => $value) {
             if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
-                $key = in_array($key, $translatable) ? $key . '->' . (\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
+                $key = in_array($key, $translatable) ? $key.'->'.(\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
                 if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && ! is_null($value)) {
                     $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
-                } elseif (! is_array($value) && strpos($key, '_id')) {
+                } elseif ( ! is_array($value) && strpos($key, '_id')) {
                     $filters[$key] = [
                         'op' => 'in',
                         'val' => explode(',', $value)
                     ];
                 } elseif (is_array($value)) {
                     $filters[$key] = $value;
-                } elseif($value) {
-                    $key = 'LOWER(' . $key . ')';
+                } elseif ($value) {
+                    $key = 'LOWER('.$key.')';
                     $value = strtolower($value);
                     $filters[$key] = [
                         'op' => 'like',
-                        'val' => '%' . $value . '%'
+                        'val' => '%'.$value.'%'
                     ];
                 }
             }