SherifElfadaly / Laravel-Api-Skeleton

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

Doc Comments +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
     /**
      * Return the logged in user account.
      * 
-     * @return object
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getAccount()
     {
@@ -52,7 +52,7 @@ 
     /**
      * Logout the user.
      * 
-     * @return void
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getLogout()
     {
@@ -63,7 +63,7 @@ 
      * Handle a registration request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function postRegister(Request $request)
     {
@@ -76,7 +76,7 @@ 
      * Handle a login request to the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function postLogin(Request $request)
     {
@@ -96,7 +96,7 @@ 
      * Handle an assign groups to user request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function postAssigngroups(Request $request)
     {

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace App\Modules\Acl\Http\Controllers;
 
-use Illuminate\Foundation\Http\FormRequest;
 use App\Modules\Core\Http\Controllers\BaseApiController;
 use Illuminate\Http\Request;
 

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 = $this->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 = $this->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);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'users';
+    protected $model = 'users';
 
     /**
      * List of all route actions that the base api controller
@@ -33,7 +33,7 @@ 
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'email'    => 'required|email|unique:users,email,{id}',
     'password' => 'min:6'
     ];

src/Exceptions/Handler.php

Indentation +71 added lines, -71 removed lines

@@ -10,79 +10,79 @@
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that should not be reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        HttpException::class,
-        ModelNotFoundException::class,
-    ];
+	/**
+	 * A list of the exception types that should not be reported.
+	 *
+	 * @var array
+	 */
+	protected $dontReport = [
+		HttpException::class,
+		ModelNotFoundException::class,
+	];
 
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $e
-     * @return void
-     */
-    public function report(Exception $e)
-    {
-        return parent::report($e);
-    }
+	/**
+	 * Report or log an exception.
+	 *
+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+	 *
+	 * @param  \Exception  $e
+	 * @return void
+	 */
+	public function report(Exception $e)
+	{
+		return parent::report($e);
+	}
 
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $e)
-    {
-        if ($e instanceof ModelNotFoundException) {
-            $e = new NotFoundHttpException($e->getMessage(), $e);
-        }
+	/**
+	 * Render an exception into an HTTP response.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Exception  $e
+	 * @return \Illuminate\Http\Response
+	 */
+	public function render($request, Exception $e)
+	{
+		if ($e instanceof ModelNotFoundException) {
+			$e = new NotFoundHttpException($e->getMessage(), $e);
+		}
 
-        if ($request->wantsJson())
-        {
-            if ($e instanceof \Illuminate\Database\QueryException) 
-            {
-                $error = \ErrorHandler::dbQueryError();
-                return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \predis\connection\connectionexception) 
-            {
-                $error = \ErrorHandler::redisNotRunning();
-                return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
-            {
-                $error = \ErrorHandler::tokenExpired();
-                return \Response::json($error['message'], $error['status']);
-            } 
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
-            {
-                $error = \ErrorHandler::noPermissions();
-                return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
-            {
-                $error = \ErrorHandler::unAuthorized();
-                return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof HttpException) 
-            {
-                return \Response::json($e->getMessage(), $e->getStatusCode());   
-            }
-            else
-            {
-                return parent::render($request, $e);
-            }
-        }
+		if ($request->wantsJson())
+		{
+			if ($e instanceof \Illuminate\Database\QueryException) 
+			{
+				$error = \ErrorHandler::dbQueryError();
+				return \Response::json($error['message'], $error['status']);
+			}
+			else if ($e instanceof \predis\connection\connectionexception) 
+			{
+				$error = \ErrorHandler::redisNotRunning();
+				return \Response::json($error['message'], $error['status']);
+			}
+			else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
+			{
+				$error = \ErrorHandler::tokenExpired();
+				return \Response::json($error['message'], $error['status']);
+			} 
+			else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
+			{
+				$error = \ErrorHandler::noPermissions();
+				return \Response::json($error['message'], $error['status']);
+			}
+			else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
+			{
+				$error = \ErrorHandler::unAuthorized();
+				return \Response::json($error['message'], $error['status']);
+			}
+			else if ($e instanceof HttpException) 
+			{
+				return \Response::json($e->getMessage(), $e->getStatusCode());   
+			}
+			else
+			{
+				return parent::render($request, $e);
+			}
+		}
 
-        return parent::render($request, $e);
-    }
+		return parent::render($request, $e);
+	}
 }

Braces +6 added lines, -12 removed lines

@@ -52,32 +52,26 @@
             {
                 $error = \ErrorHandler::dbQueryError();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \predis\connection\connectionexception) 
+            } else if ($e instanceof \predis\connection\connectionexception) 
             {
                 $error = \ErrorHandler::redisNotRunning();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) 
             {
                 $error = \ErrorHandler::tokenExpired();
                 return \Response::json($error['message'], $error['status']);
-            } 
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) 
             {
                 $error = \ErrorHandler::noPermissions();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
+            } else if ($e instanceof \Tymon\JWTAuth\Exceptions\JWTException) 
             {
                 $error = \ErrorHandler::unAuthorized();
                 return \Response::json($error['message'], $error['status']);
-            }
-            else if ($e instanceof HttpException) 
+            } else if ($e instanceof HttpException) 
             {
                 return \Response::json($e->getMessage(), $e->getStatusCode());   
-            }
-            else
+            } else
             {
                 return parent::render($request, $e);
             }

src/Modules/Reporting/Repositories/ReportRepository.php

Indentation +45 added lines, -45 removed lines

@@ -11,63 +11,63 @@
 	 */
 	protected function getModel()
 	{
-        $apiVersion = \Request::header('api-version') ?: 1;
+		$apiVersion = \Request::header('api-version') ?: 1;
 		return 'App\Modules\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) 
-        {
-            $error = $this->errorHandler->notFound('report');
-            abort($error['status'], $error['message']);
-        }
+		if ( ! $report) 
+		{
+			$error = $this->errorHandler->notFound('report');
+			abort($error['status'], $error['message']);
+		}
 
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            $error = $this->errorHandler->noPermissions();
-            abort($error['status'], $error['message']);
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			$error = $this->errorHandler->noPermissions();
+			abort($error['status'], $error['message']);
+		}
 
-        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) 
-        {
-            $error = $this->errorHandler->notFound('report');
-            abort($error['status'], $error['message']);
-        }
+		if ( ! $report) 
+		{
+			$error = $this->errorHandler->notFound('report');
+			abort($error['status'], $error['message']);
+		}
         
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            $error = $this->errorHandler->noPermissions();
-            abort($error['status'], $error['message']);
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			$error = $this->errorHandler->noPermissions();
+			abort($error['status'], $error['message']);
+		}
 		
-        return \DB::table($report->view_name)->get();  
-    }
+		return \DB::table($report->view_name)->get();  
+	}
 }

src/Modules/Core/ErrorHandler.php

Indentation +44 added lines, -44 removed lines

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

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

Indentation +230 added lines, -230 removed lines

@@ -9,238 +9,238 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The errorHandler implementation.
-     * 
-     * @var errorHandler
-     */
-    protected $errorHandler;
-
-    /**
-     * The config implementation.
-     * 
-     * @var config
-     */
-    protected $config;
-
-    /**
-     * The model implementation.
-     * 
-     * @var model
-     */
-    protected $model;
-
-    /**
-     * Create new BaseApiController instance.
-     * 
-     * @param errorHandler
-     */
-    public function __construct(ErrorHandler $errorHandler, CoreConfig $config)
-    {
-        \Session::set('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
+	/**
+	 * The errorHandler implementation.
+	 * 
+	 * @var errorHandler
+	 */
+	protected $errorHandler;
+
+	/**
+	 * The config implementation.
+	 * 
+	 * @var config
+	 */
+	protected $config;
+
+	/**
+	 * The model implementation.
+	 * 
+	 * @var model
+	 */
+	protected $model;
+
+	/**
+	 * Create new BaseApiController instance.
+	 * 
+	 * @param errorHandler
+	 */
+	public function __construct(ErrorHandler $errorHandler, CoreConfig $config)
+	{
+		\Session::set('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
         
-        $this->errorHandler        = $errorHandler;
-        $this->config              = $config->getConfig();
+		$this->errorHandler        = $errorHandler;
+		$this->config              = $config->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->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->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') 
-        {
-            $error = $this->errorHandler->notFound('method');
-            abort($error['status'], $error['message']);
-        }
-        else if ( ! in_array($permission, $this->skipLoginCheck)) 
-        {
-            \JWTAuth::parseToken()->authenticate();
-            if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
-            {
-                $error = $this->errorHandler->noPermissions();
-                abort($error['status'], $error['message']);
-            }
-        }
-    }
+		$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') 
+		{
+			$error = $this->errorHandler->notFound('method');
+			abort($error['status'], $error['message']);
+		}
+		else if ( ! in_array($permission, $this->skipLoginCheck)) 
+		{
+			\JWTAuth::parseToken()->authenticate();
+			if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
+			{
+				$error = $this->errorHandler->noPermissions();
+				abort($error['status'], $error['message']);
+			}
+		}
+	}
 }

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/Core/Log.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/Acl/Database/Migrations/2016_01_05_130507_initialize_acl.php

Indentation +188 added lines, -188 removed lines

@@ -12,191 +12,191 @@ 
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Users model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'delete',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'assigngroups',
-	        	'model'      => 'users',
-	        	'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'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assigngroups',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
 
-	        	/**
-        		 * Permissions model permissions.
-        		 */
-        		[
-	        	'name'       => 'find',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
+				/**
+				 * Permissions model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
 
-	        	/**
-        		 * Groups model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'delete',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'assignpermissions',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-        	]
-        );
+				/**
+				 * Groups model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignpermissions',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
 
 		/**
 		 * Delete previous data.
@@ -224,29 +224,29 @@ 
 		 * Create Default users.
 		 */
 		$adminUserId = DB::table('users')->insertGetId(
-            [
+			[
 			'email'      => 'admin@user.com',
 			'password'   => bcrypt('123456'),
 			'created_at' => \DB::raw('NOW()'),
 			'updated_at' => \DB::raw('NOW()')
 			]
-        );
+		);
 
 		/**
 		 * Assign users to groups.
 		 */
 		DB::table('users_groups')->insert(
-        	[
-	            [
+			[
+				[
 				'user_id'    => $adminUserId,
 				'group_id'   => $adminGroupId,
 				'created_at' => \DB::raw('NOW()'),
 				'updated_at' => \DB::raw('NOW()')
-	            ]
-        	]
-        );
+				]
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id');