SherifElfadaly / Laravel-Api-Skeleton

src/Modules/OauthClients/OauthClient.php

Indentation +19 added lines, -19 removed lines

@@ -8,27 +8,27 @@
 
 class OauthClient extends Client
 {
-    protected $dates    = ['created_at', 'updated_at'];
-    protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
+	protected $dates    = ['created_at', 'updated_at'];
+	protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public function user()
-    {
-        return $this->belongsTo(AclUser::class);
-    }
+	public function user()
+	{
+		return $this->belongsTo(AclUser::class);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        OauthClient::observe(OauthClientObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		OauthClient::observe(OauthClientObserver::class);
+	}
 }

src/Modules/Roles/Role.php

Indentation +37 added lines, -37 removed lines

@@ -9,41 +9,41 @@
 class Role extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'roles';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name'];
-
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function users()
-    {
-        return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
-
-    public function permissions()
-    {
-        return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        Role::observe(RoleObserver::class);
-    }
+	use SoftDeletes;
+	protected $table    = 'roles';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name'];
+
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function users()
+	{
+		return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
+
+	public function permissions()
+	{
+		return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		Role::observe(RoleObserver::class);
+	}
 }

src/Modules/Users/AclUser.php

Indentation +126 added lines, -126 removed lines

@@ -11,132 +11,132 @@
 class AclUser extends User
 {
 
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = \Hash::make($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany(OauthClient::class, 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = \Hash::make($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany(OauthClient::class, 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(AclUserObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(AclUserObserver::class);
+	}
 }

src/Modules/Reporting/Report.php

Indentation +23 added lines, -23 removed lines

@@ -7,31 +7,31 @@
 class Report extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'reports';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['report_name', 'view_name'];
+	use SoftDeletes;
+	protected $table    = 'reports';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['report_name', 'view_name'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        Report::observe(ReportObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Report::observe(ReportObserver::class);
+	}
 }

src/Modules/Core/Interfaces/BaseRepositoryInterface.php

Indentation +82 added lines, -82 removed lines

@@ -2,93 +2,93 @@
 
 interface BaseRepositoryInterface
 {
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array  $relations
-     * @param  array  $sortBy
-     * @param  array  $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array  $relations
+	 * @param  array  $sortBy
+	 * @param  array  $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $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  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $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  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-     /**
-      * Save the given model/models to the storage.
-      *
-      * @param  array   $data
-      * @return mixed
-      */
-    public function save(array $data);
+	 /**
+	  * Save the given model/models to the storage.
+	  *
+	  * @param  array   $data
+	  * @return mixed
+	  */
+	public function save(array $data);
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var     $value condition value
-     * @param  string  $attribute condition column name
-     * @return integer affected rows
-     */
-    public function delete($value, $attribute = 'id');
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var     $value condition value
+	 * @param  string  $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function delete($value, $attribute = 'id');
     
-    /**
-     * 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 = ['*']);
+	/**
+	 * 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 = ['*']);
     
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-    /**
-     * Fetch the first record fro 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 = ['*']);
+	/**
+	 * Fetch the first record fro 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 = ['*']);
 }

src/Modules/Core/Interfaces/BaseServiceInterface.php

Indentation +82 added lines, -82 removed lines

@@ -2,93 +2,93 @@
 
 interface BaseServiceInterface
 {
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array  $relations
-     * @param  array  $sortBy
-     * @param  array  $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array  $relations
+	 * @param  array  $sortBy
+	 * @param  array  $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $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  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $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  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-     /**
-      * Save the given model/models to the storage.
-      *
-      * @param  array   $data
-      * @return mixed
-      */
-    public function save(array $data);
+	 /**
+	  * Save the given model/models to the storage.
+	  *
+	  * @param  array   $data
+	  * @return mixed
+	  */
+	public function save(array $data);
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var     $value condition value
-     * @param  string  $attribute condition column name
-     * @return integer affected rows
-     */
-    public function delete($value, $attribute = 'id');
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var     $value condition value
+	 * @param  string  $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function delete($value, $attribute = 'id');
     
-    /**
-     * 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 = ['*']);
+	/**
+	 * 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 = ['*']);
     
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = ['*']);
 
-    /**
-     * Fetch the first record fro 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 = ['*']);
+	/**
+	 * Fetch the first record fro 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 = ['*']);
 }

src/Modules/Users/Repositories/UserRepository.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Modules\Users\Repositories;
 
 use App\Modules\Core\BaseClasses\BaseRepository;
-use Illuminate\Support\Arr;
 use App\Modules\Users\AclUser;
 
 class UserRepository extends BaseRepository

Indentation +45 added lines, -45 removed lines

@@ -6,52 +6,52 @@
 
 class UserRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   AclUser $model
-     * @return  void
-     */
-    public function __construct(AclUser $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   AclUser $model
+	 * @return  void
+	 */
+	public function __construct(AclUser $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Detach all roles from the given role.
-     *
-     * @param  mixed $role
-     * @return object
-     */
-    public function detachRoles($role)
-    {
-        $role = ! is_int($role) ? $role : $this->find($role);
-        $role->roles()->detach();
-    }
+	/**
+	 * Detach all roles from the given role.
+	 *
+	 * @param  mixed $role
+	 * @return object
+	 */
+	public function detachRoles($role)
+	{
+		$role = ! is_int($role) ? $role : $this->find($role);
+		$role->roles()->detach();
+	}
 
-    /**
-     * Attach role ids to the given role.
-     *
-     * @param  mixed $role
-     * @param  array $roleIds
-     * @return object
-     */
-    public function attachRoles($role, $roleIds)
-    {
-        $role = ! is_int($role) ? $role : $this->find($role);
-        $role->roles()->attach($roleIds);
-    }
+	/**
+	 * Attach role ids to the given role.
+	 *
+	 * @param  mixed $role
+	 * @param  array $roleIds
+	 * @return object
+	 */
+	public function attachRoles($role, $roleIds)
+	{
+		$role = ! is_int($role) ? $role : $this->find($role);
+		$role->roles()->attach($roleIds);
+	}
 
-    /**
-     * Count the given user the given roles.
-     *
-     * @param  mixed    $user
-     * @param  string[] $roles
-     * @return boolean
-     */
-    public function countRoles($user, $roles)
-    {
-        $user = ! is_int($user) ? $user : $this->find($user);
-        return $user->roles()->whereIn('name', $roles)->count();
-    }
+	/**
+	 * Count the given user the given roles.
+	 *
+	 * @param  mixed    $user
+	 * @param  string[] $roles
+	 * @return boolean
+	 */
+	public function countRoles($user, $roles)
+	{
+		$user = ! is_int($user) ? $user : $this->find($user);
+		return $user->roles()->whereIn('name', $roles)->count();
+	}
 }

src/Modules/Permissions/Resources/Lang/en/errors.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
+	/**
+	 * Here goes your error messages.
+	 */
 
 ];

src/Modules/Permissions/Permission.php

Indentation +31 added lines, -31 removed lines

@@ -10,36 +10,36 @@
 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'];
-
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	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 getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    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 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);
+	}
 }