SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/AclUser.php

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace App\Modules\Acl;
 
-use Illuminate\Database\Eloquent\Model;
 use App\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
 

Indentation +53 added lines, -53 removed lines

@@ -6,66 +6,66 @@
 
 class AclUser extends User {
 
-    use SoftDeletes;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
-    protected $appends  = ['permissions'];
+	use SoftDeletes;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token','deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
+	protected $appends  = ['permissions'];
     
-    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 logs()
-    {
-        return $this->hasMany('App\Modules\V1\Logging\Log', 'user_id');
-    }
+	public function logs()
+	{
+		return $this->hasMany('App\Modules\V1\Logging\Log', 'user_id');
+	}
 
-    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();
+	}
 
-    public function getPermissionsAttribute()
-    {
-        $permissions = [];
-        foreach ($this->groups as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
+	public function getPermissionsAttribute()
+	{
+		$permissions = [];
+		foreach ($this->groups as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
 
-        return \Illuminate\Database\Eloquent\Collection::make($permissions);
-    }
+		return \Illuminate\Database\Eloquent\Collection::make($permissions);
+	}
 
-    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

@@ -9,7 +9,7 @@ 
     use SoftDeletes;
     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 = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
     protected $appends  = ['permissions'];
@@ -47,7 +47,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();
     }
 
     public function getPermissionsAttribute()
@@ -55,7 +55,7 @@ 
         $permissions = [];
         foreach ($this->groups as $group)
         {
-            $group->permissions->each(function ($permission) use (&$permissions){
+            $group->permissions->each(function($permission) use (&$permissions){
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }

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

Doc Comments +7 added lines, -7 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
      */
@@ -97,7 +97,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -115,7 +115,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -372,7 +372,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -433,9 +433,9 @@ 
      * Abstract method that is called in after
      * the save method finish.
      * 
-     * @param  object  $model
+     * @param  boolean  $model
      * @param  array   $relations
-     * @return void
+     * @return boolean
      */
     protected function afterSave($model, $relations)
     {

Indentation +410 added lines, -410 removed lines

@@ -4,447 +4,447 @@
 
 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());
-    }
+	/**
+	 * 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
-     */
+	/**
+	 * 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);
+		$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->getFillable();
-        $sort             = $desc ? 'desc' : 'asc';
+	/**
+	 * 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->getFillable();
+		$sort             = $desc ? 'desc' : 'asc';
 
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-            $q->where(\DB::raw('LOWER(CAST(' . array_shift($conditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
-            foreach ($conditionColumns as $column) 
-            {
-                $q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
-            }
-            foreach ($relations as $relation) 
-            {
-                $relation = explode('.', $relation)[0];
-                if (\Core::$relation()) 
-                {
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+		$model->where(function ($q) use ($query, $conditionColumns, $relations){
+			$q->where(\DB::raw('LOWER(CAST(' . array_shift($conditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+			foreach ($conditionColumns as $column) 
+			{
+				$q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+			}
+			foreach ($relations as $relation) 
+			{
+				$relation = explode('.', $relation)[0];
+				if (\Core::$relation()) 
+				{
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
 
-                        $subModel->where(function ($q) use ($query, $relation){
+						$subModel->where(function ($q) use ($query, $relation){
 
-                            $subConditionColumns = \Core::$relation()->model->getFillable();
-                            $q->where(\DB::raw('LOWER(CAST(' . array_shift($subConditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
-                            foreach ($subConditionColumns as $subConditionColumn)
-                            {
-                                $q->orWhere(\DB::raw('LOWER(CAST(' . $subConditionColumn . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
-                            } 
-                        });
+							$subConditionColumns = \Core::$relation()->model->getFillable();
+							$q->where(\DB::raw('LOWER(CAST(' . array_shift($subConditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+							foreach ($subConditionColumns as $subConditionColumn)
+							{
+								$q->orWhere(\DB::raw('LOWER(CAST(' . $subConditionColumn . ' AS TEXT))'), '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 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);
-        $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 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);
+		$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
-     * @param  boolean $saveLog
-     * @return object
-     */
-    public function save(array $data, $saveLog = true)
-    {
-        $model      = false;
-        $modelClass = $this->model;
-        $relations  = [];
-        $with       = [];
+	/**
+	 * Save the given model to the storage.
+	 * 
+	 * @param  array   $data
+	 * @param  boolean $saveLog
+	 * @return object
+	 */
+	public function save(array $data, $saveLog = true)
+	{
+		$model      = false;
+		$modelClass = $this->model;
+		$relations  = [];
+		$with       = [];
 
-        \DB::transaction(function () use (&$model, &$relations, &$with, $data, $saveLog, $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']);
-            }
+		\DB::transaction(function () use (&$model, &$relations, &$with, $data, $saveLog, $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) 
-            {
-                $relation = camel_case($key);
-                if (method_exists($model, $relation))
-                {
-                    $with[] = $relation;
-                    if (class_basename($model->$relation) == 'Collection') 
-                    {   
-                        if ( ! $value || ! count($value)) 
-                        {
-                            $relations[$relation] = 'delete';
-                        }   
-                    }
-                    if (is_array($value)) 
-                    {
-                        foreach ($value as $attr => $val) 
-                        {
-                            $relationBaseModel = \Core::$relation()->model;
-                            if (class_basename($model->$relation) == 'Collection')
-                            {
-                                $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-                                if ( ! $relationModel) 
-                                {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['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) 
+			{
+				$relation = camel_case($key);
+				if (method_exists($model, $relation))
+				{
+					$with[] = $relation;
+					if (class_basename($model->$relation) == 'Collection') 
+					{   
+						if ( ! $value || ! count($value)) 
+						{
+							$relations[$relation] = 'delete';
+						}   
+					}
+					if (is_array($value)) 
+					{
+						foreach ($value as $attr => $val) 
+						{
+							$relationBaseModel = \Core::$relation()->model;
+							if (class_basename($model->$relation) == 'Collection')
+							{
+								$relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+								if ( ! $relationModel) 
+								{
+									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+								}
 
-                                foreach ($val as $attr => $val) 
-                                {
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
-                                    {
-                                        $relationModel->$attr = $val;
-                                    }
-                                }
-                                $relations[$relation][] = $relationModel;
-                            }
-                            else
-                            {
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') 
-                                {
-                                    $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-                                    if ( ! $relationModel) 
-                                    {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
-                                    }
+								foreach ($val as $attr => $val) 
+								{
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+									{
+										$relationModel->$attr = $val;
+									}
+								}
+								$relations[$relation][] = $relationModel;
+							}
+							else
+							{
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') 
+								{
+									$relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+									if ( ! $relationModel) 
+									{
+										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+									}
 
-                                    if (array_search($attr, $relationModel->getFillable(), true) !== false) 
-                                    {
-                                        $relationModel->$attr = $val;
-                                        $relations[$relation] = $relationModel;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (array_search($key, $model->getFillable(), true) !== false)
-                {
-                    $model->$key = $value;   
-                }
-            }
-            $model->save();
+									if (array_search($attr, $relationModel->getFillable(), true) !== false) 
+									{
+										$relationModel->$attr = $val;
+										$relations[$relation] = $relationModel;
+									}
+								}
+							}
+						}
+					}
+				}
+				else if (array_search($key, $model->getFillable(), true) !== false)
+				{
+					$model->$key = $value;   
+				}
+			}
+			$model->save();
             
-            foreach ($relations as $key => $value) 
-            {
-                if ($value == 'delete' && $model->$key()->count())
-                {
-                    $model->$key()->delete();
-                }
-                else if (gettype($value) == 'array') 
-                {
-                    $ids = [];
-                    foreach ($value as $val) 
-                    {
-                        switch (class_basename($model->$key())) 
-                        {
-                            case 'HasMany':
-                                $foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
-                                $val->$foreignKeyName = $model->id;
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
+			foreach ($relations as $key => $value) 
+			{
+				if ($value == 'delete' && $model->$key()->count())
+				{
+					$model->$key()->delete();
+				}
+				else if (gettype($value) == 'array') 
+				{
+					$ids = [];
+					foreach ($value as $val) 
+					{
+						switch (class_basename($model->$key())) 
+						{
+							case 'HasMany':
+								$foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
+								$val->$foreignKeyName = $model->id;
+								$val->save();
+								$ids[] = $val->id;
+								break;
 
-                            case 'BelongsToMany':
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-                        }
-                    }
-                    switch (class_basename($model->$key())) 
-                    {
-                        case 'HasMany':
-                            $model->$key()->whereNotIn('id', $ids)->delete();
-                            break;
+							case 'BelongsToMany':
+								$val->save();
+								$ids[] = $val->id;
+								break;
+						}
+					}
+					switch (class_basename($model->$key())) 
+					{
+						case 'HasMany':
+							$model->$key()->whereNotIn('id', $ids)->delete();
+							break;
 
-                        case 'BelongsToMany':
-                            $model->$key()->detach();
-                            $model->$key()->attach($ids);
-                            break;
-                    }
-                }
-                else
-                {
-                    switch (class_basename($model->$key())) 
-                    {
-                        case 'BelongsTo':
-                            $value->save();
-                            $model->$key()->associate($value);
-                            $model->save();
-                            break;
-                    }
-                }
-            }
-            $saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
-        });
+						case 'BelongsToMany':
+							$model->$key()->detach();
+							$model->$key()->attach($ids);
+							break;
+					}
+				}
+				else
+				{
+					switch (class_basename($model->$key())) 
+					{
+						case 'BelongsTo':
+							$value->save();
+							$model->$key()->associate($value);
+							$model->save();
+							break;
+					}
+				}
+			}
+			$saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
+		});
         
-        $this->afterSave($model, $relations);
+		$this->afterSave($model, $relations);
 
-        return $this->find($model->id, $with);
-    }
+		return $this->find($model->id, $with);
+	}
 
-    /**
-     * Save the given models to the storage.
-     * 
-     * @param  array   $data
-     * @return array
-     */
-    public function saveMany(array $data)
-    {
-        $result = [];
-        \DB::transaction(function () use (&$result, $data) {
-            foreach ($data as $key => $value) 
-            {
-                $result[] = $this->save($value);
-            }
-        });
-        return $result;
-    }
+	/**
+	 * Save the given models to the storage.
+	 * 
+	 * @param  array   $data
+	 * @return array
+	 */
+	public function saveMany(array $data)
+	{
+		$result = [];
+		\DB::transaction(function () use (&$result, $data) {
+			foreach ($data as $key => $value) 
+			{
+				$result[] = $this->save($value);
+			}
+		});
+		return $result;
+	}
     
-    /**
-     * 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', $saveLog = true)
-    {
-        if ($attribute == 'id') 
-        {
-            $model = $this->model->lockForUpdate()->find($value);
-            $model ? $model->update($data) : 0;
-            $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
-        }
-    	call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
-            $model->update($data);
-            $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
-        });
-    }
+	/**
+	 * 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', $saveLog = true)
+	{
+		if ($attribute == 'id') 
+		{
+			$model = $this->model->lockForUpdate()->find($value);
+			$model ? $model->update($data) : 0;
+			$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
+		}
+		call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
+			$model->update($data);
+			$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
+		});
+	}
     
-    /**
-     * 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', $saveLog = true)
-    {
-    	if ($attribute == 'id') 
-    	{
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                $model = $this->model->lockForUpdate()->find($value);
-                $model->delete();
-                $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
-            });
-    	}
-        else
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
-                    $model->delete();
-                    $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
-                });
-            });   
-        }
-    }
+	/**
+	 * 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', $saveLog = true)
+	{
+		if ($attribute == 'id') 
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+				$model = $this->model->lockForUpdate()->find($value);
+				$model->delete();
+				$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
+			});
+		}
+		else
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+					$model->delete();
+					$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
+				});
+			});   
+		}
+	}
     
-    /**
-     * 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);
-        $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 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);
+		$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);
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($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);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
+	}
 
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructConditions($conditions)
-    {   
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) 
-        {
-            if ($key == 'and') 
-            {
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else if ($key == 'or')
-            {
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else
-            {
-                $conditionString  .= $key . '=? {op} ';
-                $conditionValues[] = $value;
-            }
-        }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
-    }
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructConditions($conditions)
+	{   
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) 
+		{
+			if ($key == 'and') 
+			{
+				$conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
+			}
+			else if ($key == 'or')
+			{
+				$conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
+			}
+			else
+			{
+				$conditionString  .= $key . '=? {op} ';
+				$conditionValues[] = $value;
+			}
+		}
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
+	}
 
-    /**
-     * Abstract method that is called in after
-     * the save method finish.
-     * 
-     * @param  object  $model
-     * @param  array   $relations
-     * @return void
-     */
-    protected function afterSave($model, $relations)
-    {
-        return false;
-    }
+	/**
+	 * Abstract method that is called in after
+	 * the save method finish.
+	 * 
+	 * @param  object  $model
+	 * @param  array   $relations
+	 * @return void
+	 */
+	protected function afterSave($model, $relations)
+	{
+		return false;
+	}
 
-    /**
-     * Abstract method that return the necessary 
-     * information (full model namespace)
-     * needed to preform the previous actions.
-     * 
-     * @return string
-     */
-    abstract protected function getModel();
+	/**
+	 * 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 +22 added lines, -22 removed lines

@@ -60,26 +60,26 @@ 
         $conditionColumns = $this->model->getFillable();
         $sort             = $desc ? 'desc' : 'asc';
 
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-            $q->where(\DB::raw('LOWER(CAST(' . array_shift($conditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+        $model->where(function($q) use ($query, $conditionColumns, $relations){
+            $q->where(\DB::raw('LOWER(CAST('.array_shift($conditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
             foreach ($conditionColumns as $column) 
             {
-                $q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                $q->orWhere(\DB::raw('LOWER(CAST('.$column.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
             }
             foreach ($relations as $relation) 
             {
                 $relation = explode('.', $relation)[0];
                 if (\Core::$relation()) 
                 {
-                    $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){
 
                             $subConditionColumns = \Core::$relation()->model->getFillable();
-                            $q->where(\DB::raw('LOWER(CAST(' . array_shift($subConditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                            $q->where(\DB::raw('LOWER(CAST('.array_shift($subConditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
                             foreach ($subConditionColumns as $subConditionColumn)
                             {
-                                $q->orWhere(\DB::raw('LOWER(CAST(' . $subConditionColumn . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->orWhere(\DB::raw('LOWER(CAST('.$subConditionColumn.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
                             } 
                         });
 
@@ -141,7 +141,7 @@ 
         $relations  = [];
         $with       = [];
 
-        \DB::transaction(function () use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) {
+        \DB::transaction(function() use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) {
             /**
              * If the id is present in the data then select the model for updating,
              * else create new model.
@@ -150,7 +150,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']);
             }
 
             /**
@@ -181,12 +181,12 @@ 
                                 $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
                                 if ( ! $relationModel) 
                                 {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
                                 foreach ($val as $attr => $val) 
                                 {
-                                    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;
                                     }
@@ -200,7 +200,7 @@ 
                                     $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
                                     if ( ! $relationModel) 
                                     {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                     }
 
                                     if (array_search($attr, $relationModel->getFillable(), true) !== false) 
@@ -287,7 +287,7 @@ 
     public function saveMany(array $data)
     {
         $result = [];
-        \DB::transaction(function () use (&$result, $data) {
+        \DB::transaction(function() use (&$result, $data) {
             foreach ($data as $key => $value) 
             {
                 $result[] = $this->save($value);
@@ -313,7 +313,7 @@ 
             $model ? $model->update($data) : 0;
             $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
         }
-    	call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
+    	call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data, $saveLog){
             $model->update($data);
             $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
         });
@@ -331,7 +331,7 @@ 
     {
     	if ($attribute == 'id') 
     	{
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
                 $model = $this->model->lockForUpdate()->find($value);
                 $model->delete();
                 $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
@@ -339,8 +339,8 @@ 
     	}
         else
         {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                     $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
                 });
@@ -377,7 +377,7 @@ 
     {
         $conditions = $this->constructConditions($conditions);
         $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);
     }
 
     /**
@@ -408,21 +408,21 @@ 
         {
             if ($key == 'and') 
             {
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else if ($key == 'or')
             {
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else
             {
-                $conditionString  .= $key . '=? {op} ';
+                $conditionString  .= $key.'=? {op} ';
                 $conditionValues[] = $value;
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 

Braces +7 added lines, -14 removed lines

@@ -213,8 +213,7 @@ 
                                     }
                                 }
                                 $relations[$relation][] = $relationModel;
-                            }
-                            else
+                            } else
                             {
                                 if (gettype($val) !== 'object' && gettype($val) !== 'array') 
                                 {
@@ -234,8 +233,7 @@ 
                             }
                         }
                     }
-                }
-                else if (array_search($key, $model->getFillable(), true) !== false)
+                } else if (array_search($key, $model->getFillable(), true) !== false)
                 {
                     $model->$key = $value;   
                 }
@@ -247,8 +245,7 @@ 
                 if ($value == 'delete' && $model->$key()->count())
                 {
                     $model->$key()->delete();
-                }
-                else if (gettype($value) == 'array') 
+                } else if (gettype($value) == 'array') 
                 {
                     $ids = [];
                     foreach ($value as $val) 
@@ -279,8 +276,7 @@ 
                             $model->$key()->attach($ids);
                             break;
                     }
-                }
-                else
+                } else
                 {
                     switch (class_basename($model->$key())) 
                     {
@@ -358,8 +354,7 @@ 
                 $model->delete();
                 $saveLog ? $this->logs->saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
             });
-    	}
-        else
+    	} else
         {
             \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -432,13 +427,11 @@ 
             {
                 $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else if ($key == 'or')
+            } else if ($key == 'or')
             {
                 $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else
+            } else
             {
                 $conditionString  .= $key . '=? {op} ';
                 $conditionValues[] = $value;

src/Modules/V1/Core/Http/Controllers/BaseApiController.php

Doc Comments +13 added lines, -15 removed lines

@@ -54,9 +54,7 @@ 
     /**
      * Fetch all records with relations from model repository.
      * 
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function getIndex() 
     {
@@ -71,7 +69,7 @@ 
      * Fetch the single object with relations from model repository.
      * 
      * @param  integer $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function getFind($id) 
     {
@@ -89,8 +87,8 @@ 
      * @param  string  $query
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function getSearch($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -107,8 +105,8 @@ 
      * 
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postFindby(Request $request, $sortBy = 'created_at', $desc = 1) 
     {
@@ -124,7 +122,7 @@ 
      * condition.
      * 
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postFirst(Request $request) 
     {
@@ -140,8 +138,8 @@ 
      * 
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function getPaginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -159,8 +157,8 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postPaginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -175,7 +173,7 @@ 
      * Save the given model to repository.
      * 
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postSave(Request $request) 
     {
@@ -208,7 +206,7 @@ 
      * Delete by the given id from model repository.
      * 
      * @param  integer  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function getDelete($id) 
     {

Indentation +215 added lines, -215 removed lines

@@ -6,221 +6,221 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The model implementation.
-     * 
-     * @var model
-     */
-    protected $model;
-
-    /**
-     * The config implementation.
-     * 
-     * @var config
-     */
-    protected $config;
-
-    public function __construct()
-    {
-        \Session::set('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
+	/**
+	 * The model implementation.
+	 * 
+	 * @var model
+	 */
+	protected $model;
+
+	/**
+	 * The config implementation.
+	 * 
+	 * @var config
+	 */
+	protected $config;
+
+	public function __construct()
+	{
+		\Session::set('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
         
-        $this->config              = \CoreConfig::getConfig();
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
-        $this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $route                     = explode('@',\Route::currentRouteAction())[1];
-        $this->checkPermission(explode('_', snake_case($route))[1]);
-    }
-
-    /**
-     * Fetch all records with relations from model repository.
-     * 
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function getIndex() 
-    {
-        if ($this->model)
-        {
-            $relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($relations), 200);
-        }
-    }
-
-    /**
-     * Fetch the single object with relations from model repository.
-     * 
-     * @param  integer $id
-     * @return \Illuminate\Http\Response
-     */
-    public function getFind($id) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $relations), 200);
-        }
-    }
-
-    /**
-     * Paginate all records with relations from model repository
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function getSearch($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $relations, $sortBy, $desc), 200);
-        }
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function postFindby(Request $request, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $relations, $sortBy, $desc), 200);
-        }
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postFirst(Request $request) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $relations), 200);
-        }
-    }
-
-    /**
-     * Paginate all records with relations from model repository.
-     * 
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function getPaginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $relations, $sortBy, $desc), 200);
-        }
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function postPaginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            $relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $relations, $sortBy, $desc), 200);
-        }
-    }
-
-    /**
-     * Save the given model to repository.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postSave(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
-
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+		$this->config              = \CoreConfig::getConfig();
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
+		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
+		$route                     = explode('@',\Route::currentRouteAction())[1];
+		$this->checkPermission(explode('_', snake_case($route))[1]);
+	}
+
+	/**
+	 * Fetch all records with relations from model repository.
+	 * 
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getIndex() 
+	{
+		if ($this->model)
+		{
+			$relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($relations), 200);
+		}
+	}
+
+	/**
+	 * Fetch the single object with relations from model repository.
+	 * 
+	 * @param  integer $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getFind($id) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $relations), 200);
+		}
+	}
+
+	/**
+	 * Paginate all records with relations from model repository
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getSearch($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $relations, $sortBy, $desc), 200);
+		}
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postFindby(Request $request, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $relations, $sortBy, $desc), 200);
+		}
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postFirst(Request $request) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $relations), 200);
+		}
+	}
+
+	/**
+	 * Paginate all records with relations from model repository.
+	 * 
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getPaginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $relations, $sortBy, $desc), 200);
+		}
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postPaginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			$relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $relations, $sortBy, $desc), 200);
+		}
+	}
+
+	/**
+	 * Save the given model to repository.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postSave(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
+
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
-
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
-        }
-    }
-
-    /**
-     * Delete by the given id from model repository.
-     * 
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function getDelete($id) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
-        }
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     * 
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        $permission = $permission !== 'index' ? $permission : 'list';
-        if ($permission == 'method') 
-        {
-            \ErrorHandler::notFound('method');
-        }
-        else if ( ! in_array($permission, $this->skipLoginCheck)) 
-        {
-            \JWTAuth::parseToken()->authenticate();
-            if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
-            {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
+		$this->validate($request, $this->validationRules);
+
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
+		}
+	}
+
+	/**
+	 * Delete by the given id from model repository.
+	 * 
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getDelete($id) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
+		}
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 * 
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		$permission = $permission !== 'index' ? $permission : 'list';
+		if ($permission == 'method') 
+		{
+			\ErrorHandler::notFound('method');
+		}
+		else if ( ! in_array($permission, $this->skipLoginCheck)) 
+		{
+			\JWTAuth::parseToken()->authenticate();
+			if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
+			{
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
         
         $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $route                     = explode('@',\Route::currentRouteAction())[1];
+        $route                     = explode('@', \Route::currentRouteAction())[1];
         $this->checkPermission(explode('_', snake_case($route))[1]);
     }
 

Braces +2 added lines, -4 removed lines

@@ -190,8 +190,7 @@ 
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }
@@ -232,8 +231,7 @@ 
         {
             $error = $this->errorHandler->notFound('method');
             abort($error['status'], $error['message']);
-        }
-        else if ( ! in_array($permission, $this->skipLoginCheck)) 
+        } else if ( ! in_array($permission, $this->skipLoginCheck)) 
         {
             \JWTAuth::parseToken()->authenticate();
             if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))

src/Modules/V1/Core/Interfaces/RepositoryInterface.php

Doc Comments +5 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
      * 
      * @param  array  $relations
      * @param  array   $sortBy
-     * @param  array   $desc
+     * @param  integer   $desc
      * @param  array  $columns
      * @return collection
      */
@@ -21,7 +21,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  array   $sortBy
-     * @param  array   $desc
+     * @param  integer   $desc
      * @param  array   $columns
      * @return collection
      */
@@ -33,7 +33,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  array   $sortBy
-     * @param  array   $desc
+     * @param  integer   $desc
      * @param  array   $columns
      * @return collection
      */
@@ -47,7 +47,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  array   $sortBy
-     * @param  array   $desc
+     * @param  integer   $desc
      * @param  array   $columns
      * @return collection
      */
@@ -109,7 +109,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  array   $sortBy
-     * @param  array   $desc
+     * @param  integer   $desc
      * @param  array   $columns
      * @return collection
      */
@@ -120,7 +120,6 @@ 
      * condition.
      * 
      * @param  array   $conditions array of conditions
-     * @param  [type]  $value condition value
      * @param  array   $relations
      * @param  array   $columns
      * @return object

Indentation +106 added lines, -106 removed lines

@@ -3,127 +3,127 @@
 interface RepositoryInterface
 {
 	/**
-     * Fetch all records with relations from the storage.
-     * 
-     * @param  array  $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array  $columns
-     * @return collection
-     */
+	 * Fetch all records with relations from the storage.
+	 * 
+	 * @param  array  $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
 	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
  	
-    /**
-     * Fetch all records with relations from storage in pages 
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * Fetch all records with relations from storage in pages 
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
 	/**
-     * Fetch all records with relations from storage in pages.
-     * 
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	 * Fetch all records with relations from storage in pages.
+	 * 
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
  	
 	/**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
-     /**
-     * Save the given model/models to the storage.
-     * 
-     * @param  array   $data
-     * @param  boolean $saveLog
-     * @return object
-     */
-    public function save(array $data, $saveLog = true);
+	 /**
+	  * Save the given model/models to the storage.
+	  * 
+	  * @param  array   $data
+	  * @param  boolean $saveLog
+	  * @return object
+	  */
+	public function save(array $data, $saveLog = true);
  	
-    /**
-     * Insert multiple records to the storage.
-     * 
-     * @param  array   $data
-     * @return array
-     */
-    public function saveMany(array $data);
+	/**
+	 * Insert multiple records to the storage.
+	 * 
+	 * @param  array   $data
+	 * @return array
+	 */
+	public function saveMany(array $data);
 
 	/**
-     * Update record in the storage based on the given
-     * condition.
-     * 
-     * @param  [type] $value condition value
-     * @param  array $data
-     * @param  string $attribute condition column name
-     * @return integer affected rows
-     */
-    public function update($value, array $data, $attribute = 'id');
+	 * Update record in the storage based on the given
+	 * condition.
+	 * 
+	 * @param  [type] $value condition value
+	 * @param  array $data
+	 * @param  string $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function update($value, array $data, $attribute = 'id');
  	
 	/**
-     * Delete record from the storage based on the given
-     * condition.
-     * 
-     * @param  [type] $value condition value
-     * @param  string $attribute condition column name
-     * @return integer affected rows
-     */
-    public function delete($value, $attribute = 'id');
+	 * Delete record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  [type] $value condition value
+	 * @param  string $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function delete($value, $attribute = 'id');
  	
 	/**
-     * Fetch records from the storage based on the given
-     * id.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'));
+	 * 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('*'));
  	
 	/**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
-    /**
-     * Fetch the first record fro the storage based on the given
-     * condition.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  [type]  $value condition value
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = array('*'));
+	/**
+	 * Fetch the first record fro the storage based on the given
+	 * condition.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  [type]  $value condition value
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = array('*'));
 }
\ No newline at end of file

src/Modules/V1/Reporting/Repositories/ReportRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      *
      * @param  array   $conditions array of conditions
      * @param  array   $relations
-     * @param  array   $colunmns
+     * @param  array   $columns
      * @return object
      */
     public function first($conditions, $relations = [], $columns = array('*'))

Indentation +41 added lines, -41 removed lines

@@ -11,59 +11,59 @@
 	 */
 	protected function getModel()
 	{
-        $apiVersion = \Request::header('api-version') ?: 1;
+		$apiVersion = \Request::header('api-version') ?: 1;
 		return 'App\Modules\V1\Reporting\Report';
 	}
 
 	/**
-     * Render the given report db view.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'))
-    {
+	 * Render the given report db view.
+	 * 
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = array('*'))
+	{
 		$report = call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
 
-        if ( ! $report) 
-        {
-            \ErrorHandler::notFound('report');
-        }
+		if ( ! $report) 
+		{
+			\ErrorHandler::notFound('report');
+		}
 
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            \ErrorHandler::noPermissions();
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			\ErrorHandler::noPermissions();
+		}
 
-        return \DB::table($report->view_name)->get();
-    }
+		return \DB::table($report->view_name)->get();
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $colunmns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = array('*'))
-    {
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $colunmns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = array('*'))
+	{
 		$conditions = $this->constructConditions($conditions);
 		$report     = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
         
-        if ( ! $report) 
-        {
-            \ErrorHandler::notFound('report');
-        }
+		if ( ! $report) 
+		{
+			\ErrorHandler::notFound('report');
+		}
         
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            \ErrorHandler::noPermissions();
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			\ErrorHandler::noPermissions();
+		}
 		
-        return \DB::table($report->view_name)->get();  
-    }
+		return \DB::table($report->view_name)->get();  
+	}
 }

src/ApiSkeletonServiceProvider.php

Indentation +18 added lines, -18 removed lines

@@ -6,24 +6,24 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-     $this->publishes([__DIR__.'/Modules' => app_path('Modules')]);
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+	 $this->publishes([__DIR__.'/Modules' => app_path('Modules')]);
 
-    }
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Utl/Logging.php

Indentation +14 added lines, -14 removed lines

@@ -2,18 +2,18 @@
 
 class Log
 {
-    public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
-    {
-    	if (\Core::logs() && $item_name !== 'Log')
-    	{
-            $item_name = $item_name;
-    		\Core::logs()->save([
-	    		'action'      => $action,
-	    		'item_name'   => $item_name,
-	    		'item_type'   => $item_type,
-	    		'item_id'     => $item_id,
-	    		'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
-	    		], false, false);
-    	}
-    }
+	public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
+	{
+		if (\Core::logs() && $item_name !== 'Log')
+		{
+			$item_name = $item_name;
+			\Core::logs()->save([
+				'action'      => $action,
+				'item_name'   => $item_name,
+				'item_type'   => $item_type,
+				'item_id'     => $item_id,
+				'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
+				], false, false);
+		}
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Utl/CoreConfig.php

Indentation +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-    	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
-    		$customSettings[$setting['key']] = $setting['value'];
-    	});
+	public function getConfig()
+	{
+		$customSettings = [];
+		Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+			$customSettings[$setting['key']] = $setting['value'];
+		});
 
-        return array_merge($customSettings, [
+		return array_merge($customSettings, [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -56,5 +56,5 @@ 
 				],
 			]
 		]);
-    }
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     public function getConfig()
     {
     	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+    	Settings::get(['key', 'value'])->each(function($setting) use (&$customSettings){
     		$customSettings[$setting['key']] = $setting['value'];
     	});
 

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +50 added lines, -50 removed lines

@@ -2,63 +2,63 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => 'Please login before any action'];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => 'Please login before any action'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function tokenExpired()
-    {
-        $error = ['status' => 401, 'message' => 'Login token expired'];
-        abort($error['status'], $error['message']);
-    }
+	public function tokenExpired()
+	{
+		$error = ['status' => 401, 'message' => 'Login token expired'];
+		abort($error['status'], $error['message']);
+	}
 
-     public function noPermissions()
-    {
-        $error = ['status' => 401, 'message' => 'No permissions'];
-        abort($error['status'], $error['message']);
-    }
+	 public function noPermissions()
+	{
+		$error = ['status' => 401, 'message' => 'No permissions'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => 'Wrong mail or password'];
-        abort($error['status'], $error['message']);
-    }
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => 'Wrong mail or password'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
-        abort($error['status'], $error['message']);
-    }
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => 'Please check the given inputes'];
-        abort($error['status'], $error['message']);
-    }
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => 'Please check the given inputes'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t create setting'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t create setting'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t update setting key'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t update setting key'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function userIsBlocked()
-    {
-        $error = ['status' => 400, 'message' => 'You have been blocked'];
-        abort($error['status'], $error['message']);
-    }
+	public function userIsBlocked()
+	{
+		$error = ['status' => 400, 'message' => 'You have been blocked'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
-        abort($error['status'], $error['message']);
-    }
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
     public function notFound($text)
     {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+        $error = ['status' => 404, 'message' => 'The requested '.$text.' not found'];
         abort($error['status'], $error['message']);
     }
 }
\ No newline at end of file