SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/BaseClasses/Contracts/BaseServiceInterface.php

Indentation +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
    * @param   bool   $trashed
    * @return LengthAwarePaginator
    */
-    public function list(array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator;
+	public function list(array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator;
 
   /**
    * Fetch all records with relations from the storage.
@@ -30,7 +30,7 @@ 
    * @param  array   $columns
    * @return collection
    */
-    public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
+	public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
 
   /**
    * Fetch all records with relations from storage in pages.
@@ -42,7 +42,7 @@ 
    * @param  array   $columns
    * @return LengthAwarePaginator
    */
-    public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Fetch all records with relations based on
@@ -56,7 +56,7 @@ 
    * @param  array   $columns
    * @return collection
    */
-    public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Save the given model/models to the storage.
@@ -64,7 +64,7 @@ 
    * @param  array   $data
    * @return Model
    */
-    public function save(array $data): Model;
+	public function save(array $data): Model;
 
   /**
    * Delete record from the storage based on the given
@@ -74,7 +74,7 @@ 
    * @param  string $attribute condition column name
    * @return bool
    */
-    public function delete(string $value, string $attribute = 'id'): bool;
+	public function delete(string $value, string $attribute = 'id'): bool;
 
   /**
    * Fetch records from the storage based on the given
@@ -85,7 +85,7 @@ 
    * @param  array $columns
    * @return object
    */
-    public function find(int $id, array $relations = [], array $columns = ['*']): Model;
+	public function find(int $id, array $relations = [], array $columns = ['*']): Model;
 
   /**
    * Fetch records from the storage based on the given
@@ -98,7 +98,7 @@ 
    * @param  array   $columns
    * @return collection
    */
-    public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
+	public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
 
   /**
    * Fetch the first record fro the storage based on the given
@@ -109,7 +109,7 @@ 
    * @param  array $columns
    * @return Model
    */
-    public function first(array $conditions, array $relations = [], array $columns = ['*']): Model;
+	public function first(array $conditions, array $relations = [], array $columns = ['*']): Model;
 
   /**
    * Return the deleted models in pages based on the given conditions.
@@ -121,7 +121,7 @@ 
    * @param  array  $columns
    * @return LengthAwarePaginator
    */
-    public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Restore the deleted model.
@@ -129,5 +129,5 @@ 
    * @param  int $id
    * @return bool
    */
-    public function restore(int $id): bool;
+	public function restore(int $id): bool;
 }

src/Modules/Core/BaseClasses/Contracts/BaseRepositoryInterface.php

Indentation +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
    * @param  array  $columns
    * @return collection
    */
-    public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
+	public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
 
   /**
    * Fetch all records with relations from storage in pages.
@@ -29,7 +29,7 @@ 
    * @param  array  $columns
    * @return LengthAwarePaginator
    */
-    public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Fetch all records with relations based on
@@ -43,7 +43,7 @@ 
    * @param  array   $columns
    * @return collection
    */
-    public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Count all records based on the given condition from storage.
@@ -51,7 +51,7 @@ 
    * @param  array $conditions array of conditions
    * @return int
    */
-    public function count(array $conditions = []): int;
+	public function count(array $conditions = []): int;
 
   /**
    * Pluck column based on the given condition from storage.
@@ -60,7 +60,7 @@ 
    * @param  string $column
    * @return collection
    */
-    public function pluck(array $conditions, string $column): Collection;
+	public function pluck(array $conditions, string $column): Collection;
 
   /**
    * Save the given model to the storage.
@@ -68,7 +68,7 @@ 
    * @param  array $data
    * @return Model
    */
-    public function save(array $data): Model;
+	public function save(array $data): Model;
 
   /**
    * Insert the given model/models to the storage.
@@ -76,7 +76,7 @@ 
    * @param  array $data
    * @return bool
    */
-    public function insert(array $data): bool;
+	public function insert(array $data): bool;
 
   /**
    * Delete record from the storage based on the given
@@ -86,7 +86,7 @@ 
    * @param  string $attribute condition column name
    * @return bool
    */
-    public function delete(string $value, string $attribute = 'id'): bool;
+	public function delete(string $value, string $attribute = 'id'): bool;
 
   /**
    * Fetch records from the storage based on the given
@@ -97,7 +97,7 @@ 
    * @param  array $columns
    * @return Model
    */
-    public function find(int $id, array $relations = [], array $columns = ['*']): Model;
+	public function find(int $id, array $relations = [], array $columns = ['*']): Model;
 
   /**
    * Fetch records from the storage based on the given
@@ -110,7 +110,7 @@ 
    * @param  array   $columns
    * @return collection
    */
-    public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
+	public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection;
 
   /**
    * Fetch the first record fro the storage based on the given
@@ -121,7 +121,7 @@ 
    * @param  array $columns
    * @return Model
    */
-    public function first(array $conditions, array $relations = [], array $columns = ['*']): Model;
+	public function first(array $conditions, array $relations = [], array $columns = ['*']): Model;
 
   /**
    * Return the deleted models in pages based on the given conditions.
@@ -133,7 +133,7 @@ 
    * @param  array  $columns
    * @return LengthAwarePaginator
    */
-    public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
+	public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator;
 
   /**
    * Restore the deleted model.
@@ -141,5 +141,5 @@ 
    * @param  int $id
    * @return bool
    */
-    public function restore(int $id): bool;
+	public function restore(int $id): bool;
 }

src/Modules/Core/BaseClasses/BaseRepository.php

Indentation +628 added lines, -628 removed lines

@@ -14,632 +14,632 @@
 
 abstract class BaseRepository implements BaseRepositoryInterface
 {
-    /**
-     * @var Model
-     */
-    public $model;
-
-    /**
-     * Init new object.
-     *
-     * @param   Model$model
-     * @return  void
-     */
-    public function __construct(Model $model)
-    {
-        $this->model = $model;
-    }
-
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array  $relations
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return $this->model->with($relations)->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  int    $perPage
-     * @param  array  $relations
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return $this->model->with($relations)->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  int    $perPage
-     * @param  array  $relations
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
-
-    /**
-     * Count all records based on the given condition from storage.
-     *
-     * @param  array $conditions array of conditions
-     * @return int
-     */
-    public function count(array $conditions = []): int
-    {
-        if ($conditions) {
-            $conditions = $this->constructConditions($conditions, $this->model);
-            return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->count();
-        }
-
-        return $this->model->count();
-    }
-
-    /**
-     * Pluck column based on the given condition from storage.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  string $column
-     * @return collection
-     */
-    public function pluck(array $conditions, string $column): Collection
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->pluck($column);
-    }
-
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return Model
-     */
-    public function save(array $data): Model
-    {
-        $model      = new Model();
-        $relations  = [];
-
-        DB::transaction(function () use (&$model, &$relations, $data) {
-
-            $model     = $this->prepareModel($data);
-            $relations = $this->prepareRelations($data, $model);
-            $model     = $this->saveModel($model, $relations);
-        });
-
-        if (count($relations)) {
-            $model->load(...array_keys($relations));
-        }
-
-        return $model;
-    }
-
-    /**
-     * Insert the given model/models to the storage.
-     *
-     * @param  array $data
-     * @return bool
-     */
-    public function insert(array $data): bool
-    {
-        return $this->model->insert($data);
-    }
-
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  string $value condition value
-     * @param  string $attribute condition column name
-     * @return bool
-     */
-    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) {
-                $model->delete();
-            });
-        });
-
-        return true;
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  int   $id
-     * @param  array $relations
-     * @param  array $columns
-     * @return Model
-     */
-    public function find(int $id, array $relations = [], array $columns = ['*']): Model
-    {
-        return $this->model->with($relations)->find($id, $columns);
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  bool    $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array $conditions array of conditions
-     * @param  array $relations
-     * @param  array $columns
-     * @return Model
-     */
-    public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  int    $perPage
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return LengthAwarePaginator
-     */
-    public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        unset($conditions['page']);
-        unset($conditions['perPage']);
-        unset($conditions['sortBy']);
-        unset($conditions['sort']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->onlyTrashed();
-
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  int $id
-     * @return bool
-     */
-    public function restore(int $id): bool
-    {
-        $model = $this->model->onlyTrashed()->find($id);
-
-        if (!$model) {
-            Errors::notFound(class_basename($this->model) . ' with id : ' . $id);
-        }
-
-        $model->restore();
-
-        return true;
-    }
-
-    /**
-     * Fill the model with the given data.
-     *
-     * @param   array  $data
-     * @return  Model
-     */
-    protected function prepareModel(array $data): Model
-    {
-        $modelClass = $this->model;
-
-        /**
-         * If the id is present in the data then select the model for updating,
-         * else create new model.
-         *
-         * @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']);
-        }
-
-        /**
-         * Construct the model object with the given data,
-         * and if there is a relation add it to relations array,
-         * then save the model.
-         */
-        foreach ($data as $key => $value) {
-            if (array_search($key, $model->getFillable(), true) !== false) {
-                /**
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
-                 */
-                $model->$key = $value;
-            }
-        }
-
-        return $model;
-    }
-
-    /**
-     * Prepare related models based on the given data for the given model.
-     *
-     * @param   array $data
-     * @param   Model $model
-     *
-     * @return  array
-     */
-    protected function prepareRelations(array $data, Model $model): array
-    {
-        /**
-         * Init the relation array
-         *
-         * @var array
-         */
-        $relations = [];
-
-        /**
-         * Construct the model object with the given data,
-         * and if there is a relation add it to relations array,
-         * then save the model.
-         */
-        foreach ($data as $key => $value) {
-            /**
-             * If the attribute is a relation.
-             */
-            $relation = Str::camel($key);
-            if (method_exists($model, $relation) && Core::$relation()) {
-                /**
-                 * Check if the relation is a collection.
-                 */
-                if (class_basename($model->$relation) == 'Collection') {
-                    /**
-                     * If the relation has no value then marke the relation data
-                     * related to the model to be deleted.
-                     */
-                    if (!$value || !count($value)) {
-                        $relations[$relation] = 'delete';
-                    }
-                }
-                if (is_array($value)) {
-                    /**
-                     * Loop through the relation data.
-                     */
-                    foreach ($value as $attr => $val) {
-                        /**
-                         * Get the relation model.
-                         */
-                        $relationBaseModel = Core::$relation()->model;
-
-                        /**
-                         * Check if the relation is a collection.
-                         */
-                        if (class_basename($model->$relation) == 'Collection') {
-                            if (!is_array($val)) {
-                                $relationModel = $relationBaseModel->lockForUpdate()->find($val);
-                            } else {
-                                /**
-                                 * If the id is present in the data then select the relation model for updating,
-                                 * else create new model.
-                                 */
-                                $relationModel = Arr::has($val, 'id') ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-                            }
-
-                            /**
-                             * If model doesn't exists.
-                             */
-                            if (!$relationModel) {
-                                Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
-                            }
-
-                            if (is_array($val)) {
-                                /**
-                                 * Loop through the relation attributes.
-                                 */
-                                foreach ($val as $attr => $val) {
-                                    /**
-                                     * Prevent the sub relations or attributes not in the fillable.
-                                     */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false && class_basename($model->$key()) !== 'BelongsToMany') {
-                                        $relationModel->$attr = $val;
-                                    } elseif (gettype($val) !== 'object' && gettype($val) !== 'array' && $attr !== 'id') {
-                                        $extra[$attr] = $val;
-                                    }
-                                }
-                            }
-
-                            if (isset($extra)) {
-                                $relationModel->extra = $extra;
-                            }
-                            $relations[$relation][] = $relationModel;
-                        } else {
-                            /**
-                             * Prevent the sub relations.
-                             */
-                            if (gettype($val) !== 'object' && gettype($val) !== 'array') {
-                                /**
-                                 * If the id is present in the data then select the relation model for updating,
-                                 * else create new model.
-                                 */
-                                $relationModel = Arr::has($value, 'id') ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-
-                                /**
-                                 * If model doesn't exists.
-                                 */
-                                if (!$relationModel) {
-                                    Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
-                                }
-
-                                foreach ($value as $relationAttribute => $relationValue) {
-                                    /**
-                                     * Prevent attributes not in the fillable.
-                                     */
-                                    if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) {
-                                        $relationModel->$relationAttribute = $relationValue;
-                                    }
-                                }
-
-                                $relations[$relation] = $relationModel;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return $relations;
-    }
-
-    /**
-     * Save the model with related models.
-     *
-     * @param   Model $model
-     * @param   array $relations
-     *
-     * @return  Model
-     */
-    protected function saveModel(Model $model, array $relations): Model
-    {
-
-        /**
-         * Loop through the relations array.
-         */
-        foreach ($relations as $key => $value) {
-            /**
-             * If the relation is marked for delete then delete it.
-             */
-            if ($value == 'delete' && $model->$key()->count()) {
-                switch (class_basename($model->$key())) {
-                        /**
-                     * If the relation is one to many then delete all
-                     * relations who's id isn't in the ids array.
-                     */
-                    case 'HasMany':
-                        $model->$key()->delete();
-                        break;
-
-                        /**
-                         * If the relation is many to many then
-                         * detach the previous data and attach
-                         * the ids array to the model.
-                         */
-                    case 'BelongsToMany':
-                        $model->$key()->detach();
-                        break;
-                }
-            } elseif (gettype($value) == 'array') {
-                /**
-                 * Save the model.
-                 */
-                $model->save();
-                $ids = [];
-
-                /**
-                 * Loop through the relations.
-                 */
-                foreach ($value as $val) {
-                    switch (class_basename($model->$key())) {
-                            /**
-                         * If the relation is one to many then update it's foreign key with
-                         * the model id and save it then add its id to ids array to delete all
-                         * relations who's id isn't in the ids array.
-                         */
-                        case 'HasMany':
-                            $foreignKeyName       = $model->$key()->getForeignKeyName();
-                            $val->$foreignKeyName = $model->id;
-                            $val->save();
-                            $ids[] = $val->id;
-                            break;
-
-                            /**
-                             * If the relation is many to many then add it's id to the ids array to
-                             * attache these ids to the model.
-                             */
-                        case 'BelongsToMany':
-                        case 'MorphToMany':
-                            $extra = $val->extra;
-                            unset($val->extra);
-                            $val->save();
-                            $ids[$val->id] = $extra ?? [];
-                            break;
-                    }
-                }
-                switch (class_basename($model->$key())) {
-                        /**
-                     * If the relation is one to many then delete all
-                     * relations who's id isn't in the ids array.
-                     */
-                    case 'HasMany':
-                        $model->$key()->whereNotIn('id', $ids)->delete();
-                        break;
-
-                        /**
-                         * If the relation is many to many then
-                         * detach the previous data and attach
-                         * the ids array to the model.
-                         */
-                    case 'BelongsToMany':
-                    case 'MorphToMany':
-                        $model->$key()->detach();
-                        $model->$key()->attach($ids);
-                        break;
-                }
-            } else {
-                switch (class_basename($model->$key())) {
-                        /**
-                     * If the relation is one to one.
-                     */
-                    case 'HasOne':
-                        /**
-                         * Save the model.
-                         */
-                        $model->save();
-                        $foreignKeyName         = $model->$key()->getForeignKeyName();
-                        $value->$foreignKeyName = $model->id;
-                        $value->save();
-                        break;
-                    case 'BelongsTo':
-                        /**
-                         * Save the model.
-                         */
-                        $value->save();
-                        $model->$key()->associate($value);
-                        break;
-                }
-            }
-        }
-
-        /**
-         * Save the model.
-         */
-        $model->save();
-
-        return $model;
-    }
-
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     *
-     * @param  array $conditions
-     * @param  Model $model
-     * @return array
-     */
-    protected function constructConditions(array $conditions, Model $model): array
-    {
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) {
-            if (Str::contains($key, '->')) {
-                $key = $this->wrapJsonSelector($key);
-            }
-
-            if ($key == 'and') {
-                $conditions       = $this->constructConditions($value, $model);
-                $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} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            } else {
-                if (is_array($value)) {
-                    $operator = $value['op'];
-                    if (strtolower($operator) == 'between') {
-                        $value1 = $value['val1'];
-                        $value2 = $value['val2'];
-                    } else {
-                        $value = Arr::get($value, 'val', '');
-                    }
-                } else {
-                    $operator = '=';
-                }
-
-                if (strtolower($operator) == 'between') {
-                    $conditionString  .= $key . ' >= ? and ';
-                    $conditionValues[] = $value1;
-
-                    $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} ';
-                } elseif (strtolower($operator) == 'null') {
-                    $conditionString .= $key . ' is null {op} ';
-                } elseif (strtolower($operator) == 'not null') {
-                    $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} ';
-                        $conditionValues  = array_merge($conditionValues, $bindings);
-                        $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                    } else {
-                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ') {op} ';
-                        $conditionValues  = array_merge($conditionValues, $bindings);
-                    }
-                } else {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
-                    $conditionValues[] = $value;
-                }
-            }
-        }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
-    }
-
-    /**
-     * Wrap the given JSON selector.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function wrapJsonSelector(string $value): string
-    {
-        $removeLast = strpos($value, ')');
-        $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 . '"';
-        })->implode('.'));
-
-        return $removeLast === false ? $result : $result . ')';
-    }
+	/**
+	 * @var Model
+	 */
+	public $model;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   Model$model
+	 * @return  void
+	 */
+	public function __construct(Model $model)
+	{
+		$this->model = $model;
+	}
+
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array  $relations
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return $this->model->with($relations)->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  int    $perPage
+	 * @param  array  $relations
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return $this->model->with($relations)->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  int    $perPage
+	 * @param  array  $relations
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Count all records based on the given condition from storage.
+	 *
+	 * @param  array $conditions array of conditions
+	 * @return int
+	 */
+	public function count(array $conditions = []): int
+	{
+		if ($conditions) {
+			$conditions = $this->constructConditions($conditions, $this->model);
+			return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->count();
+		}
+
+		return $this->model->count();
+	}
+
+	/**
+	 * Pluck column based on the given condition from storage.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  string $column
+	 * @return collection
+	 */
+	public function pluck(array $conditions, string $column): Collection
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->pluck($column);
+	}
+
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return Model
+	 */
+	public function save(array $data): Model
+	{
+		$model      = new Model();
+		$relations  = [];
+
+		DB::transaction(function () use (&$model, &$relations, $data) {
+
+			$model     = $this->prepareModel($data);
+			$relations = $this->prepareRelations($data, $model);
+			$model     = $this->saveModel($model, $relations);
+		});
+
+		if (count($relations)) {
+			$model->load(...array_keys($relations));
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Insert the given model/models to the storage.
+	 *
+	 * @param  array $data
+	 * @return bool
+	 */
+	public function insert(array $data): bool
+	{
+		return $this->model->insert($data);
+	}
+
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  string $value condition value
+	 * @param  string $attribute condition column name
+	 * @return bool
+	 */
+	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) {
+				$model->delete();
+			});
+		});
+
+		return true;
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  int   $id
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return Model
+	 */
+	public function find(int $id, array $relations = [], array $columns = ['*']): Model
+	{
+		return $this->model->with($relations)->find($id, $columns);
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  bool    $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array $conditions array of conditions
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return Model
+	 */
+	public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return $this->model->with($relations)->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  int    $perPage
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		unset($conditions['page']);
+		unset($conditions['perPage']);
+		unset($conditions['sortBy']);
+		unset($conditions['sort']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->onlyTrashed();
+
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  int $id
+	 * @return bool
+	 */
+	public function restore(int $id): bool
+	{
+		$model = $this->model->onlyTrashed()->find($id);
+
+		if (!$model) {
+			Errors::notFound(class_basename($this->model) . ' with id : ' . $id);
+		}
+
+		$model->restore();
+
+		return true;
+	}
+
+	/**
+	 * Fill the model with the given data.
+	 *
+	 * @param   array  $data
+	 * @return  Model
+	 */
+	protected function prepareModel(array $data): Model
+	{
+		$modelClass = $this->model;
+
+		/**
+		 * If the id is present in the data then select the model for updating,
+		 * else create new model.
+		 *
+		 * @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']);
+		}
+
+		/**
+		 * Construct the model object with the given data,
+		 * and if there is a relation add it to relations array,
+		 * then save the model.
+		 */
+		foreach ($data as $key => $value) {
+			if (array_search($key, $model->getFillable(), true) !== false) {
+				/**
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
+				 */
+				$model->$key = $value;
+			}
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Prepare related models based on the given data for the given model.
+	 *
+	 * @param   array $data
+	 * @param   Model $model
+	 *
+	 * @return  array
+	 */
+	protected function prepareRelations(array $data, Model $model): array
+	{
+		/**
+		 * Init the relation array
+		 *
+		 * @var array
+		 */
+		$relations = [];
+
+		/**
+		 * Construct the model object with the given data,
+		 * and if there is a relation add it to relations array,
+		 * then save the model.
+		 */
+		foreach ($data as $key => $value) {
+			/**
+			 * If the attribute is a relation.
+			 */
+			$relation = Str::camel($key);
+			if (method_exists($model, $relation) && Core::$relation()) {
+				/**
+				 * Check if the relation is a collection.
+				 */
+				if (class_basename($model->$relation) == 'Collection') {
+					/**
+					 * If the relation has no value then marke the relation data
+					 * related to the model to be deleted.
+					 */
+					if (!$value || !count($value)) {
+						$relations[$relation] = 'delete';
+					}
+				}
+				if (is_array($value)) {
+					/**
+					 * Loop through the relation data.
+					 */
+					foreach ($value as $attr => $val) {
+						/**
+						 * Get the relation model.
+						 */
+						$relationBaseModel = Core::$relation()->model;
+
+						/**
+						 * Check if the relation is a collection.
+						 */
+						if (class_basename($model->$relation) == 'Collection') {
+							if (!is_array($val)) {
+								$relationModel = $relationBaseModel->lockForUpdate()->find($val);
+							} else {
+								/**
+								 * If the id is present in the data then select the relation model for updating,
+								 * else create new model.
+								 */
+								$relationModel = Arr::has($val, 'id') ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+							}
+
+							/**
+							 * If model doesn't exists.
+							 */
+							if (!$relationModel) {
+								Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+							}
+
+							if (is_array($val)) {
+								/**
+								 * Loop through the relation attributes.
+								 */
+								foreach ($val as $attr => $val) {
+									/**
+									 * Prevent the sub relations or attributes not in the fillable.
+									 */
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false && class_basename($model->$key()) !== 'BelongsToMany') {
+										$relationModel->$attr = $val;
+									} elseif (gettype($val) !== 'object' && gettype($val) !== 'array' && $attr !== 'id') {
+										$extra[$attr] = $val;
+									}
+								}
+							}
+
+							if (isset($extra)) {
+								$relationModel->extra = $extra;
+							}
+							$relations[$relation][] = $relationModel;
+						} else {
+							/**
+							 * Prevent the sub relations.
+							 */
+							if (gettype($val) !== 'object' && gettype($val) !== 'array') {
+								/**
+								 * If the id is present in the data then select the relation model for updating,
+								 * else create new model.
+								 */
+								$relationModel = Arr::has($value, 'id') ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+
+								/**
+								 * If model doesn't exists.
+								 */
+								if (!$relationModel) {
+									Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+								}
+
+								foreach ($value as $relationAttribute => $relationValue) {
+									/**
+									 * Prevent attributes not in the fillable.
+									 */
+									if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) {
+										$relationModel->$relationAttribute = $relationValue;
+									}
+								}
+
+								$relations[$relation] = $relationModel;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $relations;
+	}
+
+	/**
+	 * Save the model with related models.
+	 *
+	 * @param   Model $model
+	 * @param   array $relations
+	 *
+	 * @return  Model
+	 */
+	protected function saveModel(Model $model, array $relations): Model
+	{
+
+		/**
+		 * Loop through the relations array.
+		 */
+		foreach ($relations as $key => $value) {
+			/**
+			 * If the relation is marked for delete then delete it.
+			 */
+			if ($value == 'delete' && $model->$key()->count()) {
+				switch (class_basename($model->$key())) {
+						/**
+						 * If the relation is one to many then delete all
+						 * relations who's id isn't in the ids array.
+						 */
+					case 'HasMany':
+						$model->$key()->delete();
+						break;
+
+						/**
+						 * If the relation is many to many then
+						 * detach the previous data and attach
+						 * the ids array to the model.
+						 */
+					case 'BelongsToMany':
+						$model->$key()->detach();
+						break;
+				}
+			} elseif (gettype($value) == 'array') {
+				/**
+				 * Save the model.
+				 */
+				$model->save();
+				$ids = [];
+
+				/**
+				 * Loop through the relations.
+				 */
+				foreach ($value as $val) {
+					switch (class_basename($model->$key())) {
+							/**
+							 * If the relation is one to many then update it's foreign key with
+							 * the model id and save it then add its id to ids array to delete all
+							 * relations who's id isn't in the ids array.
+							 */
+						case 'HasMany':
+							$foreignKeyName       = $model->$key()->getForeignKeyName();
+							$val->$foreignKeyName = $model->id;
+							$val->save();
+							$ids[] = $val->id;
+							break;
+
+							/**
+							 * If the relation is many to many then add it's id to the ids array to
+							 * attache these ids to the model.
+							 */
+						case 'BelongsToMany':
+						case 'MorphToMany':
+							$extra = $val->extra;
+							unset($val->extra);
+							$val->save();
+							$ids[$val->id] = $extra ?? [];
+							break;
+					}
+				}
+				switch (class_basename($model->$key())) {
+						/**
+						 * If the relation is one to many then delete all
+						 * relations who's id isn't in the ids array.
+						 */
+					case 'HasMany':
+						$model->$key()->whereNotIn('id', $ids)->delete();
+						break;
+
+						/**
+						 * If the relation is many to many then
+						 * detach the previous data and attach
+						 * the ids array to the model.
+						 */
+					case 'BelongsToMany':
+					case 'MorphToMany':
+						$model->$key()->detach();
+						$model->$key()->attach($ids);
+						break;
+				}
+			} else {
+				switch (class_basename($model->$key())) {
+						/**
+						 * If the relation is one to one.
+						 */
+					case 'HasOne':
+						/**
+						 * Save the model.
+						 */
+						$model->save();
+						$foreignKeyName         = $model->$key()->getForeignKeyName();
+						$value->$foreignKeyName = $model->id;
+						$value->save();
+						break;
+					case 'BelongsTo':
+						/**
+						 * Save the model.
+						 */
+						$value->save();
+						$model->$key()->associate($value);
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Save the model.
+		 */
+		$model->save();
+
+		return $model;
+	}
+
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 *
+	 * @param  array $conditions
+	 * @param  Model $model
+	 * @return array
+	 */
+	protected function constructConditions(array $conditions, Model $model): array
+	{
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) {
+			if (Str::contains($key, '->')) {
+				$key = $this->wrapJsonSelector($key);
+			}
+
+			if ($key == 'and') {
+				$conditions       = $this->constructConditions($value, $model);
+				$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} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			} else {
+				if (is_array($value)) {
+					$operator = $value['op'];
+					if (strtolower($operator) == 'between') {
+						$value1 = $value['val1'];
+						$value2 = $value['val2'];
+					} else {
+						$value = Arr::get($value, 'val', '');
+					}
+				} else {
+					$operator = '=';
+				}
+
+				if (strtolower($operator) == 'between') {
+					$conditionString  .= $key . ' >= ? and ';
+					$conditionValues[] = $value1;
+
+					$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} ';
+				} elseif (strtolower($operator) == 'null') {
+					$conditionString .= $key . ' is null {op} ';
+				} elseif (strtolower($operator) == 'not null') {
+					$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} ';
+						$conditionValues  = array_merge($conditionValues, $bindings);
+						$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+					} else {
+						$conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ') {op} ';
+						$conditionValues  = array_merge($conditionValues, $bindings);
+					}
+				} else {
+					$conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+					$conditionValues[] = $value;
+				}
+			}
+		}
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
+	}
+
+	/**
+	 * Wrap the given JSON selector.
+	 *
+	 * @param  string  $value
+	 * @return string
+	 */
+	protected function wrapJsonSelector(string $value): string
+	{
+		$removeLast = strpos($value, ')');
+		$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 . '"';
+		})->implode('.'));
+
+		return $removeLast === false ? $result : $result . ')';
+	}
 }

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

Indentation +230 added lines, -230 removed lines

@@ -11,257 +11,257 @@
 
 abstract class BaseService implements BaseServiceInterface
 {
-    /**
-     * @var BaseRepositoryInterface
-     */
-    public $repo;
+	/**
+	 * @var BaseRepositoryInterface
+	 */
+	public $repo;
 
-    /**
-     * @var Session
-     */
-    public $session;
+	/**
+	 * @var Session
+	 */
+	public $session;
 
-    /**
-     * Init new object.
-     *
-     * @param   BaseRepositoryInterface $repo
-     * @param   Session $session
-     * @return  void
-     */
-    public function __construct(BaseRepositoryInterface $repo, Session $session)
-    {
-        $this->repo = $repo;
-        $this->session = $session;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   BaseRepositoryInterface $repo
+	 * @param   Session $session
+	 * @return  void
+	 */
+	public function __construct(BaseRepositoryInterface $repo, Session $session)
+	{
+		$this->repo = $repo;
+		$this->session = $session;
+	}
 
-    /**
-     * Fetch records with relations based on the given params.
-     *
-     * @param   array  $relations
-     * @param   array  $conditions
-     * @param   int    $perPage
-     * @param   string $sortBy
-     * @param   bool   $desc
-     * @param   bool   $trashed
-     * @return LengthAwarePaginator
-     */
-    public function list(array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator
-    {
-        $translatable = $this->repo->model->translatable ?? [];
-        $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . $this->session->get('locale') : $sortBy;
+	/**
+	 * Fetch records with relations based on the given params.
+	 *
+	 * @param   array  $relations
+	 * @param   array  $conditions
+	 * @param   int    $perPage
+	 * @param   string $sortBy
+	 * @param   bool   $desc
+	 * @param   bool   $trashed
+	 * @return LengthAwarePaginator
+	 */
+	public function list(array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator
+	{
+		$translatable = $this->repo->model->translatable ?? [];
+		$filters = $this->constructFilters($conditions);
+		$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);
-        }
+		if ($trashed) {
+			return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        if (count($filters)) {
-            return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if (count($filters)) {
+			return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-    }
+		return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+	}
 
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        return $this->repo->all($relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		return $this->repo->all($relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return Model
-     */
-    public function save(array $data): Model
-    {
-        return $this->repo->save($data);
-    }
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return Model
+	 */
+	public function save(array $data): Model
+	{
+		return $this->repo->save($data);
+	}
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  string $value condition value
-     * @param  string $attribute condition column name
-     * @return bool
-     */
-    public function delete(string $value, string $attribute = 'id'): bool
-    {
-        return $this->repo->delete($value, $attribute);
-    }
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  string $value condition value
+	 * @param  string $attribute condition column name
+	 * @return bool
+	 */
+	public function delete(string $value, string $attribute = 'id'): bool
+	{
+		return $this->repo->delete($value, $attribute);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  int   $id
-     * @param  array $relations
-     * @param  array $columns
-     * @return object
-     */
-    public function find(int $id, array $relations = [], array $columns = ['*']): Model
-    {
-        return $this->repo->find($id, $relations, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  int   $id
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return object
+	 */
+	public function find(int $id, array $relations = [], array $columns = ['*']): Model
+	{
+		return $this->repo->find($id, $relations, $columns);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  array  $relations
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  array  $relations
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array $conditions array of conditions
-     * @param  array $relations
-     * @param  array $columns
-     * @return Model
-     */
-    public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
-    {
-        return $this->repo->first($conditions, $relations, $columns);
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array $conditions array of conditions
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return Model
+	 */
+	public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
+	{
+		return $this->repo->first($conditions, $relations, $columns);
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  int    $perPage
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return LengthAwarePaginator
-     */
-    public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  int    $perPage
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  int $id
-     * @return bool
-     */
-    public function restore(int $id): bool
-    {
-        return $this->repo->restore($id);
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  int $id
+	 * @return bool
+	 */
+	public function restore(int $id): bool
+	{
+		return $this->repo->restore($id);
+	}
 
-    /**
-     * Prepare filters for repo.
-     *
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructFilters(array $conditions): array
-    {
-        $filters = [];
-        $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') {
-                /**
-                 * 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;
+	/**
+	 * Prepare filters for repo.
+	 *
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructFilters(array $conditions): array
+	{
+		$filters = [];
+		$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') {
+				/**
+				 * 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;
 
-                /**
-                 * 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)) {
-                    $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+				/**
+				 * 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)) {
+					$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) {
-                    $filters[$key] = [
-                        'op' => 'in',
-                        'val' => explode(',', $value)
-                    ];
+					/**
+					 * Use in operator in case of foreign and comma seperated values.
+					 */
+				} elseif (!is_array($value) && strpos($key, '_id') && $value) {
+					$filters[$key] = [
+						'op' => 'in',
+						'val' => explode(',', $value)
+					];
 
-                    /**
-                     * Use null operator in case of 0 value and foreign.
-                     */
-                } elseif (strpos($key, '_id') && $value == 0) {
-                    $filters[$key] = [
-                        'op' => 'null'
-                    ];
+					/**
+					 * Use null operator in case of 0 value and foreign.
+					 */
+				} elseif (strpos($key, '_id') && $value == 0) {
+					$filters[$key] = [
+						'op' => 'null'
+					];
 
-                    /**
-                     * Consider values as a sub conditions if it is array.
-                     */
-                } elseif (is_array($value)) {
-                    $filters[$key] = $value;
+					/**
+					 * Consider values as a sub conditions if it is array.
+					 */
+				} elseif (is_array($value)) {
+					$filters[$key] = $value;
 
-                    /**
-                     * Default string filteration.
-                     */
-                } elseif ($value) {
-                    $key = 'LOWER(' . $key . ')';
-                    $value = strtolower($value);
-                    $filters[$key] = [
-                        'op' => 'like',
-                        'val' => '%' . $value . '%'
-                    ];
-                }
-            }
-        }
+					/**
+					 * Default string filteration.
+					 */
+				} elseif ($value) {
+					$key = 'LOWER(' . $key . ')';
+					$value = strtolower($value);
+					$filters[$key] = [
+						'op' => 'like',
+						'val' => '%' . $value . '%'
+					];
+				}
+			}
+		}
 
-        return $filters;
-    }
+		return $filters;
+	}
 }

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/Notifications/Services/NotificationService.php

Indentation +69 added lines, -69 removed lines

@@ -9,79 +9,79 @@
 
 class NotificationService extends BaseService
 {
-    /**
-     * @var UserRepository
-     */
-    protected $userRepository;
+	/**
+	 * @var UserRepository
+	 */
+	protected $userRepository;
 
-    /**
-     * Init new object.
-     *
-     * @param   NotificationRepository $repo
-     * @param   Session $session
-     * @return  void
-     */
-    public function __construct(NotificationRepository $repo, UserRepository $userRepository, Session $session)
-    {
-        $this->userRepository = $userRepository;
-        parent::__construct($repo, $session);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   NotificationRepository $repo
+	 * @param   Session $session
+	 * @return  void
+	 */
+	public function __construct(NotificationRepository $repo, UserRepository $userRepository, Session $session)
+	{
+		$this->userRepository = $userRepository;
+		parent::__construct($repo, $session);
+	}
 
-    /**
-     * Retrieve all notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function my($perPage)
-    {
-        return $this->repo->my($perPage);
-    }
+	/**
+	 * Retrieve all notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function my($perPage)
+	{
+		return $this->repo->my($perPage);
+	}
 
-    /**
-     * Retrieve unread notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function unread($perPage)
-    {
-        return $this->repo->unread($perPage);
-    }
+	/**
+	 * Retrieve unread notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function unread($perPage)
+	{
+		return $this->repo->unread($perPage);
+	}
 
-    /**
-     * Mark the notification as read.
-     *
-     * @param  integer  $id
-     * @return object
-     */
-    public function markAsRead($id)
-    {
-        return $this->repo->markAsRead($id);
-    }
+	/**
+	 * Mark the notification as read.
+	 *
+	 * @param  integer  $id
+	 * @return object
+	 */
+	public function markAsRead($id)
+	{
+		return $this->repo->markAsRead($id);
+	}
 
-    /**
-     * Mark all notifications as read.
-     *
-     * @return void
-     */
-    public function markAllAsRead()
-    {
-        return $this->repo->markAllAsRead();
-    }
+	/**
+	 * Mark all notifications as read.
+	 *
+	 * @return void
+	 */
+	public function markAllAsRead()
+	{
+		return $this->repo->markAllAsRead();
+	}
 
-    /**
-     * Notify th given user with the given notification.
-     *
-     * @param  collection $users
-     * @param  string     $notification
-     * @param  Variadic   $notificationData
-     * @return void
-     */
-    public function notify($users, $notification, ...$notificationData)
-    {
-        $users = is_array($users) ? $this->userRepository->findBy(['id' => ['op' => 'in', 'val' => $users]]) : $users;
-        $notification = 'App\Modules\Notifications\Notifications\\'.$notification;
-        \Notification::send($users, new $notification(...$notificationData));
-    }
+	/**
+	 * Notify th given user with the given notification.
+	 *
+	 * @param  collection $users
+	 * @param  string     $notification
+	 * @param  Variadic   $notificationData
+	 * @return void
+	 */
+	public function notify($users, $notification, ...$notificationData)
+	{
+		$users = is_array($users) ? $this->userRepository->findBy(['id' => ['op' => 'in', 'val' => $users]]) : $users;
+		$notification = 'App\Modules\Notifications\Notifications\\'.$notification;
+		\Notification::send($users, new $notification(...$notificationData));
+	}
 }

src/Modules/Roles/Services/RoleService.php

Indentation +28 added lines, -28 removed lines

@@ -8,34 +8,34 @@
 
 class RoleService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   RoleRepository $repo
-     * @param   Session $session
-     * @return  void
-     */
-    public function __construct(RoleRepository $repo, Session $session)
-    {
-        parent::__construct($repo, $session);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   RoleRepository $repo
+	 * @param   Session $session
+	 * @return  void
+	 */
+	public function __construct(RoleRepository $repo, Session $session)
+	{
+		parent::__construct($repo, $session);
+	}
 
-    /**
-     * Assign the given permission ids to the given role.
-     *
-     * @param  integer $roleId
-     * @param  array   $permissionIds
-     * @return object
-     */
-    public function assignPermissions($roleId, $permissionIds)
-    {
-        $role = false;
-        \DB::transaction(function () use ($roleId, $permissionIds, &$role) {
-            $role = $this->repo->find($roleId);
-            $this->repo->detachPermissions($role);
-            $this->repo->attachPermissions($role, $permissionIds);
-        });
+	/**
+	 * Assign the given permission ids to the given role.
+	 *
+	 * @param  integer $roleId
+	 * @param  array   $permissionIds
+	 * @return object
+	 */
+	public function assignPermissions($roleId, $permissionIds)
+	{
+		$role = false;
+		\DB::transaction(function () use ($roleId, $permissionIds, &$role) {
+			$role = $this->repo->find($roleId);
+			$this->repo->detachPermissions($role);
+			$this->repo->attachPermissions($role, $permissionIds);
+		});
 
-        return $role;
-    }
+		return $role;
+	}
 }

src/Modules/Users/Services/UserService.php

Indentation +358 added lines, -358 removed lines

@@ -13,362 +13,362 @@
 
 class UserService extends BaseService
 {
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationService
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientService
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepository       $repo
-     * @param   PermissionService    $permissionService
-     * @param   LoginProxy           $loginProxy
-     * @param   NotificationService  $notificationService
-     * @param   OauthClientService   $oauthClientService
-     * @param   Session $session
-     * @return  void
-     */
-    public function __construct(
-        UserRepository $repo,
-        PermissionService $permissionService,
-        LoginProxy $loginProxy,
-        NotificationService $notificationService,
-        OauthClientService $oauthClientService,
-        Session $session
-    ) {
-        $this->permissionService   = $permissionService;
-        $this->loginProxy          = $loginProxy;
-        $this->notificationService = $notificationService;
-        $this->oauthClientService  = $oauthClientService;
-        parent::__construct($repo, $session);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = ['roles.permissions'])
-    {
-        $permissions = [];
-        $user        = $this->repo->find(\Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[] = $permission;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user
-     * has the given permissions on the given model.
-     *
-     * @param  string $permissionName
-     * @param  string $model
-     * @param  mixed  $userId
-     * @return boolean
-     */
-    public function can($permissionName, $model, $userId = false)
-    {
-        $permission = $this->permissionService->first([
-            'and' => [
-                'model' => $model,
-                'name'  => $permissionName,
-                'roles' => [
-                    'op' => 'has',
-                    'val' => [
-                        'users' => [
-                            'op' => 'has',
-                            'val' => [
-                                'users.id' => $userId ?: \Auth::id()
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        return $permission ? true : false;
-    }
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed    $user
-     * @return boolean
-     */
-    public function hasRoles($roles, $user = false)
-    {
-        return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachRoles($user);
-            $this->repo->attachRoles($user, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return object
-     */
-    public function login($email, $password)
-    {
-        if (!$user = $this->repo->first(['email' => $email])) {
-            \Errors::loginFailed();
-        } elseif ($user->blocked) {
-            \Errors::userIsBlocked();
-        } elseif (!config('user.disable_confirm_email') && !$user->confirmed) {
-            \Errors::emailNotConfirmed();
-        }
-
-        return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
-    }
-
-    /**
-     * Handle the social login request to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
-
-        if (!Arr::has($user, 'email')) {
-            \Errors::noSocialEmail();
-        }
-
-        if (!$this->repo->first(['email' => $user['email']]) && !$this->repo->deleted(['email' => $user['email']])->count()) {
-            $this->register(Arr::get($user, 'name'), $user['email'], '', true);
-        }
-
-        return $this->login($user['email'], config('user.social_pass'));
-    }
-    /**
-     * Handle the registration request.
-     *
-     * @param  array   $data
-     * @param  boolean $skipConfirmEmail
-     * @param  integer $roleId
-     * @return object
-     */
-    public function register($data, $skipConfirmEmail = false, $roleId = false)
-    {
-        $data['confirmed'] = $skipConfirmEmail;
-
-        if ($roleId) {
-            $data['roles'] = [['id' => $roleId]];
-        }
-
-        $user = $this->repo->save($data);
-
-        if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (\Auth::id() == $userId) {
-            \Errors::noPermissions();
-        }
-
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (!$user = $this->repo->first(['email' => $email])) {
-            \Errors::notFound('email');
-        }
-
-        $token = \Password::createToken($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string|void
-     */
-    public function resetPassword($email, $password, $passwordConfirmation, $token)
-    {
-        $response = \Password::reset([
-            'email'                 => $email,
-            'password'              => $password,
-            'password_confirmation' => $passwordConfirmation,
-            'token'                 => $token
-        ], function ($user, $password) {
-            $this->repo->save(['id' => $user->id, 'password' => $password]);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-                break;
-
-            case \Password::INVALID_TOKEN:
-                \Errors::invalidResetToken();
-                break;
-
-            case \Password::INVALID_PASSWORD:
-                \Errors::invalidResetPassword();
-                break;
-
-            case \Password::INVALID_USER:
-                \Errors::notFound('user');
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return void
-     */
-    public function changePassword($password, $oldPassword)
-    {
-        $user = \Auth::user();
-        if (!\Hash::check($oldPassword, $user->password)) {
-            \Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            \Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->repo->first(['email' => $email]);
-        if ($user->confirmed) {
-            \Errors::emailAlreadyConfirmed();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
-        $this->notificationService->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        $data['id'] = \Auth::id();
-        return $this->repo->save($data);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->oauthClientService->revokeAccessToken(\Auth::user()->token());
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+	/**
+	 * @var PermissionService
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationService
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientService
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepository       $repo
+	 * @param   PermissionService    $permissionService
+	 * @param   LoginProxy           $loginProxy
+	 * @param   NotificationService  $notificationService
+	 * @param   OauthClientService   $oauthClientService
+	 * @param   Session $session
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepository $repo,
+		PermissionService $permissionService,
+		LoginProxy $loginProxy,
+		NotificationService $notificationService,
+		OauthClientService $oauthClientService,
+		Session $session
+	) {
+		$this->permissionService   = $permissionService;
+		$this->loginProxy          = $loginProxy;
+		$this->notificationService = $notificationService;
+		$this->oauthClientService  = $oauthClientService;
+		parent::__construct($repo, $session);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = ['roles.permissions'])
+	{
+		$permissions = [];
+		$user        = $this->repo->find(\Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[] = $permission;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user
+	 * has the given permissions on the given model.
+	 *
+	 * @param  string $permissionName
+	 * @param  string $model
+	 * @param  mixed  $userId
+	 * @return boolean
+	 */
+	public function can($permissionName, $model, $userId = false)
+	{
+		$permission = $this->permissionService->first([
+			'and' => [
+				'model' => $model,
+				'name'  => $permissionName,
+				'roles' => [
+					'op' => 'has',
+					'val' => [
+						'users' => [
+							'op' => 'has',
+							'val' => [
+								'users.id' => $userId ?: \Auth::id()
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		return $permission ? true : false;
+	}
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed    $user
+	 * @return boolean
+	 */
+	public function hasRoles($roles, $user = false)
+	{
+		return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		$user = false;
+		\DB::transaction(function () use ($userId, $roleIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachRoles($user);
+			$this->repo->attachRoles($user, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return object
+	 */
+	public function login($email, $password)
+	{
+		if (!$user = $this->repo->first(['email' => $email])) {
+			\Errors::loginFailed();
+		} elseif ($user->blocked) {
+			\Errors::userIsBlocked();
+		} elseif (!config('user.disable_confirm_email') && !$user->confirmed) {
+			\Errors::emailNotConfirmed();
+		}
+
+		return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
+	}
+
+	/**
+	 * Handle the social login request to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
+
+		if (!Arr::has($user, 'email')) {
+			\Errors::noSocialEmail();
+		}
+
+		if (!$this->repo->first(['email' => $user['email']]) && !$this->repo->deleted(['email' => $user['email']])->count()) {
+			$this->register(Arr::get($user, 'name'), $user['email'], '', true);
+		}
+
+		return $this->login($user['email'], config('user.social_pass'));
+	}
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  array   $data
+	 * @param  boolean $skipConfirmEmail
+	 * @param  integer $roleId
+	 * @return object
+	 */
+	public function register($data, $skipConfirmEmail = false, $roleId = false)
+	{
+		$data['confirmed'] = $skipConfirmEmail;
+
+		if ($roleId) {
+			$data['roles'] = [['id' => $roleId]];
+		}
+
+		$user = $this->repo->save($data);
+
+		if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId) {
+			\Errors::noPermissions();
+		}
+
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (!$user = $this->repo->first(['email' => $email])) {
+			\Errors::notFound('email');
+		}
+
+		$token = \Password::createToken($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string|void
+	 */
+	public function resetPassword($email, $password, $passwordConfirmation, $token)
+	{
+		$response = \Password::reset([
+			'email'                 => $email,
+			'password'              => $password,
+			'password_confirmation' => $passwordConfirmation,
+			'token'                 => $token
+		], function ($user, $password) {
+			$this->repo->save(['id' => $user->id, 'password' => $password]);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+				break;
+
+			case \Password::INVALID_TOKEN:
+				\Errors::invalidResetToken();
+				break;
+
+			case \Password::INVALID_PASSWORD:
+				\Errors::invalidResetPassword();
+				break;
+
+			case \Password::INVALID_USER:
+				\Errors::notFound('user');
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return void
+	 */
+	public function changePassword($password, $oldPassword)
+	{
+		$user = \Auth::user();
+		if (!\Hash::check($oldPassword, $user->password)) {
+			\Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			\Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->repo->first(['email' => $email]);
+		if ($user->confirmed) {
+			\Errors::emailAlreadyConfirmed();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
+		$this->notificationService->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		$data['id'] = \Auth::id();
+		return $this->repo->save($data);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->oauthClientService->revokeAccessToken(\Auth::user()->token());
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

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();
         }