SherifElfadaly / Laravel-Api-Skeleton

src/Modules/PushNotificationDevices/PushNotificationDevice.php

Indentation +25 added lines, -25 removed lines

@@ -10,32 +10,32 @@
 class PushNotificationDevice extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'push_notification_devices';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at', 'access_token'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['device_token', 'user_id', 'access_token'];
+	use SoftDeletes;
+	protected $table    = 'push_notification_devices';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at', 'access_token'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['device_token', 'user_id', 'access_token'];
     
-    public function user()
-    {
-        return $this->belongsTo(AclUser::class);
-    }
+	public function user()
+	{
+		return $this->belongsTo(AclUser::class);
+	}
 
-    /**
-     * Encrypt the access_token attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setLoginTokenAttribute($value)
-    {
-        $this->attributes['access_token'] = encrypt($value);
-    }
+	/**
+	 * Encrypt the access_token attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setLoginTokenAttribute($value)
+	{
+		$this->attributes['access_token'] = encrypt($value);
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        PushNotificationDevice::observe(PushNotificationDeviceObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		PushNotificationDevice::observe(PushNotificationDeviceObserver::class);
+	}
 }

src/Modules/Core/Database/Migrations/2018_08_08_100000_create_telescope_entries_table.php

Indentation +69 added lines, -69 removed lines

@@ -6,82 +6,82 @@
 
 class CreateTelescopeEntriesTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
+	/**
+	 * The database schema.
+	 *
+	 * @var \Illuminate\Database\Schema\Builder
+	 */
+	protected $schema;
 
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
+	/**
+	 * Create a new migration instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$this->schema = Schema::connection($this->getConnection());
+	}
 
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('telescope.storage.database.connection');
-    }
+	/**
+	 * Get the migration connection name.
+	 *
+	 * @return string|null
+	 */
+	public function getConnection()
+	{
+		return config('telescope.storage.database.connection');
+	}
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $this->schema->create('telescope_entries', function (Blueprint $table) {
-            $table->bigIncrements('sequence');
-            $table->uuid('uuid');
-            $table->uuid('batch_id');
-            $table->string('family_hash')->nullable()->index();
-            $table->boolean('should_display_on_index')->default(true);
-            $table->string('type', 20);
-            $table->longText('content');
-            $table->dateTime('created_at')->nullable();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->schema->create('telescope_entries', function (Blueprint $table) {
+			$table->bigIncrements('sequence');
+			$table->uuid('uuid');
+			$table->uuid('batch_id');
+			$table->string('family_hash')->nullable()->index();
+			$table->boolean('should_display_on_index')->default(true);
+			$table->string('type', 20);
+			$table->longText('content');
+			$table->dateTime('created_at')->nullable();
 
-            $table->unique('uuid');
-            $table->index('batch_id');
-            $table->index(['type', 'should_display_on_index']);
-        });
+			$table->unique('uuid');
+			$table->index('batch_id');
+			$table->index(['type', 'should_display_on_index']);
+		});
 
-        $this->schema->create('telescope_entries_tags', function (Blueprint $table) {
-            $table->uuid('entry_uuid');
-            $table->string('tag');
+		$this->schema->create('telescope_entries_tags', function (Blueprint $table) {
+			$table->uuid('entry_uuid');
+			$table->string('tag');
 
-            $table->index(['entry_uuid', 'tag']);
-            $table->index('tag');
+			$table->index(['entry_uuid', 'tag']);
+			$table->index('tag');
 
-            $table->foreign('entry_uuid')
-                  ->references('uuid')
-                  ->on('telescope_entries')
-                  ->onDelete('cascade');
-        });
+			$table->foreign('entry_uuid')
+				  ->references('uuid')
+				  ->on('telescope_entries')
+				  ->onDelete('cascade');
+		});
 
-        $this->schema->create('telescope_monitoring', function (Blueprint $table) {
-            $table->string('tag');
-        });
-    }
+		$this->schema->create('telescope_monitoring', function (Blueprint $table) {
+			$table->string('tag');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $this->schema->dropIfExists('telescope_entries_tags');
-        $this->schema->dropIfExists('telescope_entries');
-        $this->schema->dropIfExists('telescope_monitoring');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		$this->schema->dropIfExists('telescope_entries_tags');
+		$this->schema->dropIfExists('telescope_entries');
+		$this->schema->dropIfExists('telescope_monitoring');
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function up()
     {
-        $this->schema->create('telescope_entries', function (Blueprint $table) {
+        $this->schema->create('telescope_entries', function(Blueprint $table) {
             $table->bigIncrements('sequence');
             $table->uuid('uuid');
             $table->uuid('batch_id');
@@ -55,7 +55,7 @@ 
             $table->index(['type', 'should_display_on_index']);
         });
 
-        $this->schema->create('telescope_entries_tags', function (Blueprint $table) {
+        $this->schema->create('telescope_entries_tags', function(Blueprint $table) {
             $table->uuid('entry_uuid');
             $table->string('tag');
 
@@ -68,7 +68,7 @@ 
                   ->onDelete('cascade');
         });
 
-        $this->schema->create('telescope_monitoring', function (Blueprint $table) {
+        $this->schema->create('telescope_monitoring', function(Blueprint $table) {
             $table->string('tag');
         });
     }

src/Modules/Core/Setting.php

Indentation +15 added lines, -15 removed lines

@@ -9,21 +9,21 @@
 class Setting extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'settings';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id', 'key'];
-    protected $fillable = ['name', 'value'];
+	use SoftDeletes;
+	protected $table    = 'settings';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id', 'key'];
+	protected $fillable = ['name', 'value'];
     
-    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);
+	}
 }

src/Modules/Core/Errors/Errors.php

Indentation +23 added lines, -23 removed lines

@@ -6,28 +6,28 @@
 
 class Errors implements BaseFactoryInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'];
-            $class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'];
+			$class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
 
-            if (class_exists($class)) {
-                $class = \App::make($class);
-                if (method_exists($class, $name)) {
-                    return call_user_func_array([$class, $name], $arguments);
-                }
-            }
-        }
-    }
+			if (class_exists($class)) {
+				$class = \App::make($class);
+				if (method_exists($class, $name)) {
+					return call_user_func_array([$class, $name], $arguments);
+				}
+			}
+		}
+	}
 }

src/Modules/Core/BaseClasses/BaseRepository.php

Indentation +534 added lines, -534 removed lines

@@ -8,548 +8,548 @@
 
 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);
-    }
+	/**
+	 * 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);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        \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)
+	{
+		\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);
-        });
+			$model     = $this->prepareModel($data);
+			$relations = $this->prepareRelations($data, $model);
+			$model     = $this->saveModel($model, $relations);
+		});
         
-        if (count($relations)) {
-            $model->load(...array_keys($relations));
-        }
-
-        return $model;
-    }
-
-    /**
-     * 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();
-            });
-        });
-    }
+		if (count($relations)) {
+			$model->load(...array_keys($relations));
+		}
+
+		return $model;
+	}
+
+	/**
+	 * 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 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']);
-                            }
-
-                            /**
-                             * 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) {
-                                    $relationModel->$attr = $val;
-                                }
-                            }
-
-                            $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)
-    {
-
-        /**
-         * 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()) {
-                $model->$key()->delete();
-            } 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':
-                            $val->save();
-                            $ids[] = $val->id;
-                            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':
-                        $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 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']);
+							}
+
+							/**
+							 * 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) {
+									$relationModel->$attr = $val;
+								}
+							}
+
+							$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)
+	{
+
+		/**
+		 * 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()) {
+				$model->$key()->delete();
+			} 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':
+							$val->save();
+							$ids[] = $val->id;
+							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':
+						$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) == 'null') {
-                    $conditionString .= $key.' is null {op} ';
-                } elseif (strtolower($operator) == 'not null') {
-                    $conditionString .= $key.' is not null {op} ';
-                } elseif (strtolower($operator) == 'has') {
-                    $sql              = $model->withTrashed()->has($key)->toSql();
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
-                    $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) == 'null') {
+					$conditionString .= $key.' is null {op} ';
+				} elseif (strtolower($operator) == 'not null') {
+					$conditionString .= $key.' is not null {op} ';
+				} elseif (strtolower($operator) == 'has') {
+					$sql              = $model->withTrashed()->has($key)->toSql();
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
+					$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.')';
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function __construct($model)
     {
-        $this->model  = $model;
+        $this->model = $model;
     }
 
     /**
@@ -86,7 +86,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);
@@ -110,8 +110,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();
             });
         });
@@ -201,7 +201,7 @@ 
     {
         $model = $this->model->onlyTrashed()->find($id);
 
-        if (! $model) {
+        if ( ! $model) {
             \Errors::notFound(class_basename($this->model).' with id : '.$id);
         }
 
@@ -225,7 +225,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']);
         }
 
@@ -282,7 +282,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';
                     }
                 }
@@ -309,7 +309,7 @@ 
                             /**
                              * If model doesn't exists.
                              */
-                            if (! $relationModel) {
+                            if ( ! $relationModel) {
                                 \Errors::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                             }
 
@@ -340,7 +340,7 @@ 
                                 /**
                                  * If model doesn't exists.
                                  */
-                                if (! $relationModel) {
+                                if ( ! $relationModel) {
                                     \Errors::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                 }
 
@@ -546,7 +546,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('.'));
         

src/Modules/Core/Console/Commands/Stubs/Module/DummyModel.php

Indentation +11 added lines, -11 removed lines

@@ -8,16 +8,16 @@
 
 class DummyModel extends Model
 {
-    use SoftDeletes;
-    protected $table    = 'DummyTableName';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = []; // Add attributes here
+	use SoftDeletes;
+	protected $table    = 'DummyTableName';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = []; // Add attributes here
     
-    public static function boot()
-    {
-        parent::boot();
-        DummyModel::observe(DummyObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		DummyModel::observe(DummyObserver::class);
+	}
 }

src/Modules/Core/Http/Middleware/UpdateLocaleAndTimezone.php

Indentation +44 added lines, -44 removed lines

@@ -8,53 +8,53 @@
 
 class UpdateLocaleAndTimezone
 {
-    protected $session;
-    protected $auth;
+	protected $session;
+	protected $auth;
     
-    /**
-     * Init new object.
-     *
-     * @param   Session      $session
-     * @param   Auth         $auth
-     * @param   Errors       $errors
-     *
-     * @return  void
-     */
-    public function __construct(Session $session, Auth $auth)
-    {
-        $this->session = $session;
-        $this->auth = $auth;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Session      $session
+	 * @param   Auth         $auth
+	 * @param   Errors       $errors
+	 *
+	 * @return  void
+	 */
+	public function __construct(Session $session, Auth $auth)
+	{
+		$this->session = $session;
+		$this->auth = $auth;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $update = false;
-        $user   = $this->auth->user();
-        if ($user) {
-            $locale   = $this->session->get('locale');
-            $timezone = $this->session->get('time-zone');
-            if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-                $user->locale = $locale;
-                $update       = true;
-            }
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$update = false;
+		$user   = $this->auth->user();
+		if ($user) {
+			$locale   = $this->session->get('locale');
+			$timezone = $this->session->get('time-zone');
+			if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+				$user->locale = $locale;
+				$update       = true;
+			}
     
-            if ($timezone && $timezone !== $user->timezone) {
-                $user->timezone = $timezone;
-                $update         = true;
-            }
+			if ($timezone && $timezone !== $user->timezone) {
+				$user->timezone = $timezone;
+				$update         = true;
+			}
     
-            if ($update) {
-                $user->save();
-            }
-        }
+			if ($update) {
+				$user->save();
+			}
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Http/Middleware/SetSessions.php

Indentation +31 added lines, -31 removed lines

@@ -8,39 +8,39 @@
 
 class SetSessions
 {
-    protected $app;
-    protected $session;
+	protected $app;
+	protected $session;
     
-    /**
-     * Init new object.
-     *
-     * @param   App      $app
-     * @param   Session  $session
-     *
-     * @return  void
-     */
-    public function __construct(App $app, Session $session)
-    {
-        $this->app = $app;
-        $this->session = $session;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   App      $app
+	 * @param   Session  $session
+	 *
+	 * @return  void
+	 */
+	public function __construct(App $app, Session $session)
+	{
+		$this->app = $app;
+		$this->session = $session;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $locale = $request->header('locale', 'en');
-        $timeZone = $request->header('time-zone', 0);
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$locale = $request->header('locale', 'en');
+		$timeZone = $request->header('time-zone', 0);
 
-        $this->session->put('time-zone', $timeZone);
-        $this->session->put('locale', $locale);
-        $this->app->setLocale($locale);
+		$this->session->put('time-zone', $timeZone);
+		$this->session->put('locale', $locale);
+		$this->app->setLocale($locale);
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Permissions/Permission.php

Indentation +15 added lines, -15 removed lines

@@ -10,21 +10,21 @@
 class Permission extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'permissions';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'model'];
+	use SoftDeletes;
+	protected $table    = 'permissions';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'model'];
     
-    public function roles()
-    {
-        return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id')->whereNull('permission_role.deleted_at')->withTimestamps();
-    }
+	public function roles()
+	{
+		return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id')->whereNull('permission_role.deleted_at')->withTimestamps();
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Permission::observe(PermissionObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Permission::observe(PermissionObserver::class);
+	}
 }