SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Notifications/Database/Factories/PushNotificationDeviceFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function(Faker\Generator $faker) {
     return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),

Indentation +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),
 		'created_at'   => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at'   => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });
\ No newline at end of file

src/Modules/V1/Notifications/Database/Migrations/2016_01_24_111942_push_notifications_devices.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			$table->unique(array('device_token', 'user_id'));
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
 			$table->increments('id');
 			$table->string('device_token');
 			$table->integer('user_id');

src/Modules/V1/Notifications/Database/Migrations/2017_10_26_154804_create_jobs_table.php

Indentation +27 added lines, -27 removed lines

@@ -6,33 +6,33 @@
 
 class CreateJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue');
-            $table->longText('payload');
-            $table->tinyInteger('attempts')->unsigned();
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('jobs', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('queue');
+			$table->longText('payload');
+			$table->tinyInteger('attempts')->unsigned();
+			$table->unsignedInteger('reserved_at')->nullable();
+			$table->unsignedInteger('available_at');
+			$table->unsignedInteger('created_at');
 
-            $table->index(['queue', 'reserved_at']);
-        });
-    }
+			$table->index(['queue', 'reserved_at']);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('jobs');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('jobs', function (Blueprint $table) {
+        Schema::create('jobs', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('queue');
             $table->longText('payload');

src/Modules/V1/Acl/AclUser.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use App\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Notifications\Notifiable;
 use Laravel\Passport\HasApiTokens;
 
 class AclUser extends User {

Indentation +73 added lines, -73 removed lines

@@ -7,89 +7,89 @@
 
 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 = ['name', 'email', 'password'];
-    public $searchable  = ['name', 'email'];
+	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 = ['name', 'email', 'password'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     * 
-     * @param string $value 
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 * 
+	 * @param string $value 
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
 
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
 
-    /**
-     * Return fcm device tokens related to the user.
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
+	/**
+	 * Return fcm device tokens related to the user.
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
 
-        foreach ($devices as $device) 
-        {
-            $accessToken = decrypt($device->access_token);
+		foreach ($devices as $device) 
+		{
+			$accessToken = decrypt($device->access_token);
 
-            try
-            {
-                if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
-                {
-                    continue;
-                }
+			try
+			{
+				if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
+				{
+					continue;
+				}
 
-                $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
-            {
-                $device->forceDelete();
-            }
-        }
+				$tokens[] = $device->device_token;
+			} 
+			catch (\Exception $e) 
+			{
+				$device->forceDelete();
+			}
+		}
 
-        return $tokens;
-    }
+		return $tokens;
+	}
 
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.' . $this->id;
-    }
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.' . $this->id;
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     use SoftDeletes, HasApiTokens;
     protected $table    = 'users';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
+    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
     protected $guarded  = ['id'];
     protected $fillable = ['name', 'email', 'password'];
     public $searchable  = ['name', 'email'];
@@ -43,7 +43,7 @@ 
 
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function receivesBroadcastNotificationsOn()
     {
-        return 'users.' . $this->id;
+        return 'users.'.$this->id;
     }
     
     public static function boot()

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
                 }
 
                 $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 $device->forceDelete();
             }

src/Modules/V1/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -50,7 +50,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -164,7 +164,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -182,7 +182,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -197,7 +197,7 @@ 
     /**
      * Save the given model to the storage.
      * 
-     * @param  array   $data
+     * @param  string   $data
      * @return void
      */
     public function save(array $data)
@@ -442,7 +442,7 @@ 
      * Update record in the storage based on the given
      * condition.
      * 
-     * @param  var $value condition value
+     * @param  integer $value condition value
      * @param  array $data
      * @param  string $attribute condition column name
      * @return void
@@ -515,7 +515,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -547,7 +547,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */

Indentation +682 added lines, -682 removed lines

@@ -4,699 +4,699 @@
 
 abstract class AbstractRepository implements RepositoryInterface
 {
-    /**
-     * The model implementation.
-     * 
-     * @var model
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var model
+	 */
+	public $model;
     
-    /**
-     * The config implementation.
-     * 
-     * @var config
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var config
+	 */
+	protected $config;
     
-    /**
-     * Create new AbstractRepository instance.
-     */
-    public function __construct()
-    {   
-        $this->config = \CoreConfig::getConfig();
-        $this->model  = \App::make($this->getModel());
-    }
-
-    /**
-     * 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 = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch all records with relations from storage in pages 
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $model            = call_user_func_array("{$this->getModel()}::with", array($relations));
-        $conditionColumns = $this->model->searchable;
-        $sort             = $desc ? 'desc' : 'asc';
-
-        /**
-         * Construct the select conditions for the model.
-         */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-
-            if (count($conditionColumns)) 
-            {
-                $column = 'LOWER(' . array_shift($conditionColumns) . ')';
-                if (str_contains($column, '->')) 
-                {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                /**
-                 * Use the first element in the model columns to construct the first condition.
-                 */
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the rest of the columns to construct or where conditions.
-             */
-            foreach ($conditionColumns as $column) 
-            {
-                $column = 'LOWER(' . $column . ')';
-                if (str_contains($column, '->')) 
-                {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the model relations.
-             */
-            foreach ($relations as $relation) 
-            {
-                /**
-                 * Remove the sub relation if exists.
-                 */
-                $relation = explode('.', $relation)[0];
-
-                /**
-                 * Try to fetch the relation repository from the core.
-                 */
-                if (\Core::$relation()) 
-                {
-                    /**
-                     * Construct the relation condition.
-                     */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
-
-                        $subModel->where(function ($q) use ($query, $relation){
-
-                            /**
-                             * Get columns of the relation.
-                             */
-                            $subConditionColumns = \Core::$relation()->model->searchable;
-
-                            if (count($subConditionColumns)) 
-                            {
-
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
-                                if (str_contains($column, '->')) 
-                                {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
-
-                                /**
-                                * Use the first element in the relation model columns to construct the first condition.
-                                 */
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-                            }
-
-                            /**
-                             * Loop through the rest of the columns to construct or where conditions.
-                             */
-                            foreach ($subConditionColumns as $subConditionColumn)
-                            {
-                                $column = 'LOWER(' . $subConditionColumn . ')';
-                                if (str_contains($column, '->')) 
-                                {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
+	/**
+	 * Create new AbstractRepository instance.
+	 */
+	public function __construct()
+	{   
+		$this->config = \CoreConfig::getConfig();
+		$this->model  = \App::make($this->getModel());
+	}
+
+	/**
+	 * 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 = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch all records with relations from storage in pages 
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$model            = call_user_func_array("{$this->getModel()}::with", array($relations));
+		$conditionColumns = $this->model->searchable;
+		$sort             = $desc ? 'desc' : 'asc';
+
+		/**
+		 * Construct the select conditions for the model.
+		 */
+		$model->where(function ($q) use ($query, $conditionColumns, $relations){
+
+			if (count($conditionColumns)) 
+			{
+				$column = 'LOWER(' . array_shift($conditionColumns) . ')';
+				if (str_contains($column, '->')) 
+				{
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				/**
+				 * Use the first element in the model columns to construct the first condition.
+				 */
+				$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the rest of the columns to construct or where conditions.
+			 */
+			foreach ($conditionColumns as $column) 
+			{
+				$column = 'LOWER(' . $column . ')';
+				if (str_contains($column, '->')) 
+				{
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the model relations.
+			 */
+			foreach ($relations as $relation) 
+			{
+				/**
+				 * Remove the sub relation if exists.
+				 */
+				$relation = explode('.', $relation)[0];
+
+				/**
+				 * Try to fetch the relation repository from the core.
+				 */
+				if (\Core::$relation()) 
+				{
+					/**
+					 * Construct the relation condition.
+					 */
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+
+						$subModel->where(function ($q) use ($query, $relation){
+
+							/**
+							 * Get columns of the relation.
+							 */
+							$subConditionColumns = \Core::$relation()->model->searchable;
+
+							if (count($subConditionColumns)) 
+							{
+
+								$column = 'LOWER(' . array_shift($subConditionColumns) . ')';
+								if (str_contains($column, '->')) 
+								{
+									$column = $this->wrapJsonSelector($column);
+								}
+
+								/**
+								 * Use the first element in the relation model columns to construct the first condition.
+								 */
+								$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+							}
+
+							/**
+							 * Loop through the rest of the columns to construct or where conditions.
+							 */
+							foreach ($subConditionColumns as $subConditionColumn)
+							{
+								$column = 'LOWER(' . $subConditionColumn . ')';
+								if (str_contains($column, '->')) 
+								{
+									$column = $this->wrapJsonSelector($column);
+								}
                                 
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-                            } 
-                        });
-
-                    });
-                }
-            }
-        });
+								$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+							} 
+						});
+
+					});
+				}
+			}
+		});
         
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+		return $model->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 = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     * 
-     * @param  array   $data
-     * @return void
-     */
-    public function save(array $data)
-    {
-        $model      = false;
-        $modelClass = $this->model;
-        $relations  = [];
-
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
-            /**
-             * If the id is present in the data then select the model for updating,
-             * else create new model.
-             * @var array
-             */
-            $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-            if ( ! $model) 
-            {
-                \ErrorHandler::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 the attribute is a relation.
-                 */
-                $relation = camel_case($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 = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-
-                                /**
-                                 * If model doesn't exists.
-                                 */
-                                if ( ! $relationModel) 
-                                {
-                                    \ErrorHandler::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;
-                            }
-                            /**
-                             * If not collection.
-                             */
-                            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 = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-
-                                    /**
-                                     * If model doesn't exists.
-                                     */
-                                    if ( ! $relationModel) 
-                                    {
-                                        \ErrorHandler::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;
-                                }
-                            }
-                        }
-                    }
-                }
-                /**
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
-                 */
-                else if (array_search($key, $model->getFillable(), true) !== false)
-                {
-                    $model->$key = $value;   
-                }
-            }
-            /**
-             * Save the model.
-             */
-            $model->save();
-
-            /**
-             * 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();
-                }
-                /**
-                 * If the relation is an array.
-                 */
-                else if (gettype($value) == 'array') 
-                {
-                    $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;
-                    }
-                }
-                /**
-                 * If the relation isn't array.
-                 */
-                else
-                {
-                    switch (class_basename($model->$key())) 
-                    {
-                        /**
-                         * If the relation is one to many or one to one.
-                         */
-                        case 'HasOne':
-                            $foreignKeyName         = $model->$key()->getForeignKeyName();
-                            $value->$foreignKeyName = $model->id;
-                            $value->save();
-                            break;
-                    }
-                }
-            }
-        });
+	/**
+	 * Save the given model to the storage.
+	 * 
+	 * @param  array   $data
+	 * @return void
+	 */
+	public function save(array $data)
+	{
+		$model      = false;
+		$modelClass = $this->model;
+		$relations  = [];
+
+		\DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+			/**
+			 * If the id is present in the data then select the model for updating,
+			 * else create new model.
+			 * @var array
+			 */
+			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
+			if ( ! $model) 
+			{
+				\ErrorHandler::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 the attribute is a relation.
+				 */
+				$relation = camel_case($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 = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+
+								/**
+								 * If model doesn't exists.
+								 */
+								if ( ! $relationModel) 
+								{
+									\ErrorHandler::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;
+							}
+							/**
+							 * If not collection.
+							 */
+							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 = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+
+									/**
+									 * If model doesn't exists.
+									 */
+									if ( ! $relationModel) 
+									{
+										\ErrorHandler::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;
+								}
+							}
+						}
+					}
+				}
+				/**
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
+				 */
+				else if (array_search($key, $model->getFillable(), true) !== false)
+				{
+					$model->$key = $value;   
+				}
+			}
+			/**
+			 * Save the model.
+			 */
+			$model->save();
+
+			/**
+			 * 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();
+				}
+				/**
+				 * If the relation is an array.
+				 */
+				else if (gettype($value) == 'array') 
+				{
+					$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;
+					}
+				}
+				/**
+				 * If the relation isn't array.
+				 */
+				else
+				{
+					switch (class_basename($model->$key())) 
+					{
+						/**
+						 * If the relation is one to many or one to one.
+						 */
+						case 'HasOne':
+							$foreignKeyName         = $model->$key()->getForeignKeyName();
+							$value->$foreignKeyName = $model->id;
+							$value->save();
+							break;
+					}
+				}
+			}
+		});
             
-        return $model->id;
-    }
+		return $model->id;
+	}
     
-    /**
-     * Update record in the storage based on the given
-     * condition.
-     * 
-     * @param  var $value condition value
-     * @param  array $data
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function update($value, array $data, $attribute = 'id')
-    {
-        if ($attribute == 'id') 
-        {
-            $model = $this->model->lockForUpdate()->find($value);
-            $model ? $model->update($data) : 0;
-        }
-        else
-        {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
-                $model->update($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')
-    {
-        if ($attribute == 'id') 
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                $model = $this->model->lockForUpdate()->find($value);
-                if ( ! $model) 
-                {
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
-                }
+	/**
+	 * Update record in the storage based on the given
+	 * condition.
+	 * 
+	 * @param  var $value condition value
+	 * @param  array $data
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function update($value, array $data, $attribute = 'id')
+	{
+		if ($attribute == 'id') 
+		{
+			$model = $this->model->lockForUpdate()->find($value);
+			$model ? $model->update($data) : 0;
+		}
+		else
+		{
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
+				$model->update($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')
+	{
+		if ($attribute == 'id') 
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				$model = $this->model->lockForUpdate()->find($value);
+				if ( ! $model) 
+				{
+					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+				}
                 
-                $model->delete();
-            });
-        }
-        else
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
-                    $model->delete();
-                });
-            });   
-        }
-    }
+				$model->delete();
+			});
+		}
+		else
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+					$model->delete();
+				});
+			});   
+		}
+	}
     
-    /**
-     * 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 = array('*'))
-    {
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $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 = array('*'))
+	{
+		return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with",  array($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 = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
-    {
-        unset($conditions['page']);
-        $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) 
-        {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
-        }
-
-        $model->restore();
-    }
-
-    /**
-     * 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']);
-            }
-            else if ($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 = array_key_exists('val', $value) ? $value['val'] : '';
-                    }
-                }
-                else
-                {
-                    $operator = '=';
-                }
+	/**
+	 * 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 = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with",  array($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 = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return call_user_func_array("{$this->getModel()}::with", array($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 = array('*'))
+	{
+		unset($conditions['page']);
+		$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) 
+		{
+			\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+		}
+
+		$model->restore();
+	}
+
+	/**
+	 * 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']);
+			}
+			else if ($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 = array_key_exists('val', $value) ? $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 . ')';
-    }
-
-    /**
-     * Abstract method that return the necessary 
-     * information (full model namespace)
-     * needed to preform the previous actions.
-     * 
-     * @return string
-     */
-    abstract protected function getModel();
+		return $removeLast === false ? $result : $result . ')';
+	}
+
+	/**
+	 * Abstract method that return the necessary 
+	 * information (full model namespace)
+	 * needed to preform the previous actions.
+	 * 
+	 * @return string
+	 */
+	abstract protected function getModel();
 }
\ No newline at end of file

Spacing +36 added lines, -36 removed lines

@@ -63,11 +63,11 @@ 
         /**
          * Construct the select conditions for the model.
          */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
+        $model->where(function($q) use ($query, $conditionColumns, $relations){
 
             if (count($conditionColumns)) 
             {
-                $column = 'LOWER(' . array_shift($conditionColumns) . ')';
+                $column = 'LOWER('.array_shift($conditionColumns).')';
                 if (str_contains($column, '->')) 
                 {
                     $column = $this->wrapJsonSelector($column);
@@ -76,7 +76,7 @@ 
                 /**
                  * Use the first element in the model columns to construct the first condition.
                  */
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -84,13 +84,13 @@ 
              */
             foreach ($conditionColumns as $column) 
             {
-                $column = 'LOWER(' . $column . ')';
+                $column = 'LOWER('.$column.')';
                 if (str_contains($column, '->')) 
                 {
                     $column = $this->wrapJsonSelector($column);
                 }
 
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -111,9 +111,9 @@ 
                     /**
                      * Construct the relation condition.
                      */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+                    $q->orWhereHas($relation, function($subModel) use ($query, $relation){
 
-                        $subModel->where(function ($q) use ($query, $relation){
+                        $subModel->where(function($q) use ($query, $relation){
 
                             /**
                              * Get columns of the relation.
@@ -123,7 +123,7 @@ 
                             if (count($subConditionColumns)) 
                             {
 
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
+                                $column = 'LOWER('.array_shift($subConditionColumns).')';
                                 if (str_contains($column, '->')) 
                                 {
                                     $column = $this->wrapJsonSelector($column);
@@ -132,7 +132,7 @@ 
                                 /**
                                 * Use the first element in the relation model columns to construct the first condition.
                                  */
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
                             }
 
                             /**
@@ -140,13 +140,13 @@ 
                              */
                             foreach ($subConditionColumns as $subConditionColumn)
                             {
-                                $column = 'LOWER(' . $subConditionColumn . ')';
+                                $column = 'LOWER('.$subConditionColumn.')';
                                 if (str_contains($column, '->')) 
                                 {
                                     $column = $this->wrapJsonSelector($column);
                                 }
                                 
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
                             } 
                         });
 
@@ -206,7 +206,7 @@ 
         $modelClass = $this->model;
         $relations  = [];
 
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+        \DB::transaction(function() use (&$model, &$relations, $data, $modelClass) {
             /**
              * If the id is present in the data then select the model for updating,
              * else create new model.
@@ -215,7 +215,7 @@ 
             $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
             if ( ! $model) 
             {
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+                \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
             }
 
             /**
@@ -273,7 +273,7 @@ 
                                  */
                                 if ( ! $relationModel) 
                                 {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
                                 /**
@@ -284,7 +284,7 @@ 
                                     /**
                                      * Prevent the sub relations or attributes not in the fillable.
                                      */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false)
                                     {
                                         $relationModel->$attr = $val;
                                     }
@@ -314,7 +314,7 @@ 
                                      */
                                     if ( ! $relationModel) 
                                     {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                     }
 
                                     foreach ($value as $relationAttribute => $relationValue) 
@@ -456,7 +456,7 @@ 
         }
         else
         {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
+            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data){
                 $model->update($data);
             });
         }
@@ -474,11 +474,11 @@ 
     {
         if ($attribute == 'id') 
         {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
+            \DB::transaction(function() use ($value, $attribute, &$result) {
                 $model = $this->model->lockForUpdate()->find($value);
                 if ( ! $model) 
                 {
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+                    \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
                 }
                 
                 $model->delete();
@@ -486,8 +486,8 @@ 
         }
         else
         {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+            \DB::transaction(function() use ($value, $attribute, &$result) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                 });
             });   
@@ -523,7 +523,7 @@ 
     {
         $conditions = $this->constructConditions($conditions, $this->model);
         $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
     }
 
     /**
@@ -563,7 +563,7 @@ 
             $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
         }
 
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns); ;
     }
 
     /**
@@ -578,7 +578,7 @@ 
 
         if ( ! $model) 
         {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+            \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
         }
 
         $model->restore();
@@ -603,13 +603,13 @@ 
             if ($key == 'and') 
             {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             }
             else if ($key == 'or')
             {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             }
             else
@@ -634,41 +634,41 @@ 
                 
                 if (strtolower($operator) == 'between') 
                 {
-                    $conditionString  .= $key . ' >= ? and ';
+                    $conditionString  .= $key.' >= ? and ';
                     $conditionValues[] = $value1;
 
-                    $conditionString  .= $key . ' <= ? {op} ';
+                    $conditionString  .= $key.' <= ? {op} ';
                     $conditionValues[] = $value2;
                 }
                 elseif (strtolower($operator) == 'in') 
                 {
                     $conditionValues  = array_merge($conditionValues, $value);
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+                    $conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
                 }
                 elseif (strtolower($operator) == 'null') 
                 {
-                    $conditionString .= $key . ' is null {op} ';
+                    $conditionString .= $key.' is null {op} ';
                 }
                 elseif (strtolower($operator) == 'not null') 
                 {
-                    $conditionString .= $key . ' is not null {op} ';
+                    $conditionString .= $key.' is not null {op} ';
                 }
                 elseif (strtolower($operator) == 'has') 
                 {
                     $sql              = $model->withTrashed()->has($key)->toSql();
                     $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
+                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
                 }
                 else
                 {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
                     $conditionValues[] = $value;
                 }
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 
@@ -684,11 +684,11 @@ 
         $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('.'));
         
-        return $removeLast === false ? $result : $result . ')';
+        return $removeLast === false ? $result : $result.')';
     }
 
     /**

Braces +11 added lines, -22 removed lines

@@ -453,8 +453,7 @@ 
         {
             $model = $this->model->lockForUpdate()->find($value);
             $model ? $model->update($data) : 0;
-        }
-        else
+        } else
         {
             call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
                 $model->update($data);
@@ -483,8 +482,7 @@ 
                 
                 $model->delete();
             });
-        }
-        else
+        } else
         {
             \DB::transaction(function () use ($value, $attribute, &$result) {
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -605,14 +603,12 @@ 
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else if ($key == 'or')
+            } else if ($key == 'or')
             {
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else
+            } else
             {
                 if (is_array($value)) 
                 {
@@ -621,13 +617,11 @@ 
                     {
                         $value1 = $value['val1'];
                         $value2 = $value['val2'];
-                    }
-                    else
+                    } else
                     {
                         $value = array_key_exists('val', $value) ? $value['val'] : '';
                     }
-                }
-                else
+                } else
                 {
                     $operator = '=';
                 }
@@ -639,29 +633,24 @@ 
 
                     $conditionString  .= $key . ' <= ? {op} ';
                     $conditionValues[] = $value2;
-                }
-                elseif (strtolower($operator) == 'in') 
+                } 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') 
+                } elseif (strtolower($operator) == 'null') 
                 {
                     $conditionString .= $key . ' is null {op} ';
-                }
-                elseif (strtolower($operator) == 'not null') 
+                } elseif (strtolower($operator) == 'not null') 
                 {
                     $conditionString .= $key . ' is not null {op} ';
-                }
-                elseif (strtolower($operator) == 'has') 
+                } 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
+                } else
                 {
                     $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
                     $conditionValues[] = $value;

src/lang/en/errors.php

Indentation +20 added lines, -20 removed lines

@@ -2,25 +2,25 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'           => 'Please login before any action',
-    'invalidRefreshToken'    => 'Invalid refresh token',
-    'noPermissions'          => 'No permissions',
-    'loginFailed'            => 'Wrong mail or password',
-    'noSocialEmail'          => 'Couldn\'t retrieve email',
-    'userAlreadyRegistered'  => 'User already registered. Please login using email and password',
-    'connectionError'        => 'Connection error',
-    'redisNotRunning'        => 'Your redis notification server is\'t running',
-    'dbQueryError'           => 'Please check the given inputes',
-    'cannotCreateSetting'    => 'Can\'t create setting',
-    'cannotUpdateSettingKey' => 'Can\'t update setting key',
-    'userIsBlocked'          => 'You have been blocked',
-    'invalidResetToken'      => 'Reset password token is invalid',
-    'invalidResetPassword'   => 'Reset password is invalid',
-    'invalidOldPassword'     => 'Old password is invalid',
-    'notFound'               => 'The requested :replace not found',
-    'generalError'           => 'Something went wrong',
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'           => 'Please login before any action',
+	'invalidRefreshToken'    => 'Invalid refresh token',
+	'noPermissions'          => 'No permissions',
+	'loginFailed'            => 'Wrong mail or password',
+	'noSocialEmail'          => 'Couldn\'t retrieve email',
+	'userAlreadyRegistered'  => 'User already registered. Please login using email and password',
+	'connectionError'        => 'Connection error',
+	'redisNotRunning'        => 'Your redis notification server is\'t running',
+	'dbQueryError'           => 'Please check the given inputes',
+	'cannotCreateSetting'    => 'Can\'t create setting',
+	'cannotUpdateSettingKey' => 'Can\'t update setting key',
+	'userIsBlocked'          => 'You have been blocked',
+	'invalidResetToken'      => 'Reset password token is invalid',
+	'invalidResetPassword'   => 'Reset password is invalid',
+	'invalidOldPassword'     => 'Old password is invalid',
+	'notFound'               => 'The requested :replace not found',
+	'generalError'           => 'Something went wrong',
 
 ];
\ No newline at end of file

src/lang/ar/errors.php

Indentation +20 added lines, -20 removed lines

@@ -2,25 +2,25 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'           => 'من فضلك قم بتسجيل الدخول',
-    'invalidRefreshToken'    => 'رمز التحديث غير صالح',
-    'noPermissions'          => 'لا توجد صلاحية',
-    'loginFailed'            => 'خطأ في البريد لاكتروني او كلمة المرور',
-    'noSocialEmail'          => 'لا يمكن الحصول علي تابريد الاكتروني',
-    'userAlreadyRegistered'  => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
-    'connectionError'        => 'خطأ في الاتصال',
-    'redisNotRunning'        => 'سيرفير الاشعارات لايعمل',
-    'dbQueryError'           => 'خطا في البيانات',
-    'cannotCreateSetting'    => 'لا يمكن اضافة اعدادات',
-    'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات',
-    'userIsBlocked'          => 'لقد تم حظرك',
-    'invalidResetToken'      => 'رمز تعديل كلمة المرور خطا',
-    'invalidResetPassword'   => 'خطا في نعديل كلمة المرور',
-    'invalidOldPassword'     => 'كلمة السر القديمه خطا',
-    'notFound'               => 'ال :replace المطلوب غير موجود',
-    'generalError'           => 'حدث خطا ما',
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'           => 'من فضلك قم بتسجيل الدخول',
+	'invalidRefreshToken'    => 'رمز التحديث غير صالح',
+	'noPermissions'          => 'لا توجد صلاحية',
+	'loginFailed'            => 'خطأ في البريد لاكتروني او كلمة المرور',
+	'noSocialEmail'          => 'لا يمكن الحصول علي تابريد الاكتروني',
+	'userAlreadyRegistered'  => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
+	'connectionError'        => 'خطأ في الاتصال',
+	'redisNotRunning'        => 'سيرفير الاشعارات لايعمل',
+	'dbQueryError'           => 'خطا في البيانات',
+	'cannotCreateSetting'    => 'لا يمكن اضافة اعدادات',
+	'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات',
+	'userIsBlocked'          => 'لقد تم حظرك',
+	'invalidResetToken'      => 'رمز تعديل كلمة المرور خطا',
+	'invalidResetPassword'   => 'خطا في نعديل كلمة المرور',
+	'invalidOldPassword'     => 'كلمة السر القديمه خطا',
+	'notFound'               => 'ال :replace المطلوب غير موجود',
+	'generalError'           => 'حدث خطا ما',
 
 ];
\ No newline at end of file

src/Modules/V1/Acl/Http/Controllers/OauthClientsController.php

Indentation +39 added lines, -39 removed lines

@@ -8,46 +8,46 @@
 
 class OauthClientsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'oauthClients';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'oauthClients';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-        'name'                   => 'required|max:255',
-        'redirect'               => 'required|url',
-        'user_id'                => 'required|array|exists:users,id'
-        'personal_access_client' => 'boolean',
-        'password_client'        => 'boolean',
-        'revoked'                => 'boolean'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+		'name'                   => 'required|max:255',
+		'redirect'               => 'required|url',
+		'user_id'                => 'required|array|exists:users,id'
+		'personal_access_client' => 'boolean',
+		'password_client'        => 'boolean',
+		'revoked'                => 'boolean'
+	];
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return \Illuminate\Http\Response
-     */
-    public function revoke($clientId)
-    {
-        return \Response::json($this->repo->revoke($clientId), 200);
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return \Illuminate\Http\Response
+	 */
+	public function revoke($clientId)
+	{
+		return \Response::json($this->repo->revoke($clientId), 200);
+	}
 
-    /**
-     * Regenerate seceret for the given client.
-     *
-     * @param  integer  $clientId
-     * @return \Illuminate\Http\Response
-     */
-    public function regenerateSecret($clientId)
-    {
-        return \Response::json($this->repo->regenerateSecret($clientId), 200);
-    }
+	/**
+	 * Regenerate seceret for the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return \Illuminate\Http\Response
+	 */
+	public function regenerateSecret($clientId)
+	{
+		return \Response::json($this->repo->regenerateSecret($clientId), 200);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'oauthClients';
+    protected $model = 'oauthClients';
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
         'name'                   => 'required|max:255',
         'redirect'               => 'required|url',
         'user_id'                => 'required|array|exists:users,id'

src/Modules/V1/Acl/Repositories/UserRepository.php

Indentation +357 added lines, -357 removed lines

@@ -7,368 +7,368 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * The loginProxy implementation.
-     * 
-     * @var array
-     */
-    protected $loginProxy;
-
-    /**
-     * @var The accessTokenRepository implementation.
-     */
-    private $accessTokenRepository;
-
-    public function __construct(LoginProxy $loginProxy, AccessTokenRepositoryInterface $accessTokenRepository)
-    {        
-        $this->loginProxy            = $loginProxy;
-        $this->accessTokenRepository = $accessTokenRepository;
-        parent::__construct();
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\Auth::id(), $relations);
-        foreach ($user->groups()->get() as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-       return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user 
-     * has the given permissions on the given model.
-     * 
-     * @param  string  $nameOfPermission
-     * @param  string  $model            
-     * @param  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false )
-    {      
-        $user        = $user = $this->find(\Auth::id(), ['groups.permissions']);
-        $permissions = [];
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * The loginProxy implementation.
+	 * 
+	 * @var array
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var The accessTokenRepository implementation.
+	 */
+	private $accessTokenRepository;
+
+	public function __construct(LoginProxy $loginProxy, AccessTokenRepositoryInterface $accessTokenRepository)
+	{        
+		$this->loginProxy            = $loginProxy;
+		$this->accessTokenRepository = $accessTokenRepository;
+		parent::__construct();
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\Auth::id(), $relations);
+		foreach ($user->groups()->get() as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+	   return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user 
+	 * has the given permissions on the given model.
+	 * 
+	 * @param  string  $nameOfPermission
+	 * @param  string  $model            
+	 * @param  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false )
+	{      
+		$user        = $user = $this->find(\Auth::id(), ['groups.permissions']);
+		$permissions = [];
+
+		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @param  integer $userId
-     * @return boolean
-     */
-    public function hasGroup($groupName, $userId = false)
-    {
-        $userId = $userId ?: \Auth::id();
-        $groups = $this->find($userId)->groups;
-        return $groups->pluck('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = $this->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return $this->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array   $credentials    
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if ( ! $user = $this->first(['email' => $credentials['email']])) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     * 
-     * @param  array   $credentials
-     * @return array
-     */
-    public function loginSocial($credentials)
-    {
-        $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
-        $user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
-
-        if ( ! $user->email)
-        {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
-        {
-            $data = ['email' => $user->email, 'password' => ''];
-            return $this->register($data);
-        }
-        else
-        {
-            if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
-            {
-                \ErrorHandler::userAlreadyRegistered();
-            }
-
-            return $this->loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
-        }
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @param  integer $userId
+	 * @return boolean
+	 */
+	public function hasGroup($groupName, $userId = false)
+	{
+		$userId = $userId ?: \Auth::id();
+		$groups = $this->find($userId)->groups;
+		return $groups->pluck('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = $this->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return $this->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array   $credentials    
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if ( ! $user = $this->first(['email' => $credentials['email']])) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 * 
+	 * @param  array   $credentials
+	 * @return array
+	 */
+	public function loginSocial($credentials)
+	{
+		$access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
+		$user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
+
+		if ( ! $user->email)
+		{
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
+		{
+			$data = ['email' => $user->email, 'password' => ''];
+			return $this->register($data);
+		}
+		else
+		{
+			if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
+			{
+				\ErrorHandler::userAlreadyRegistered();
+			}
+
+			return $this->loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        $this->model->create($credentials)
-        return $this->loginProxy->login($credentials, 0);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = $this->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return array
+	 */
+	public function register($credentials)
+	{
+		$this->model->create($credentials)
+		return $this->loginProxy->login($credentials, 0);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = $this->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\Auth::id() == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if ( ! $user = $this->model->where('email', $email)->first())
-        {
-            \ErrorHandler::notFound('email');
-        }
-
-        $url   = $this->config['resetLink'];
-        $token = \Password::getRepository()->create($user);
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if ( ! $user = $this->model->where('email', $email)->first())
+		{
+			\ErrorHandler::notFound('email');
+		}
+
+		$url   = $this->config['resetLink'];
+		$token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
-            $m->to($user->email, $user->name)->subject('Your Password Reset Link');
-        });
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return array
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
+		\Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+			$m->to($user->email, $user->name)->subject('Your Password Reset Link');
+		});
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return array
+	 */
+	public function resetPassword($credentials)
+	{
+		$response = \Password::reset($credentials, function ($user, $password) {
+			$user->password = $password;
+			$user->save();
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \Auth::user();
-        if ( ! \Hash::check($credentials['old_password'], $user->password)) 
-        {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     * 
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {   
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function($q) use ($groupName){
-            $q->where('name', $groupName);
-        });
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \Auth::user();
+		if ( ! \Hash::check($credentials['old_password'], $user->password)) 
+		{
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 * 
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{   
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function($q) use ($groupName){
+			$q->where('name', $groupName);
+		});
 
         
-        if (count($conditions['conditionValues']))
-        {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) 
-        {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $credentials
-     * @return object
-     */
-    public function saveProfile($credentials) 
-    {
-        $user = \Auth::user();
-        $user->save($credentials);
-
-        return $user;
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     * 
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $data = new ValidationData();
-        $data->setCurrentTime(time());
-
-        if ($accessToken->validate($data) === false || $this->accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
-        {
-            return true;
-        }
-
-        return false;
-    }
+		if (count($conditions['conditionValues']))
+		{
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) 
+		{
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $credentials
+	 * @return object
+	 */
+	public function saveProfile($credentials) 
+	{
+		$user = \Auth::user();
+		$user->save($credentials);
+
+		return $user;
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 * 
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$data = new ValidationData();
+		$data->setCurrentTime(time());
+
+		if ($accessToken->validate($data) === false || $this->accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
+		{
+			return true;
+		}
+
+		return false;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
         $user        = \Core::users()->find(\Auth::id(), $relations);
         foreach ($user->groups()->get() as $group)
         {
-            $group->permissions->each(function ($permission) use (&$permissions){
+            $group->permissions->each(function($permission) use (&$permissions){
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -66,12 +66,12 @@ 
      * @param  boolean $user
      * @return boolean
      */
-    public function can($nameOfPermission, $model, $user = false )
+    public function can($nameOfPermission, $model, $user = false)
     {      
         $user        = $user = $this->find(\Auth::id(), ['groups.permissions']);
         $permissions = [];
 
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
         });
         
@@ -101,7 +101,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = $this->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -250,7 +250,7 @@ 
         $url   = $this->config['resetLink'];
         $token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function($m) use ($user) {
             $m->to($user->email, $user->name)->subject('Your Password Reset Link');
         });
     }
@@ -263,7 +263,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });

Braces +6 added lines, -12 removed lines

@@ -122,16 +122,13 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
         }
@@ -159,8 +156,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -198,12 +194,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
+        } else if (\Auth::id() == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }