SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Errors/Errors.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
     public function __call(string $name, array $arguments): object
     {
         foreach (Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'];
-            $class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
+            $class = $nameSpace.'\\Errors\\'.$module['basename'].'Errors';
 
             if (class_exists($class)) {
                 $class = App::make($class);

src/Modules/Core/Core.php

Spacing +3 added lines, -3 removed lines

@@ -23,12 +23,12 @@
     public function __call(string $name, array $arguments): object
     {
         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';
+                $class = $nameSpace.'\\Services\\'.$model.'Service';
             } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+                $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
             }
 
             if (class_exists($class)) {

src/Modules/Core/Decorators/CachingDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         if ($this->cacheConfig && $this->cacheConfig == 'cache') {
             $page     = $this->request->get('page') !== null ? $this->request->get('page') : '1';
             $cacheKey = $name.$page.$this->session->get('locale').serialize($arguments);
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) {
+            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->service, $name], $arguments);
             });
         } elseif ($this->cacheConfig) {

src/Modules/Core/BaseClasses/BaseRepository.php

Spacing +27 added lines, -27 removed lines

@@ -120,7 +120,7 @@ 
         $model      = new Model();
         $relations  = [];
 
-        DB::transaction(function () use (&$model, &$relations, $data) {
+        DB::transaction(function() use (&$model, &$relations, $data) {
 
             $model     = $this->prepareModel($data);
             $relations = $this->prepareRelations($data, $model);
@@ -155,8 +155,8 @@ 
      */
     public function delete(string $value, string $attribute = 'id'): bool
     {
-        DB::transaction(function () use ($value, $attribute) {
-            $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function ($model) {
+        DB::transaction(function() use ($value, $attribute) {
+            $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function($model) {
                 $model->delete();
             });
         });
@@ -248,8 +248,8 @@ 
     {
         $model = $this->model->onlyTrashed()->find($id);
 
-        if (!$model) {
-            Errors::notFound(class_basename($this->model) . ' with id : ' . $id);
+        if ( ! $model) {
+            Errors::notFound(class_basename($this->model).' with id : '.$id);
         }
 
         $model->restore();
@@ -274,8 +274,8 @@ 
          * @var object
          */
         $model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-        if (!$model) {
-            Errors::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+        if ( ! $model) {
+            Errors::notFound(class_basename($modelClass).' with id : '.$data['id']);
         }
 
         /**
@@ -331,7 +331,7 @@ 
                      * If the relation has no value then marke the relation data
                      * related to the model to be deleted.
                      */
-                    if (!$value || !count($value)) {
+                    if ( ! $value || ! count($value)) {
                         $relations[$relation] = 'delete';
                     }
                 }
@@ -349,7 +349,7 @@ 
                          * Check if the relation is a collection.
                          */
                         if (class_basename($model->$relation) == 'Collection') {
-                            if (!is_array($val)) {
+                            if ( ! is_array($val)) {
                                 $relationModel = $relationBaseModel->lockForUpdate()->find($val);
                             } else {
                                 /**
@@ -362,8 +362,8 @@ 
                             /**
                              * If model doesn't exists.
                              */
-                            if (!$relationModel) {
-                                Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                            if ( ! $relationModel) {
+                                Errors::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                             }
 
                             if (is_array($val)) {
@@ -400,8 +400,8 @@ 
                                 /**
                                  * If model doesn't exists.
                                  */
-                                if (!$relationModel) {
-                                    Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                if ( ! $relationModel) {
+                                    Errors::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                 }
 
                                 foreach ($value as $relationAttribute => $relationValue) {
@@ -569,11 +569,11 @@ 
 
             if ($key == 'and') {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             } elseif ($key == 'or') {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             } else {
                 if (is_array($value)) {
@@ -589,38 +589,38 @@ 
                 }
 
                 if (strtolower($operator) == 'between') {
-                    $conditionString  .= $key . ' >= ? and ';
+                    $conditionString  .= $key.' >= ? and ';
                     $conditionValues[] = $value1;
 
-                    $conditionString  .= $key . ' <= ? {op} ';
+                    $conditionString  .= $key.' <= ? {op} ';
                     $conditionValues[] = $value2;
                 } elseif (strtolower($operator) == 'in') {
                     $conditionValues  = array_merge($conditionValues, $value);
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+                    $conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
                 } elseif (strtolower($operator) == 'null') {
-                    $conditionString .= $key . ' is null {op} ';
+                    $conditionString .= $key.' is null {op} ';
                 } elseif (strtolower($operator) == 'not null') {
-                    $conditionString .= $key . ' is not null {op} ';
+                    $conditionString .= $key.' is not null {op} ';
                 } elseif (strtolower($operator) == 'has') {
                     $sql              = $model->withTrashed()->withoutGlobalScopes()->has($key)->toSql();
                     $bindings         = $model->withTrashed()->withoutGlobalScopes()->has($key)->getBindings();
                     if ($value) {
                         $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ' and ' . $conditions['conditionString'] . ') {op} ';
+                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1).' and '.$conditions['conditionString'].') {op} ';
                         $conditionValues  = array_merge($conditionValues, $bindings);
                         $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
                     } else {
-                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ') {op} ';
+                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1).') {op} ';
                         $conditionValues  = array_merge($conditionValues, $bindings);
                     }
                 } else {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
                     $conditionValues[] = $value;
                 }
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 
@@ -636,10 +636,10 @@ 
         $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
         $path       = explode('->', $value);
         $field      = array_shift($path);
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
-            return '"' . $part . '"';
+        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function($part) {
+            return '"'.$part.'"';
         })->implode('.'));
 
-        return $removeLast === false ? $result : $result . ')';
+        return $removeLast === false ? $result : $result.')';
     }
 }

src/Modules/Core/BaseClasses/BaseService.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
     {
         $translatable = $this->repo->model->translatable ?? [];
         $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . $this->session->get('locale') : $sortBy;
+        $sortBy = in_array($sortBy, $translatable) ? $sortBy.'->'.$this->session->get('locale') : $sortBy;
 
         if ($trashed) {
             return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
@@ -217,18 +217,18 @@ 
                 /**
                  * Prepare key based on the the requested lang if it was translatable.
                  */
-                $key = in_array($key, $translatable) ? $key . '->' . ($this->session->get('locale') == 'all' ? 'en' : $this->session->get('locale')) : $key;
+                $key = in_array($key, $translatable) ? $key.'->'.($this->session->get('locale') == 'all' ? 'en' : $this->session->get('locale')) : $key;
 
                 /**
                  * Convert 0/1 or true/false to boolean in case of not foreign key.
                  */
-                if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && !is_null($value)) {
+                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);
 
                     /**
                      * Use in operator in case of foreign and comma seperated values.
                      */
-                } elseif (!is_array($value) && strpos($key, '_id') && $value) {
+                } elseif ( ! is_array($value) && strpos($key, '_id') && $value) {
                     $filters[$key] = [
                         'op' => 'in',
                         'val' => explode(',', $value)
@@ -252,11 +252,11 @@ 
                      * Default string filteration.
                      */
                 } elseif ($value) {
-                    $key = 'LOWER(' . $key . ')';
+                    $key = 'LOWER('.$key.')';
                     $value = strtolower($value);
                     $filters[$key] = [
                         'op' => 'like',
-                        'val' => '%' . $value . '%'
+                        'val' => '%'.$value.'%'
                     ];
                 }
             }

src/Modules/Users/Services/UserService.php

Spacing +11 added lines, -11 removed lines

@@ -70,7 +70,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;
             });
         }
@@ -133,7 +133,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);
@@ -151,11 +151,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();
         }
 
@@ -174,11 +174,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']]) && !$this->repo->deleted(['email' => $user['email']])->count()) {
+        if ( ! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->count()) {
             $this->register(Arr::get($user, 'name'), $user['email'], '', true);
         }
 
@@ -202,7 +202,7 @@ 
 
         $user = $this->repo->save($data);
 
-        if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -243,7 +243,7 @@ 
      */
     public function sendReset($email)
     {
-        if (!$user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -267,7 +267,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -300,7 +300,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (!\Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -315,7 +315,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }