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;
 

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;
             });
         }

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 = ['name', '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 = ['name', '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'));
+	}
 }

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/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/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/Log.php

Indentation +36 added lines, -36 removed lines

@@ -5,41 +5,41 @@
 
 class Log extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'logs';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at', 'item_type'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id'];
-
-    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 getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	use SoftDeletes;
+	protected $table    = 'logs';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at', 'item_type'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id'];
+
+	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 getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public function user()
-    {
-        return $this->belongsTo('App\Modules\V1\Acl\AclUser');
-    }
-
-    public function item()
-    {
-        return $this->morphTo();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver'));
-    }
+	public function user()
+	{
+		return $this->belongsTo('App\Modules\V1\Acl\AclUser');
+	}
+
+	public function item()
+	{
+		return $this->morphTo();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver'));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Log extends Model{
+class Log extends Model {
 
     use SoftDeletes;
     protected $table    = 'logs';

src/Modules/V1/Core/Database/Migrations/2016_01_24_123630_settings.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 	public function up()
 	{
 		Schema::create('settings', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->string('value',100);
-            $table->softDeletes();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('key',100)->unique();
+			$table->string('value',100);
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('settings', function (Blueprint $table) {
+		Schema::create('settings', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->string('value',100);
+            $table->string('name', 100);
+            $table->string('key', 100)->unique();
+            $table->string('value', 100);
             $table->softDeletes();
             $table->timestamps();
         });

src/Modules/V1/Core/Database/Migrations/2016_01_19_084705_logs.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			$table->string('view_name',100);
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('logs', function (Blueprint $table) {
+		Schema::create('logs', function(Blueprint $table) {
 			$table->increments('id');
-			$table->string('action',100);
-			$table->string('item_name',100);
-			$table->string('item_type',100);
+			$table->string('action', 100);
+			$table->string('item_name', 100);
+			$table->string('item_type', 100);
 			$table->integer('item_id');
 			$table->integer('user_id');
 			$table->softDeletes();

src/Modules/V1/Core/Database/Migrations/2016_01_24_123631_initialize_Core.php

Indentation +115 added lines, -115 removed lines

@@ -12,129 +12,129 @@
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['settings'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Users model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	]
-        	]
-        );
+		 * Insert the permissions related to this module.
+		 */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
 
-         /**
-         * Delete previous permissions.
-         */
+		 /**
+		  * Delete previous permissions.
+		  */
 		DB::table('permissions')->whereIn('model', ['logs'])->delete();
 
 		 /**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Logs model permissions.
-        		 */
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-        	]
-        );
+		  * Insert the permissions related to this module.
+		  */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Logs model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['settings', 'logs'])->select('id')->lists('id');