SherifElfadaly / Laravel-Api-Skeleton

src/Modules/PushNotificationDevices/Http/Requests/StorePushNotificationDevice.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class StorePushNotificationDevice extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
-        return [
-            'device_token' => $requiredOrNullable . '|string|max:255',
-            'user_id'      => $requiredOrNullable . '|exists:users,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		$requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
+		return [
+			'device_token' => $requiredOrNullable . '|string|max:255',
+			'user_id'      => $requiredOrNullable . '|exists:users,id'
+		];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@
      */
     public function rules()
     {
-        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
+        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required'.'';
         return [
-            'device_token' => $requiredOrNullable . '|string|max:255',
-            'user_id'      => $requiredOrNullable . '|exists:users,id'
+            'device_token' => $requiredOrNullable.'|string|max:255',
+            'user_id'      => $requiredOrNullable.'|exists:users,id'
         ];
     }
 }

src/Modules/Core/BaseClasses/BaseService.php

Indentation +224 added lines, -224 removed lines

@@ -7,250 +7,250 @@
 
 abstract class BaseService implements BaseServiceInterface
 {
-    /**
-     * @var object
-     */
-    public $repo;
+	/**
+	 * @var object
+	 */
+	public $repo;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed  $repo
-     * @return  void
-     */
-    public function __construct($repo)
-    {
-        $this->repo = $repo;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed  $repo
+	 * @return  void
+	 */
+	public function __construct($repo)
+	{
+		$this->repo = $repo;
+	}
 
-    /**
-     * Fetch records with relations based on the given params.
-     *
-     * @param   array   $relations
-     * @param   array   $conditions
-     * @param   integer $perPage
-     * @param   string  $sortBy
-     * @param   boolean $desc
-     * @param   boolean $trashed
-     * @return collection
-     */
-    public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
-    {
-        $translatable = $this->repo->model->translatable ?? [];
-        $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . Session::get('locale') : $sortBy;
+	/**
+	 * Fetch records with relations based on the given params.
+	 *
+	 * @param   array   $relations
+	 * @param   array   $conditions
+	 * @param   integer $perPage
+	 * @param   string  $sortBy
+	 * @param   boolean $desc
+	 * @param   boolean $trashed
+	 * @return collection
+	 */
+	public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
+	{
+		$translatable = $this->repo->model->translatable ?? [];
+		$filters = $this->constructFilters($conditions);
+		$sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . 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($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		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 collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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 collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		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 collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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 collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        return $this->repo->save($data);
-    }
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function save(array $data)
+	{
+		return $this->repo->save($data);
+	}
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var $value condition value
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function delete($value, $attribute = 'id')
-    {
-        return $this->repo->delete($value, $attribute);
-    }
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var $value condition value
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function delete($value, $attribute = 'id')
+	{
+		return $this->repo->delete($value, $attribute);
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = ['*'])
-    {
-        return $this->repo->find($id, $relations, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = ['*'])
+	{
+		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  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		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 object
-     */
-    public function first($conditions, $relations = [], $columns = ['*'])
-    {
-        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 object
+	 */
+	public function first($conditions, $relations = [], $columns = ['*'])
+	{
+		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  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        return $this->repo->restore($id);
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		return $this->repo->restore($id);
+	}
 
-    /**
-     * Prepare filters for repo.
-     *
-     * @param  array   $conditions
-     * @return array
-     */
-    public function constructFilters($conditions)
-    {
-        $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 . '->' . (Session::get('locale') == 'all' ? 'en' : Session::get('locale')) : $key;
+	/**
+	 * Prepare filters for repo.
+	 *
+	 * @param  array   $conditions
+	 * @return array
+	 */
+	public function constructFilters($conditions)
+	{
+		$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 . '->' . (Session::get('locale') == 'all' ? 'en' : 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 +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
     {
         $translatable = $this->repo->model->translatable ?? [];
         $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . Session::get('locale') : $sortBy;
+        $sortBy = in_array($sortBy, $translatable) ? $sortBy.'->'.Session::get('locale') : $sortBy;
 
         if ($trashed) {
             return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
@@ -206,7 +206,7 @@ 
                 /**
                  * Prepare key based on the the requested lang if it was translatable.
                  */
-                $key = in_array($key, $translatable) ? $key . '->' . (Session::get('locale') == 'all' ? 'en' : Session::get('locale')) : $key;
+                $key = in_array($key, $translatable) ? $key.'->'.(Session::get('locale') == 'all' ? 'en' : Session::get('locale')) : $key;
 
                 /**
                  * Convert 0/1 or true/false to boolean in case of not foreign key.
@@ -217,7 +217,7 @@ 
                 /**
                  * 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)
@@ -241,11 +241,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/Core/BaseClasses/BaseRepository.php

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function __construct($model)
     {
-        $this->model  = $model;
+        $this->model = $model;
     }
 
     /**
@@ -82,7 +82,7 @@ 
      */
     public function count($conditions = false)
     {
-        if($conditions) {
+        if ($conditions) {
             $conditions = $this->constructConditions($conditions, $this->model);
             return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->count();
         }
@@ -116,7 +116,7 @@ 
         $model      = false;
         $relations  = [];
 
-        \DB::transaction(function () use (&$model, &$relations, $data) {
+        \DB::transaction(function() use (&$model, &$relations, $data) {
             
             $model     = $this->prepareModel($data);
             $relations = $this->prepareRelations($data, $model);
@@ -152,8 +152,8 @@ 
      */
     public function delete($value, $attribute = 'id')
     {
-        \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();
             });
         });
@@ -243,7 +243,7 @@ 
     {
         $model = $this->model->onlyTrashed()->find($id);
 
-        if (! $model) {
+        if ( ! $model) {
             \Errors::notFound(class_basename($this->model).' with id : '.$id);
         }
 
@@ -267,7 +267,7 @@ 
          * @var array
          */
         $model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-        if (! $model) {
+        if ( ! $model) {
             \Errors::notFound(class_basename($modelClass).' with id : '.$data['id']);
         }
 
@@ -324,7 +324,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';
                     }
                 }
@@ -342,7 +342,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 {
                                 /**
@@ -355,7 +355,7 @@ 
                             /**
                              * If model doesn't exists.
                              */
-                            if (! $relationModel) {
+                            if ( ! $relationModel) {
                                 \Errors::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                             }
 
@@ -393,7 +393,7 @@ 
                                 /**
                                  * If model doesn't exists.
                                  */
-                                if (! $relationModel) {
+                                if ( ! $relationModel) {
                                     \Errors::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                 }
 
@@ -579,7 +579,7 @@ 
                 } elseif (strtolower($operator) == 'has') {
                     $sql              = $model->withTrashed()->withoutGlobalScopes()->has($key)->toSql();
                     $bindings         = $model->withTrashed()->withoutGlobalScopes()->has($key)->getBindings();
-                    if($value) {
+                    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);
@@ -610,7 +610,7 @@ 
         $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) {
+        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function($part) {
             return '"'.$part.'"';
         })->implode('.'));
         

Indentation +664 added lines, -664 removed lines

@@ -8,681 +8,681 @@
 
 abstract class BaseRepository implements BaseRepositoryInterface
 {
-    /**
-     * @var object
-     */
-    public $model;
+	/**
+	 * @var object
+	 */
+	public $model;
     
-    /**
-     * Init new object.
-     *
-     * @var mixed model
-     * @return  void
-     */
-    public function __construct($model)
-    {
-        $this->model  = $model;
-    }
-
-    /**
-     * 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($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return $this->model->with($relations)->orderBy($sortBy, $sort)->get($columns);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @var mixed model
+	 * @return  void
+	 */
+	public function __construct($model)
+	{
+		$this->model  = $model;
+	}
+
+	/**
+	 * 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($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return $this->model->with($relations)->orderBy($sortBy, $sort)->get($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 collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $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  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $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 collection
-     */
-    public function count($conditions = false)
-    {
-        if($conditions) {
-            $conditions = $this->constructConditions($conditions, $this->model);
-            return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->count();
-        }
+	/**
+	 * 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 collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$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  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$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 collection
+	 */
+	public function count($conditions = false)
+	{
+		if($conditions) {
+			$conditions = $this->constructConditions($conditions, $this->model);
+			return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->count();
+		}
         
-        return $this->model->count();
-    }
-
-    /**
-     * Return max value for the given column.
-     *
-     * @param  column
-     * @return integer
-     */
-    public function max($column)
-    {
-        return $this->model->max($column);
-    }
-
-    /**
-     * Pluck column based on the given condition from storage.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  string   $column
-     * @return collection
-     */
-    public function pluck($conditions, $column)
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->pluck($column);
-    }
-
-    /**
-     * Update the given data based on the given conditions.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $data
-     * @return collection
-     */
-    public function update($conditions, $data)
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->update($data);
-    }
+		return $this->model->count();
+	}
+
+	/**
+	 * Return max value for the given column.
+	 *
+	 * @param  column
+	 * @return integer
+	 */
+	public function max($column)
+	{
+		return $this->model->max($column);
+	}
+
+	/**
+	 * Pluck column based on the given condition from storage.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  string   $column
+	 * @return collection
+	 */
+	public function pluck($conditions, $column)
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->pluck($column);
+	}
+
+	/**
+	 * Update the given data based on the given conditions.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $data
+	 * @return collection
+	 */
+	public function update($conditions, $data)
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return $this->model->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->update($data);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        $local = \Session::get('locale');
-        \Session::put('locale', 'all');
-        $model      = false;
-        $relations  = [];
-
-        \DB::transaction(function () use (&$model, &$relations, $data) {
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function save(array $data)
+	{
+		$local = \Session::get('locale');
+		\Session::put('locale', 'all');
+		$model      = false;
+		$relations  = [];
+
+		\DB::transaction(function () use (&$model, &$relations, $data) {
             
-            $model     = $this->prepareModel($data);
-            $relations = $this->prepareRelations($data, $model);
-            $model     = $this->saveModel($model, $relations);
-        });
-        \Session::put('locale', $local);
+			$model     = $this->prepareModel($data);
+			$relations = $this->prepareRelations($data, $model);
+			$model     = $this->saveModel($model, $relations);
+		});
+		\Session::put('locale', $local);
         
-        if (count($relations)) {
-            $model->load(...array_keys($relations));
-        }
+		if (count($relations)) {
+			$model->load(...array_keys($relations));
+		}
 
-        return $model;
-    }
+		return $model;
+	}
     
-    /**
-     * Insert the given model/models to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function insert(array $data)
-    {
-        return $this->model->insert($data);
-    }
-
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var $value condition value
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function delete($value, $attribute = 'id')
-    {
-        \DB::transaction(function () use ($value, $attribute) {
-            $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function ($model) {
-                $model->delete();
-            });
-        });
-    }
+	/**
+	 * Insert the given model/models to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function insert(array $data)
+	{
+		return $this->model->insert($data);
+	}
+
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var $value condition value
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function delete($value, $attribute = 'id')
+	{
+		\DB::transaction(function () use ($value, $attribute) {
+			$this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function ($model) {
+				$model->delete();
+			});
+		});
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  integer $id
-     * @param  string[]   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = ['*'])
-    {
-        return $this->model->with($relations)->find($id, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  integer $id
+	 * @param  string[]   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = ['*'])
+	{
+		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  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $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 object
-     */
-    public function first($conditions, $relations = [], $columns = ['*'])
-    {
-        $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  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        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  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        $model = $this->model->onlyTrashed()->find($id);
-
-        if (! $model) {
-            \Errors::notFound(class_basename($this->model).' with id : '.$id);
-        }
-
-        $model->restore();
-    }
-
-    /**
-     * Fill the model with the given data.
-     *
-     * @param   array  $data
-     *
-     * @return  object
-     */
-    public function prepareModel($data)
-    {
-        $modelClass = $this->model;
-
-        /**
-         * If the id is present in the data then select the model for updating,
-         * else create new model.
-         * @var array
-         */
-        $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;
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$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 object
+	 */
+	public function first($conditions, $relations = [], $columns = ['*'])
+	{
+		$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  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		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  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		$model = $this->model->onlyTrashed()->find($id);
+
+		if (! $model) {
+			\Errors::notFound(class_basename($this->model).' with id : '.$id);
+		}
+
+		$model->restore();
+	}
+
+	/**
+	 * Fill the model with the given data.
+	 *
+	 * @param   array  $data
+	 *
+	 * @return  object
+	 */
+	public function prepareModel($data)
+	{
+		$modelClass = $this->model;
+
+		/**
+		 * If the id is present in the data then select the model for updating,
+		 * else create new model.
+		 * @var array
+		 */
+		$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   object $model
-     *
-     * @return  array
-     */
-    public function prepareRelations($data, $model)
-    {
-        /**
-         * 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   object  $model
-     * @param   array   $relations
-     *
-     * @return  object
-     */
-    public function saveModel($model, $relations)
-    {
-        /**
-         * Sort relations.
-         */
-        $belongsTo = [];
-        $hasOne = [];
-        $array = [];
-        foreach ($relations as $key => $value) {
-            if (class_basename($model->$key()) === 'BelongsTo') {
-                $belongsTo[$key] = $value;
-            } elseif (class_basename($model->$key()) === 'HasOne') {
-                $hasOne[$key] = $value;
-            } else {
-                $array[$key] = $value;
-            }
-        };
-
-        $relations = array_merge($belongsTo, $hasOne, $array);
-
-        /**
-         * 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
-     * @return array
-     */
-    protected function constructConditions($conditions, $model)
-    {
-        $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 = '=';
-                }
+	/**
+	 * Prepare related models based on the given data for the given model.
+	 *
+	 * @param   array  $data
+	 * @param   object $model
+	 *
+	 * @return  array
+	 */
+	public function prepareRelations($data, $model)
+	{
+		/**
+		 * 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   object  $model
+	 * @param   array   $relations
+	 *
+	 * @return  object
+	 */
+	public function saveModel($model, $relations)
+	{
+		/**
+		 * Sort relations.
+		 */
+		$belongsTo = [];
+		$hasOne = [];
+		$array = [];
+		foreach ($relations as $key => $value) {
+			if (class_basename($model->$key()) === 'BelongsTo') {
+				$belongsTo[$key] = $value;
+			} elseif (class_basename($model->$key()) === 'HasOne') {
+				$hasOne[$key] = $value;
+			} else {
+				$array[$key] = $value;
+			}
+		};
+
+		$relations = array_merge($belongsTo, $hasOne, $array);
+
+		/**
+		 * 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
+	 * @return array
+	 */
+	protected function constructConditions($conditions, $model)
+	{
+		$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) == 'not in') {
-                    $conditionValues  = array_merge($conditionValues, $value);
-                    $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key.' not 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);
-                    }
-                } elseif ($operator == 'doesntHave') {
-                    $sql              = $model->withTrashed()->withoutGlobalScopes()->whereDoesntHave($key)->toSql();
-                    $bindings         = $model->withTrashed()->withoutGlobalScopes()->whereDoesntHave($key)->getBindings();
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= substr(substr($sql, strpos($sql, 'not exists')), 0, -1).' and '.$conditions['conditionString'].') {op} ';
-                    $conditionValues  = array_merge($conditionValues, $bindings);
-                    $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                } 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($value)
-    {
-        $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('.'));
+				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) == 'not in') {
+					$conditionValues  = array_merge($conditionValues, $value);
+					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
+					$conditionString .= $key.' not 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);
+					}
+				} elseif ($operator == 'doesntHave') {
+					$sql              = $model->withTrashed()->withoutGlobalScopes()->whereDoesntHave($key)->toSql();
+					$bindings         = $model->withTrashed()->withoutGlobalScopes()->whereDoesntHave($key)->getBindings();
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
+					$conditionString .= substr(substr($sql, strpos($sql, 'not exists')), 0, -1).' and '.$conditions['conditionString'].') {op} ';
+					$conditionValues  = array_merge($conditionValues, $bindings);
+					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+				} 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($value)
+	{
+		$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.')';
-    }
+		return $removeLast === false ? $result : $result.')';
+	}
 }

src/Modules/Core/Setting.php

Indentation +17 added lines, -17 removed lines

@@ -9,23 +9,23 @@
 class Setting extends Model
 {
 
-    use SoftDeletes, Translatable;
-    protected $table = 'settings';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id', 'key'];
-    public $fillable = ['name', 'value'];
-    public $translatable = ['value'];
-    public $casts = ['value' => 'json'];
+	use SoftDeletes, Translatable;
+	protected $table = 'settings';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id', 'key'];
+	public $fillable = ['name', 'value'];
+	public $translatable = ['value'];
+	public $casts = ['value' => 'json'];
     
-    public function newCollection(array $models = [])
-    {
-        return parent::newCollection($models)->keyBy('key');
-    }
+	public function newCollection(array $models = [])
+	{
+		return parent::newCollection($models)->keyBy('key');
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Setting::observe(SettingsObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Setting::observe(SettingsObserver::class);
+	}
 }

files/Handler.php

Indentation +78 added lines, -78 removed lines

@@ -9,88 +9,88 @@
 

 class Handler extends ExceptionHandler

 {

-    /**

-     * A list of the exception types that are not reported.

-     *

-     * @var array

-     */

-    protected $dontReport = [

-        \League\OAuth2\Server\Exception\OAuthServerException::class,

-    ];

+	/**

+	 * A list of the exception types that are not reported.

+	 *

+	 * @var array

+	 */

+	protected $dontReport = [

+		\League\OAuth2\Server\Exception\OAuthServerException::class,

+	];

 

-    /**

-     * A list of the inputs that are never flashed for validation exceptions.

-     *

-     * @var array

-     */

-    protected $dontFlash = [

-        'password',

-        'password_confirmation',

-    ];

+	/**

+	 * A list of the inputs that are never flashed for validation exceptions.

+	 *

+	 * @var array

+	 */

+	protected $dontFlash = [

+		'password',

+		'password_confirmation',

+	];

 

-    /**

-     * Report or log an exception.

-     *

-     * @param  \Throwable  $exception

-     * @return void

-     *

-     * @throws \Exception

-     */

-    public function report(Throwable $exception)

-    {

-        parent::report($exception);

-    }

+	/**

+	 * Report or log an exception.

+	 *

+	 * @param  \Throwable  $exception

+	 * @return void

+	 *

+	 * @throws \Exception

+	 */

+	public function report(Throwable $exception)

+	{

+		parent::report($exception);

+	}

 

-    /**

-     * Render an exception into an HTTP response.

-     *

-     * @param  \Illuminate\Http\Request  $request

-     * @param  \Throwable  $exception

-     * @return \Symfony\Component\HttpFoundation\Response

-     *

-     * @throws \Throwable

-     */

-    public function render($request, Throwable $exception)

-    {

-        $errors = $this->getErrorHandlers();

+	/**

+	 * Render an exception into an HTTP response.

+	 *

+	 * @param  \Illuminate\Http\Request  $request

+	 * @param  \Throwable  $exception

+	 * @return \Symfony\Component\HttpFoundation\Response

+	 *

+	 * @throws \Throwable

+	 */

+	public function render($request, Throwable $exception)

+	{

+		$errors = $this->getErrorHandlers();

 

-        if ($request->wantsJson()) {

-            $exceptionClass = get_class($exception);

-            return Arr::has($errors, $exceptionClass) ? $errors[$exceptionClass]($request, $exception) : parent::render($request, $exception);

-        }

+		if ($request->wantsJson()) {

+			$exceptionClass = get_class($exception);

+			return Arr::has($errors, $exceptionClass) ? $errors[$exceptionClass]($request, $exception) : parent::render($request, $exception);

+		}

 

-        return parent::render($request, $exception);

-    }

+		return parent::render($request, $exception);

+	}

 

-    /**

-     * Return handler for defined error types

-     *

-     * @return  array

-     */

-    protected function getErrorHandlers()

-    {

-        return [

-            \Illuminate\Auth\AuthenticationException::class => function ($request, $exception) {

-                Errors::unAuthorized();

-            },

-            \Illuminate\Database\QueryException::class => function ($request, $exception) {

-                Errors::dbQueryError();

-            },

-            \predis\connection\connectionexception::class => function ($request, $exception) {

-                Errors::redisNotRunning();

-            },

-            \RedisException::class => function ($request, $exception) {

-                Errors::redisNotRunning();

-            },

-            \GuzzleHttp\Exception\ClientException::class => function ($request, $exception) {

-                Errors::connectionError();

-            },

-            \Symfony\Component\HttpKernel\Exception\HttpException::class => function ($request, $exception) {

-                return response()->json(['errors' => [$exception->getStatusCode() === 404 ? ($exception->getMessage() ?: 'not found') : $exception->getMessage()]], $exception->getStatusCode());

-            },

-            \Illuminate\Validation\ValidationException::class => function ($request, $exception) {

-                return response()->json(['errors' => $exception->errors()], 422);

-            }

-        ];

-    }

+	/**

+	 * Return handler for defined error types

+	 *

+	 * @return  array

+	 */

+	protected function getErrorHandlers()

+	{

+		return [

+			\Illuminate\Auth\AuthenticationException::class => function ($request, $exception) {

+				Errors::unAuthorized();

+			},

+			\Illuminate\Database\QueryException::class => function ($request, $exception) {

+				Errors::dbQueryError();

+			},

+			\predis\connection\connectionexception::class => function ($request, $exception) {

+				Errors::redisNotRunning();

+			},

+			\RedisException::class => function ($request, $exception) {

+				Errors::redisNotRunning();

+			},

+			\GuzzleHttp\Exception\ClientException::class => function ($request, $exception) {

+				Errors::connectionError();

+			},

+			\Symfony\Component\HttpKernel\Exception\HttpException::class => function ($request, $exception) {

+				return response()->json(['errors' => [$exception->getStatusCode() === 404 ? ($exception->getMessage() ?: 'not found') : $exception->getMessage()]], $exception->getStatusCode());

+			},

+			\Illuminate\Validation\ValidationException::class => function ($request, $exception) {

+				return response()->json(['errors' => $exception->errors()], 422);

+			}

+		];

+	}

 }

Spacing +7 added lines, -7 removed lines

@@ -70,25 +70,25 @@
     protected function getErrorHandlers()

     {

         return [

-            \Illuminate\Auth\AuthenticationException::class => function ($request, $exception) {

+            \Illuminate\Auth\AuthenticationException::class => function($request, $exception) {

                 Errors::unAuthorized();

             },

-            \Illuminate\Database\QueryException::class => function ($request, $exception) {

+            \Illuminate\Database\QueryException::class => function($request, $exception) {

                 Errors::dbQueryError();

             },

-            \predis\connection\connectionexception::class => function ($request, $exception) {

+            \predis\connection\connectionexception::class => function($request, $exception) {

                 Errors::redisNotRunning();

             },

-            \RedisException::class => function ($request, $exception) {

+            \RedisException::class => function($request, $exception) {

                 Errors::redisNotRunning();

             },

-            \GuzzleHttp\Exception\ClientException::class => function ($request, $exception) {

+            \GuzzleHttp\Exception\ClientException::class => function($request, $exception) {

                 Errors::connectionError();

             },

-            \Symfony\Component\HttpKernel\Exception\HttpException::class => function ($request, $exception) {

+            \Symfony\Component\HttpKernel\Exception\HttpException::class => function($request, $exception) {

                 return response()->json(['errors' => [$exception->getStatusCode() === 404 ? ($exception->getMessage() ?: 'not found') : $exception->getMessage()]], $exception->getStatusCode());

             },

-            \Illuminate\Validation\ValidationException::class => function ($request, $exception) {

+            \Illuminate\Validation\ValidationException::class => function($request, $exception) {

                 return response()->json(['errors' => $exception->errors()], 422);

             }

         ];

files/EventServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -8,29 +8,29 @@
 
 class EventServiceProvider extends ServiceProvider
 {
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        Registered::class => [
-            SendEmailVerificationNotification::class,
-        ],
-        \SocialiteProviders\Manager\SocialiteWasCalled::class => [
-            'SocialiteProviders\\Apple\\AppleExtendSocialite@handle',
-        ],
-    ];
+	/**
+	 * The event listener mappings for the application.
+	 *
+	 * @var array
+	 */
+	protected $listen = [
+		Registered::class => [
+			SendEmailVerificationNotification::class,
+		],
+		\SocialiteProviders\Manager\SocialiteWasCalled::class => [
+			'SocialiteProviders\\Apple\\AppleExtendSocialite@handle',
+		],
+	];
 
-    /**
-     * Register any events for your application.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
+	/**
+	 * Register any events for your application.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		parent::boot();
 
-        //
-    }
+		//
+	}
 }

files/HttpKernel.php

Indentation +75 added lines, -75 removed lines

@@ -6,83 +6,83 @@
 

 class Kernel extends HttpKernel

 {

-    /**

-     * The application's global HTTP middleware stack.

-     *

-     * These middleware are run during every request to your application.

-     *

-     * @var array

-     */

-    protected $middleware = [

-        \Fruitcake\Cors\HandleCors::class,

-        \App\Http\Middleware\TrustProxies::class,

-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

-        \App\Http\Middleware\TrimStrings::class,

-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

-    ];

+	/**

+	 * The application's global HTTP middleware stack.

+	 *

+	 * These middleware are run during every request to your application.

+	 *

+	 * @var array

+	 */

+	protected $middleware = [

+		\Fruitcake\Cors\HandleCors::class,

+		\App\Http\Middleware\TrustProxies::class,

+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

+		\App\Http\Middleware\TrimStrings::class,

+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

+	];

 

-    /**

-     * The application's route middleware groups.

-     *

-     * @var array

-     */

-    protected $middlewareGroups = [

-        'web' => [

-            \App\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

-            \Illuminate\Session\Middleware\StartSession::class,

-            // \Illuminate\Session\Middleware\AuthenticateSession::class,

-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \App\Http\Middleware\VerifyCsrfToken::class,

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            'etag'

-        ],

+	/**

+	 * The application's route middleware groups.

+	 *

+	 * @var array

+	 */

+	protected $middlewareGroups = [

+		'web' => [

+			\App\Http\Middleware\EncryptCookies::class,

+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

+			\Illuminate\Session\Middleware\StartSession::class,

+			// \Illuminate\Session\Middleware\AuthenticateSession::class,

+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+			\App\Http\Middleware\VerifyCsrfToken::class,

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			'etag'

+		],

 

-        'api' => [

-            'throttle:60,1',

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            \App\Modules\Core\Http\Middleware\SetSessions::class,

-            \App\Modules\Core\Http\Middleware\CheckPermissions::class,

-            \App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

-            \App\Modules\Core\Http\Middleware\SetRelations::class,

-            'etag'

-        ],

-    ];

+		'api' => [

+			'throttle:60,1',

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			\App\Modules\Core\Http\Middleware\SetSessions::class,

+			\App\Modules\Core\Http\Middleware\CheckPermissions::class,

+			\App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

+			\App\Modules\Core\Http\Middleware\SetRelations::class,

+			'etag'

+		],

+	];

 

-    /**

-     * The application's route middleware.

-     *

-     * These middleware may be assigned to groups or used individually.

-     *

-     * @var array

-     */

-    protected $routeMiddleware = [

-        'auth' => \App\Http\Middleware\Authenticate::class,

-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

-        'can' => \Illuminate\Auth\Middleware\Authorize::class,

-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

-    ];

+	/**

+	 * The application's route middleware.

+	 *

+	 * These middleware may be assigned to groups or used individually.

+	 *

+	 * @var array

+	 */

+	protected $routeMiddleware = [

+		'auth' => \App\Http\Middleware\Authenticate::class,

+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

+		'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

+		'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

+		'can' => \Illuminate\Auth\Middleware\Authorize::class,

+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

+		'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

+		'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

+		'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

+	];

 

-    /**

-     * The priority-sorted list of middleware.

-     *

-     * This forces non-global middleware to always be in the given order.

-     *

-     * @var array

-     */

-    protected $middlewarePriority = [

-        \Illuminate\Session\Middleware\StartSession::class,

-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-        \App\Http\Middleware\Authenticate::class,

-        \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        \Illuminate\Session\Middleware\AuthenticateSession::class,

-        \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        \Illuminate\Auth\Middleware\Authorize::class,

-    ];

+	/**

+	 * The priority-sorted list of middleware.

+	 *

+	 * This forces non-global middleware to always be in the given order.

+	 *

+	 * @var array

+	 */

+	protected $middlewarePriority = [

+		\Illuminate\Session\Middleware\StartSession::class,

+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+		\App\Http\Middleware\Authenticate::class,

+		\Illuminate\Routing\Middleware\ThrottleRequests::class,

+		\Illuminate\Session\Middleware\AuthenticateSession::class,

+		\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		\Illuminate\Auth\Middleware\Authorize::class,

+	];

 }

src/ApiSkeletonServiceProvider.php

Indentation +36 added lines, -36 removed lines

@@ -6,42 +6,42 @@
 

 class ApiSkeletonServiceProvider extends ServiceProvider

 {

-    /**

-     * Perform post-registration booting of services.

-     *

-     * @return void

-     */

-    public function boot()

-    {

-        $this->publishes([

-            __DIR__.'/Modules'                               => app_path('Modules'),

-            __DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

-            __DIR__.'/../lang'                               => base_path('resources/lang'),

-            __DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

-            __DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

-            __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

-            __DIR__.'/../files/EventServiceProvider.php'     => app_path('Providers/EventServiceProvider.php'),

-            __DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

-            __DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

-            __DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

-            __DIR__.'/../files/Jenkinsfile'                  => base_path('/Jenkinsfile'),

-            __DIR__.'/../files/phpcs.xml'                    => base_path('/phpcs.xml'),

-            __DIR__.'/../files/docker'                       => base_path('/docker'),

-            __DIR__.'/../files/.dockerignore'                => base_path('/.dockerignore'),

-        ]);

+	/**

+	 * Perform post-registration booting of services.

+	 *

+	 * @return void

+	 */

+	public function boot()

+	{

+		$this->publishes([

+			__DIR__.'/Modules'                               => app_path('Modules'),

+			__DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

+			__DIR__.'/../lang'                               => base_path('resources/lang'),

+			__DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

+			__DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

+			__DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

+			__DIR__.'/../files/EventServiceProvider.php'     => app_path('Providers/EventServiceProvider.php'),

+			__DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

+			__DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

+			__DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

+			__DIR__.'/../files/Jenkinsfile'                  => base_path('/Jenkinsfile'),

+			__DIR__.'/../files/phpcs.xml'                    => base_path('/phpcs.xml'),

+			__DIR__.'/../files/docker'                       => base_path('/docker'),

+			__DIR__.'/../files/.dockerignore'                => base_path('/.dockerignore'),

+		]);

 

-        $this->publishes([

-            __DIR__.'/../files/auth.php' => config_path('auth.php'),

-        ], 'config');

-    }

+		$this->publishes([

+			__DIR__.'/../files/auth.php' => config_path('auth.php'),

+		], 'config');

+	}

 

-    /**

-     * Register any package services.

-     *

-     * @return void

-     */

-    public function register()

-    {

-        //

-    }

+	/**

+	 * Register any package services.

+	 *

+	 * @return void

+	 */

+	public function register()

+	{

+		//

+	}

 }

src/Modules/Reporting/Providers/ModuleServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -6,29 +6,29 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
 
-        $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('reporting', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('reporting', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
 
         $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('reporting', 'Config', 'app'));
         }
     }