SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Repositories/UserRepository.php

Indentation +1 added lines, -1 removed lines

@@ -61,6 +61,6 @@
 			$user->groups()->attach($group_ids);
 		});
 
-        return \Core::users()->find($user_id);
+		return \Core::users()->find($user_id);
 	}
 }

src/Modules/Acl/Repositories/GroupRepository.php

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permission_ids);
 		});
 
-        return \Core::groups()->find($group_id);
+		return \Core::groups()->find($group_id);
 	}
 }

src/Modules/Acl/Http/Controllers/GroupsController.php

Indentation +28 added lines, -28 removed lines

@@ -8,35 +8,35 @@
 
 class GroupsController 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               = 'groups';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'groups';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'name' => 'required|string|max:100|unique:groups,name,{id}'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'name' => 'required|string|max:100|unique:groups,name,{id}'
+	];
 
-    /**
-     * Handle an assign permissions to group request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postAssignpermissions(Request $request)
-    {
-        $this->validate($request, [
-            'permission_ids' => 'required|exists:permissions,id', 
-            'group_id'       => 'required|exists:groups,id'
-            ]);
+	/**
+	 * Handle an assign permissions to group request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postAssignpermissions(Request $request)
+	{
+		$this->validate($request, [
+			'permission_ids' => 'required|exists:permissions,id', 
+			'group_id'       => 'required|exists:groups,id'
+			]);
 
-        return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
-    }
+		return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
+	}
 }

src/Modules/Acl/Http/Controllers/UsersController.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
         {
             $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
             return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
-        }
-        else
+        } else
         {
             $error = $this->errorHandler->loginFailed();
             abort($error['status'], $error['message']);

Indentation +93 added lines, -93 removed lines

@@ -7,108 +7,108 @@
 
 class UsersController 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               = 'users';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'users';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout'];
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'register'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'register'];
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'email'    => 'required|email|unique:users,email,{id}',
-    'password' => 'min:6'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'email'    => 'required|email|unique:users,email,{id}',
+	'password' => 'min:6'
+	];
 
-    /**
-     * Return the logged in user account.
-     * 
-     * @return object
-     */
-    public function getAccount()
-    {
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
-    }
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return object
+	 */
+	public function getAccount()
+	{
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
+	}
 
-    /**
-     * Logout the user.
-     * 
-     * @return void
-     */
-    public function getLogout()
-    {
-        return \Response::json(\JWTAuth::invalidate(\JWTAuth::getToken()), 200);
-    }
+	/**
+	 * Logout the user.
+	 * 
+	 * @return void
+	 */
+	public function getLogout()
+	{
+		return \Response::json(\JWTAuth::invalidate(\JWTAuth::getToken()), 200);
+	}
 
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postRegister(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email|unique:users,email,{id}', 'password' => 'required|min:6']);
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postRegister(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email|unique:users,email,{id}', 'password' => 'required|min:6']);
 
-        $credentials = $request->only('email', 'password');
-        $token       = \JWTAuth::fromUser(\Core::users()->model->create($credentials));
-        return \Response::json($token, 200);
-    }
+		$credentials = $request->only('email', 'password');
+		$token       = \JWTAuth::fromUser(\Core::users()->model->create($credentials));
+		return \Response::json($token, 200);
+	}
 
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postLogin(Request $request)
-    {
-        $credentials = $request->only('email', 'password');
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postLogin(Request $request)
+	{
+		$credentials = $request->only('email', 'password');
 
-        if ($token = \JWTAuth::attempt($credentials))
-        {
-            $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-            return \Response::json($token, 200);
-        }
-        else
-        {
-            $error = \ErrorHandler::loginFailed();
-            abort($error['status'], $error['message']);
-        }
-    }
+		if ($token = \JWTAuth::attempt($credentials))
+		{
+			$relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+			return \Response::json($token, 200);
+		}
+		else
+		{
+			$error = \ErrorHandler::loginFailed();
+			abort($error['status'], $error['message']);
+		}
+	}
 
-    /**
-     * Handle an assign groups to user request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postAssigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id', 
-            'user_id'   => 'required|exists:users,id'
-            ]);
+	/**
+	 * Handle an assign groups to user request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postAssigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id', 
+			'user_id'   => 'required|exists:users,id'
+			]);
 
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
 }

src/Modules/Acl/Http/Controllers/PermissionsController.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController 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 = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

src/Modules/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +11 added lines, -11 removed lines

@@ -13,17 +13,17 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('first_name',100)->nullable();
-            $table->string('last_name',100)->nullable();
-            $table->string('user_name',100)->nullable();
-            $table->text('address')->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60);
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('first_name',100)->nullable();
+			$table->string('last_name',100)->nullable();
+			$table->string('user_name',100)->nullable();
+			$table->text('address')->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60);
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

src/Modules/Acl/Database/Migrations/2016_01_05_130506_permissions.php

Indentation +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@
 	 */
 	public function up()
 	{
-        Schema::create('permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100);
-            $table->string('model',100);
-            $table->softDeletes();
-            $table->timestamps();
-            $table->unique(array('name', 'model'));
-        });
-        Schema::create('groups_permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('group_id');
-            $table->integer('permission_id');
-            $table->softDeletes();
-            $table->timestamps();
-        });
+		Schema::create('permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('model',100);
+			$table->softDeletes();
+			$table->timestamps();
+			$table->unique(array('name', 'model'));
+		});
+		Schema::create('groups_permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('group_id');
+			$table->integer('permission_id');
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

src/Modules/Acl/Database/Migrations/2015_12_22_145819_groups.php

Indentation +12 added lines, -12 removed lines

@@ -13,19 +13,19 @@
 	public function up()
 	{
 		Schema::create('groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100)->unique();
-            $table->softDeletes();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100)->unique();
+			$table->softDeletes();
+			$table->timestamps();
+		});
         
-        Schema::create('users_groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
-            $table->integer('group_id');
-            $table->softDeletes();
-            $table->timestamps();
-        });
+		Schema::create('users_groups', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_id');
+			$table->integer('group_id');
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

src/Modules/Core/AbstractRepositories/AbstractRepository.php

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;

Indentation +413 added lines, -413 removed lines

@@ -4,450 +4,450 @@
 
 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) 
-            {
-                $error = \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
-                abort($error['status'], $error['message']);
-            }
+		\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) 
+			{
+				$error = \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+				abort($error['status'], $error['message']);
+			}
 
-            /**
-             * 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) 
-                                {
-                                    $error = \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
-                                    abort($error['status'], $error['message']);
-                                }
+			/**
+			 * 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) 
+								{
+									$error = \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+									abort($error['status'], $error['message']);
+								}
 
-                                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) 
-                                    {
-                                        $error = \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
-                                        abort($error['status'], $error['message']);
-                                    }
+								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) 
+									{
+										$error = \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+										abort($error['status'], $error['message']);
+									}
 
-                                    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