SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Http/Resources/Setting.php

Indentation +23 added lines, -23 removed lines

@@ -6,28 +6,28 @@
 
 class Setting extends JsonResource
 {
-    /**
-     * Indicates if the resource's collection keys should be preserved.
-     *
-     * @var bool
-     */
-    public $preserveKeys = true;
+	/**
+	 * Indicates if the resource's collection keys should be preserved.
+	 *
+	 * @var bool
+	 */
+	public $preserveKeys = true;
 
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'value' => $this->value,
-            'key' => $this->key,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'value' => $this->value,
+			'key' => $this->key,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }

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

Indentation +297 added lines, -297 removed lines

@@ -9,303 +9,303 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = $repo;
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $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 : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage
-     * that matche the given query.
-     *
-     * @param  string  $query   The search text.
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request)
-    {
-        return new $this->modelResource($this->repo->first($request->all(), $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage.
-     *
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given model to storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(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);
-            }
-        }
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = $repo;
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$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 : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage
+	 * that matche the given query.
+	 *
+	 * @param  string  $query   The search text.
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request)
+	{
+		return new $this->modelResource($this->repo->first($request->all(), $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage.
+	 *
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given model to storage.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(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);
-
-        return $this->modelResource::collection($this->repo->save($request->all()));
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+		$this->validate($request, $this->validationRules);
+
+		return $this->modelResource::collection($this->repo->save($request->all()));
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }

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

Indentation +30 added lines, -30 removed lines

@@ -10,36 +10,36 @@
 
 class SettingsController extends BaseApiController
 {
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-        'id'    => 'required|exists:settings,id',
-        'value' => 'required|string'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+		'id'    => 'required|exists:settings,id',
+		'value' => 'required|string'
+	];
 
-    /**
-     * Init new object.
-     *
-     * @param   SettingRepository $repo
-     * @param   CoreConfig        $config
-     * @return  void
-     */
-    public function __construct(SettingRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Core\Http\Resources\Setting');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   SettingRepository $repo
+	 * @param   CoreConfig        $config
+	 * @return  void
+	 */
+	public function __construct(SettingRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Core\Http\Resources\Setting');
+	}
 
-    /**
-     * Save list of settings.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveMany(Request $request)
-    {
-        return new GeneralResource($this->repo->saveMany($request->all()));
-    }
+	/**
+	 * Save list of settings.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveMany(Request $request)
+	{
+		return new GeneralResource($this->repo->saveMany($request->all()));
+	}
 }

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Indentation +616 added lines, -616 removed lines

@@ -6,633 +6,633 @@
 
 abstract class AbstractRepository implements RepositoryInterface
 {
-    /**
-     * The model implementation.
-     *
-     * @var object
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 *
+	 * @var object
+	 */
+	public $model;
     
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
     
-    /**
-     * Create new AbstractRepository instance.
-     */
-    public function __construct()
-    {
-        $this->config = \CoreConfig::getConfig();
-        $this->model  = \App::make($this->getModel());
-    }
-
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $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 = ['*'])
-    {
-        $model            = call_user_func_array("{$this->getModel()}::with", array($relations));
-        $conditionColumns = $this->model->searchable;
-        $sort             = $desc ? 'desc' : 'asc';
-
-        /**
-         * Construct the select conditions for the model.
-         */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations) {
-
-            if (count($conditionColumns)) {
-                $column = 'LOWER('.array_shift($conditionColumns).')';
-                if (Str::contains($column, '->')) {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                /**
-                 * Use the first element in the model columns to construct the first condition.
-                 */
-                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
-            }
-
-            /**
-             * Loop through the rest of the columns to construct or where conditions.
-             */
-            foreach ($conditionColumns as $column) {
-                $column = 'LOWER('.$column.')';
-                if (Str::contains($column, '->')) {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
-            }
-
-            /**
-             * Loop through the model relations.
-             */
-            foreach ($relations as $relation) {
-                /**
-                 * Remove the sub relation if exists.
-                 */
-                $relation = explode('.', $relation)[0];
-
-                /**
-                 * Try to fetch the relation repository from the core.
-                 */
-                if (\Core::$relation()) {
-                    /**
-                     * Construct the relation condition.
-                     */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation) {
-
-                        $subModel->where(function ($q) use ($query, $relation) {
-
-                            /**
-                             * Get columns of the relation.
-                             */
-                            $subConditionColumns = \Core::$relation()->model->searchable;
-
-                            if (count($subConditionColumns)) {
-                                $column = 'LOWER('.array_shift($subConditionColumns).')';
-                                if (Str::contains($column, '->')) {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
-
-                                /**
-                                 * Use the first element in the relation model columns to construct the first condition.
-                                 */
-                                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
-                            }
-
-                            /**
-                             * Loop through the rest of the columns to construct or where conditions.
-                             */
-                            foreach ($subConditionColumns as $subConditionColumn) {
-                                $column = 'LOWER('.$subConditionColumn.')';
-                                if (Str::contains($column, '->')) {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
+	/**
+	 * Create new AbstractRepository instance.
+	 */
+	public function __construct()
+	{
+		$this->config = \CoreConfig::getConfig();
+		$this->model  = \App::make($this->getModel());
+	}
+
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$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 = ['*'])
+	{
+		$model            = call_user_func_array("{$this->getModel()}::with", array($relations));
+		$conditionColumns = $this->model->searchable;
+		$sort             = $desc ? 'desc' : 'asc';
+
+		/**
+		 * Construct the select conditions for the model.
+		 */
+		$model->where(function ($q) use ($query, $conditionColumns, $relations) {
+
+			if (count($conditionColumns)) {
+				$column = 'LOWER('.array_shift($conditionColumns).')';
+				if (Str::contains($column, '->')) {
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				/**
+				 * Use the first element in the model columns to construct the first condition.
+				 */
+				$q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
+			}
+
+			/**
+			 * Loop through the rest of the columns to construct or where conditions.
+			 */
+			foreach ($conditionColumns as $column) {
+				$column = 'LOWER('.$column.')';
+				if (Str::contains($column, '->')) {
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				$q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
+			}
+
+			/**
+			 * Loop through the model relations.
+			 */
+			foreach ($relations as $relation) {
+				/**
+				 * Remove the sub relation if exists.
+				 */
+				$relation = explode('.', $relation)[0];
+
+				/**
+				 * Try to fetch the relation repository from the core.
+				 */
+				if (\Core::$relation()) {
+					/**
+					 * Construct the relation condition.
+					 */
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation) {
+
+						$subModel->where(function ($q) use ($query, $relation) {
+
+							/**
+							 * Get columns of the relation.
+							 */
+							$subConditionColumns = \Core::$relation()->model->searchable;
+
+							if (count($subConditionColumns)) {
+								$column = 'LOWER('.array_shift($subConditionColumns).')';
+								if (Str::contains($column, '->')) {
+									$column = $this->wrapJsonSelector($column);
+								}
+
+								/**
+								 * Use the first element in the relation model columns to construct the first condition.
+								 */
+								$q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
+							}
+
+							/**
+							 * Loop through the rest of the columns to construct or where conditions.
+							 */
+							foreach ($subConditionColumns as $subConditionColumn) {
+								$column = 'LOWER('.$subConditionColumn.')';
+								if (Str::contains($column, '->')) {
+									$column = $this->wrapJsonSelector($column);
+								}
                                 
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
-                            }
-                        });
-                    });
-                }
-            }
-        });
+								$q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
+							}
+						});
+					});
+				}
+			}
+		});
         
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        $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 = ['*'])
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$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 = ['*'])
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        \Session::put('locale', 'all');
-        $model      = false;
-        $modelClass = $this->model;
-        $relations  = [];
-
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
-            /**
-             * If the id is present in the data then select the model for updating,
-             * else create new model.
-             * @var array
-             */
-            $model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-            if (! $model) {
-                \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
-            }
-
-            /**
-             * Construct the model object with the given data,
-             * and if there is a relation add it to relations array,
-             * then save the model.
-             */
-            foreach ($data as $key => $value) {
-                /**
-                 * If the attribute is a relation.
-                 */
-                $relation = camel_case($key);
-                if (method_exists($model, $relation) && \Core::$relation()) {
-                    /**
-                     * Check if the relation is a collection.
-                     */
-                    if (class_basename($model->$relation) == 'Collection') {
-                        /**
-                         * If the relation has no value then marke the relation data
-                         * related to the model to be deleted.
-                         */
-                        if (! $value || ! count($value)) {
-                            $relations[$relation] = 'delete';
-                        }
-                    }
-                    if (is_array($value)) {
-                        /**
-                         * Loop through the relation data.
-                         */
-                        foreach ($value as $attr => $val) {
-                            /**
-                             * Get the relation model.
-                             */
-                            $relationBaseModel = \Core::$relation()->model;
-
-                            /**
-                             * Check if the relation is a collection.
-                             */
-                            if (class_basename($model->$relation) == 'Collection') {
-                                /**
-                                 * If the id is present in the data then select the relation model for updating,
-                                 * else create new model.
-                                 */
-                                $relationModel = Arr::has($val, 'id') ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-
-                                /**
-                                 * If model doesn't exists.
-                                 */
-                                if (! $relationModel) {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
-                                }
-
-                                /**
-                                 * Loop through the relation attributes.
-                                 */
-                                foreach ($val as $attr => $val) {
-                                    /**
-                                     * Prevent the sub relations or attributes not in the fillable.
-                                     */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false) {
-                                        $relationModel->$attr = $val;
-                                    }
-                                }
-
-                                $relations[$relation][] = $relationModel;
-                            } else {
-                                /**
-                                 * Prevent the sub relations.
-                                 */
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') {
-                                    /**
-                                     * If the id is present in the data then select the relation model for updating,
-                                     * else create new model.
-                                     */
-                                    $relationModel = Arr::has($value, 'id') ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-
-                                    /**
-                                     * If model doesn't exists.
-                                     */
-                                    if (! $relationModel) {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
-                                    }
-
-                                    foreach ($value as $relationAttribute => $relationValue) {
-                                        /**
-                                         * Prevent attributes not in the fillable.
-                                         */
-                                        if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) {
-                                            $relationModel->$relationAttribute = $relationValue;
-                                        }
-                                    }
-
-                                    $relations[$relation] = $relationModel;
-                                }
-                            }
-                        }
-                    }
-                } elseif (array_search($key, $model->getFillable(), true) !== false) {
-                    /**
-                     * If the attribute isn't a relation and prevent attributes not in the fillable.
-                     */
-                    $model->$key = $value;
-                }
-            }
-
-            /**
-             * Loop through the relations array.
-             */
-            foreach ($relations as $key => $value) {
-                /**
-                 * If the relation is marked for delete then delete it.
-                 */
-                if ($value == 'delete' && $model->$key()->count()) {
-                    $model->$key()->delete();
-                } elseif (gettype($value) == 'array') {
-                    /**
-                     * Save the model.
-                     */
-                    $model->save();
-                    $ids = [];
-
-                    /**
-                     * Loop through the relations.
-                     */
-                    foreach ($value as $val) {
-                        switch (class_basename($model->$key())) {
-                            /**
-                             * If the relation is one to many then update it's foreign key with
-                             * the model id and save it then add its id to ids array to delete all
-                             * relations who's id isn't in the ids array.
-                             */
-                            case 'HasMany':
-                                $foreignKeyName       = $model->$key()->getForeignKeyName();
-                                $val->$foreignKeyName = $model->id;
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-
-                            /**
-                             * If the relation is many to many then add it's id to the ids array to
-                             * attache these ids to the model.
-                             */
-                            case 'BelongsToMany':
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-                        }
-                    }
-                    switch (class_basename($model->$key())) {
-                        /**
-                         * If the relation is one to many then delete all
-                         * relations who's id isn't in the ids array.
-                         */
-                        case 'HasMany':
-                            $model->$key()->whereNotIn('id', $ids)->delete();
-                            break;
-
-                        /**
-                         * If the relation is many to many then
-                         * detach the previous data and attach
-                         * the ids array to the model.
-                         */
-                        case 'BelongsToMany':
-                            $model->$key()->detach();
-                            $model->$key()->attach($ids);
-                            break;
-                    }
-                } else {
-                    switch (class_basename($model->$key())) {
-                        /**
-                         * If the relation is one to one.
-                         */
-                        case 'HasOne':
-                            /**
-                             * Save the model.
-                             */
-                            $model->save();
-                            $foreignKeyName         = $model->$key()->getForeignKeyName();
-                            $value->$foreignKeyName = $model->id;
-                            $value->save();
-                            break;
-                        case 'BelongsTo':
-                            /**
-                             * Save the model.
-                             */
-                            $value->save();
-                            $model->$key()->associate($value);
-                            break;
-                    }
-                }
-            }
-
-            /**
-             * Save the model.
-             */
-            $model->save();
-        });
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function save(array $data)
+	{
+		\Session::put('locale', 'all');
+		$model      = false;
+		$modelClass = $this->model;
+		$relations  = [];
+
+		\DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+			/**
+			 * If the id is present in the data then select the model for updating,
+			 * else create new model.
+			 * @var array
+			 */
+			$model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
+			if (! $model) {
+				\ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
+			}
+
+			/**
+			 * Construct the model object with the given data,
+			 * and if there is a relation add it to relations array,
+			 * then save the model.
+			 */
+			foreach ($data as $key => $value) {
+				/**
+				 * If the attribute is a relation.
+				 */
+				$relation = camel_case($key);
+				if (method_exists($model, $relation) && \Core::$relation()) {
+					/**
+					 * Check if the relation is a collection.
+					 */
+					if (class_basename($model->$relation) == 'Collection') {
+						/**
+						 * If the relation has no value then marke the relation data
+						 * related to the model to be deleted.
+						 */
+						if (! $value || ! count($value)) {
+							$relations[$relation] = 'delete';
+						}
+					}
+					if (is_array($value)) {
+						/**
+						 * Loop through the relation data.
+						 */
+						foreach ($value as $attr => $val) {
+							/**
+							 * Get the relation model.
+							 */
+							$relationBaseModel = \Core::$relation()->model;
+
+							/**
+							 * Check if the relation is a collection.
+							 */
+							if (class_basename($model->$relation) == 'Collection') {
+								/**
+								 * If the id is present in the data then select the relation model for updating,
+								 * else create new model.
+								 */
+								$relationModel = Arr::has($val, 'id') ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+
+								/**
+								 * If model doesn't exists.
+								 */
+								if (! $relationModel) {
+									\ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
+								}
+
+								/**
+								 * Loop through the relation attributes.
+								 */
+								foreach ($val as $attr => $val) {
+									/**
+									 * Prevent the sub relations or attributes not in the fillable.
+									 */
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false) {
+										$relationModel->$attr = $val;
+									}
+								}
+
+								$relations[$relation][] = $relationModel;
+							} else {
+								/**
+								 * Prevent the sub relations.
+								 */
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') {
+									/**
+									 * If the id is present in the data then select the relation model for updating,
+									 * else create new model.
+									 */
+									$relationModel = Arr::has($value, 'id') ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+
+									/**
+									 * If model doesn't exists.
+									 */
+									if (! $relationModel) {
+										\ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
+									}
+
+									foreach ($value as $relationAttribute => $relationValue) {
+										/**
+										 * Prevent attributes not in the fillable.
+										 */
+										if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) {
+											$relationModel->$relationAttribute = $relationValue;
+										}
+									}
+
+									$relations[$relation] = $relationModel;
+								}
+							}
+						}
+					}
+				} elseif (array_search($key, $model->getFillable(), true) !== false) {
+					/**
+					 * If the attribute isn't a relation and prevent attributes not in the fillable.
+					 */
+					$model->$key = $value;
+				}
+			}
+
+			/**
+			 * Loop through the relations array.
+			 */
+			foreach ($relations as $key => $value) {
+				/**
+				 * If the relation is marked for delete then delete it.
+				 */
+				if ($value == 'delete' && $model->$key()->count()) {
+					$model->$key()->delete();
+				} elseif (gettype($value) == 'array') {
+					/**
+					 * Save the model.
+					 */
+					$model->save();
+					$ids = [];
+
+					/**
+					 * Loop through the relations.
+					 */
+					foreach ($value as $val) {
+						switch (class_basename($model->$key())) {
+							/**
+							 * If the relation is one to many then update it's foreign key with
+							 * the model id and save it then add its id to ids array to delete all
+							 * relations who's id isn't in the ids array.
+							 */
+							case 'HasMany':
+								$foreignKeyName       = $model->$key()->getForeignKeyName();
+								$val->$foreignKeyName = $model->id;
+								$val->save();
+								$ids[] = $val->id;
+								break;
+
+							/**
+							 * If the relation is many to many then add it's id to the ids array to
+							 * attache these ids to the model.
+							 */
+							case 'BelongsToMany':
+								$val->save();
+								$ids[] = $val->id;
+								break;
+						}
+					}
+					switch (class_basename($model->$key())) {
+						/**
+						 * If the relation is one to many then delete all
+						 * relations who's id isn't in the ids array.
+						 */
+						case 'HasMany':
+							$model->$key()->whereNotIn('id', $ids)->delete();
+							break;
+
+						/**
+						 * If the relation is many to many then
+						 * detach the previous data and attach
+						 * the ids array to the model.
+						 */
+						case 'BelongsToMany':
+							$model->$key()->detach();
+							$model->$key()->attach($ids);
+							break;
+					}
+				} else {
+					switch (class_basename($model->$key())) {
+						/**
+						 * If the relation is one to one.
+						 */
+						case 'HasOne':
+							/**
+							 * Save the model.
+							 */
+							$model->save();
+							$foreignKeyName         = $model->$key()->getForeignKeyName();
+							$value->$foreignKeyName = $model->id;
+							$value->save();
+							break;
+						case 'BelongsTo':
+							/**
+							 * Save the model.
+							 */
+							$value->save();
+							$model->$key()->associate($value);
+							break;
+					}
+				}
+			}
+
+			/**
+			 * Save the model.
+			 */
+			$model->save();
+		});
             
-        return $model;
-    }
+		return $model;
+	}
     
-    /**
-     * Update record in the storage based on the given
-     * condition.
-     *
-     * @param  var $value condition value
-     * @param  array $data
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function update($value, array $data, $attribute = 'id')
-    {
-        if ($attribute == 'id') {
-            $model = $this->model->lockForUpdate()->find($value);
-            $model ? $model->update($data) : 0;
-        } else {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data) {
-                $model->update($data);
-            });
-        }
-    }
-
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var $value condition value
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function delete($value, $attribute = 'id')
-    {
-        if ($attribute == 'id') {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                $model = $this->model->lockForUpdate()->find($value);
-                if (! $model) {
-                    \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
-                }
+	/**
+	 * Update record in the storage based on the given
+	 * condition.
+	 *
+	 * @param  var $value condition value
+	 * @param  array $data
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function update($value, array $data, $attribute = 'id')
+	{
+		if ($attribute == 'id') {
+			$model = $this->model->lockForUpdate()->find($value);
+			$model ? $model->update($data) : 0;
+		} else {
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data) {
+				$model->update($data);
+			});
+		}
+	}
+
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var $value condition value
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function delete($value, $attribute = 'id')
+	{
+		if ($attribute == 'id') {
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				$model = $this->model->lockForUpdate()->find($value);
+				if (! $model) {
+					\ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
+				}
                 
-                $model->delete();
-            });
-        } else {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) {
-                    $model->delete();
-                });
-            });
-        }
-    }
+				$model->delete();
+			});
+		} else {
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) {
+					$model->delete();
+				});
+			});
+		}
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  integer $id
-     * @param  string[]   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = ['*'])
-    {
-        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  string[]   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = ['*'])
+	{
+		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 = ['*'])
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = ['*'])
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->onlyTrashed();
-
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        $model = $this->model->onlyTrashed()->find($id);
-
-        if (! $model) {
-            \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
-        }
-
-        $model->restore();
-    }
-
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructConditions($conditions, $model)
-    {
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) {
-            if (Str::contains($key, '->')) {
-                $key = $this->wrapJsonSelector($key);
-            }
-
-            if ($key == 'and') {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            } elseif ($key == 'or') {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            } else {
-                if (is_array($value)) {
-                    $operator = $value['op'];
-                    if (strtolower($operator) == 'between') {
-                        $value1 = $value['val1'];
-                        $value2 = $value['val2'];
-                    } else {
-                        $value = Arr::get($value, 'val', '');
-                    }
-                } else {
-                    $operator = '=';
-                }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = ['*'])
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->onlyTrashed();
+
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		$model = $this->model->onlyTrashed()->find($id);
+
+		if (! $model) {
+			\ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
+		}
+
+		$model->restore();
+	}
+
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructConditions($conditions, $model)
+	{
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) {
+			if (Str::contains($key, '->')) {
+				$key = $this->wrapJsonSelector($key);
+			}
+
+			if ($key == 'and') {
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			} elseif ($key == 'or') {
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			} else {
+				if (is_array($value)) {
+					$operator = $value['op'];
+					if (strtolower($operator) == 'between') {
+						$value1 = $value['val1'];
+						$value2 = $value['val2'];
+					} else {
+						$value = Arr::get($value, 'val', '');
+					}
+				} else {
+					$operator = '=';
+				}
                 
-                if (strtolower($operator) == 'between') {
-                    $conditionString  .= $key.' >= ? and ';
-                    $conditionValues[] = $value1;
-
-                    $conditionString  .= $key.' <= ? {op} ';
-                    $conditionValues[] = $value2;
-                } elseif (strtolower($operator) == 'in') {
-                    $conditionValues  = array_merge($conditionValues, $value);
-                    $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
-                } elseif (strtolower($operator) == 'null') {
-                    $conditionString .= $key.' is null {op} ';
-                } elseif (strtolower($operator) == 'not null') {
-                    $conditionString .= $key.' is not null {op} ';
-                } elseif (strtolower($operator) == 'has') {
-                    $sql              = $model->withTrashed()->has($key)->toSql();
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
-                    $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                } else {
-                    $conditionString  .= $key.' '.$operator.' ? {op} ';
-                    $conditionValues[] = $value;
-                }
-            }
-        }
-        $conditionString = '('.rtrim($conditionString, '{op} ').')';
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
-    }
-
-    /**
-     * Wrap the given JSON selector.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function wrapJsonSelector($value)
-    {
-        $removeLast = strpos($value, ')');
-        $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
-        $path       = explode('->', $value);
-        $field      = array_shift($path);
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
-            return '"'.$part.'"';
-        })->implode('.'));
+				if (strtolower($operator) == 'between') {
+					$conditionString  .= $key.' >= ? and ';
+					$conditionValues[] = $value1;
+
+					$conditionString  .= $key.' <= ? {op} ';
+					$conditionValues[] = $value2;
+				} elseif (strtolower($operator) == 'in') {
+					$conditionValues  = array_merge($conditionValues, $value);
+					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
+					$conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
+				} elseif (strtolower($operator) == 'null') {
+					$conditionString .= $key.' is null {op} ';
+				} elseif (strtolower($operator) == 'not null') {
+					$conditionString .= $key.' is not null {op} ';
+				} elseif (strtolower($operator) == 'has') {
+					$sql              = $model->withTrashed()->has($key)->toSql();
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
+					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+				} else {
+					$conditionString  .= $key.' '.$operator.' ? {op} ';
+					$conditionValues[] = $value;
+				}
+			}
+		}
+		$conditionString = '('.rtrim($conditionString, '{op} ').')';
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
+	}
+
+	/**
+	 * Wrap the given JSON selector.
+	 *
+	 * @param  string  $value
+	 * @return string
+	 */
+	protected function wrapJsonSelector($value)
+	{
+		$removeLast = strpos($value, ')');
+		$value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
+		$path       = explode('->', $value);
+		$field      = array_shift($path);
+		$result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
+			return '"'.$part.'"';
+		})->implode('.'));
         
-        return $removeLast === false ? $result : $result.')';
-    }
-
-    /**
-     * Abstract method that return the necessary
-     * information (full model namespace)
-     * needed to preform the previous actions.
-     *
-     * @return string
-     */
-    abstract protected function getModel();
+		return $removeLast === false ? $result : $result.')';
+	}
+
+	/**
+	 * Abstract method that return the necessary
+	 * information (full model namespace)
+	 * needed to preform the previous actions.
+	 *
+	 * @return string
+	 */
+	abstract protected function getModel();
 }

src/Modules/Acl/OauthClient.php

Indentation +20 added lines, -20 removed lines

@@ -6,28 +6,28 @@
 
 class OauthClient extends Client
 {
-    protected $dates    = ['created_at', 'updated_at'];
-    protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
-    public $searchable  = ['name'];
+	protected $dates    = ['created_at', 'updated_at'];
+	protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
+	public $searchable  = ['name'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public function user()
-    {
-        return $this->belongsTo('App\Modules\Acl\AclUser');
-    }
+	public function user()
+	{
+		return $this->belongsTo('App\Modules\Acl\AclUser');
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        OauthClient::observe(\App::make('App\Modules\Acl\ModelObservers\OauthClientObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		OauthClient::observe(\App::make('App\Modules\Acl\ModelObservers\OauthClientObserver'));
+	}
 }

src/Modules/Acl/Repositories/UserRepository.php

Indentation +379 added lines, -379 removed lines

@@ -6,391 +6,391 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     *
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\Acl\AclUser';
-    }
-
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\Auth::id(), $relations);
-        foreach ($user->groups()->get() as $group) {
-            $group->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user
-     * has the given permissions on the given model.
-     *
-     * @param  string $nameOfPermission
-     * @param  string $model
-     * @param  mixed  $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false)
-    {
-        $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
-        $permissions = [];
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
-        });
+	/**
+	 * Return the model full namespace.
+	 *
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\Acl\AclUser';
+	}
+
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\Auth::id(), $relations);
+		foreach ($user->groups()->get() as $group) {
+			$group->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user
+	 * has the given permissions on the given model.
+	 *
+	 * @param  string $nameOfPermission
+	 * @param  string $model
+	 * @param  mixed  $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false)
+	{
+		$user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
+		$permissions = [];
+
+		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     *
-     * @param  string[] $groups
-     * @param  mixed $user
-     * @return boolean
-     */
-    public function hasGroup($groups, $user = false)
-    {
-        $user = $user ?: $this->find(\Auth::id());
-        return $user->groups->whereIn('name', $groups)->count() ? true : false;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $groupIds
-     * @return object
-     */
-    public function assignGroups($userId, $groupIds)
-    {
-        \DB::transaction(function () use ($userId, $groupIds) {
-            $user = $this->find($userId);
-            $user->groups()->detach();
-            $user->groups()->attach($groupIds);
-        });
-
-        return $this->find($userId);
-    }
-
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
-            \ErrorHandler::loginFailed();
-        } elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif ($user->blocked) {
-            \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \ErrorHandler::emailNotConfirmed();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user         = \Socialite::driver($type)->userFromToken($access_token);
-
-        if (! $user->email) {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $this->model->where('email', $user->email)->first()) {
-            $this->register(['email' => $user->email, 'password' => ''], true);
-        }
-
-        $loginProxy = \App::make('App\Modules\Acl\Proxy\LoginProxy');
-        return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 *
+	 * @param  string[] $groups
+	 * @param  mixed $user
+	 * @return boolean
+	 */
+	public function hasGroup($groups, $user = false)
+	{
+		$user = $user ?: $this->find(\Auth::id());
+		return $user->groups->whereIn('name', $groups)->count() ? true : false;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $groupIds
+	 * @return object
+	 */
+	public function assignGroups($userId, $groupIds)
+	{
+		\DB::transaction(function () use ($userId, $groupIds) {
+			$user = $this->find($userId);
+			$user->groups()->detach();
+			$user->groups()->attach($groupIds);
+		});
+
+		return $this->find($userId);
+	}
+
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if (! $user = $this->first(['email' => $credentials['email']])) {
+			\ErrorHandler::loginFailed();
+		} elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif ($user->blocked) {
+			\ErrorHandler::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\ErrorHandler::emailNotConfirmed();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user         = \Socialite::driver($type)->userFromToken($access_token);
+
+		if (! $user->email) {
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $this->model->where('email', $user->email)->first()) {
+			$this->register(['email' => $user->email, 'password' => ''], true);
+		}
+
+		$loginProxy = \App::make('App\Modules\Acl\Proxy\LoginProxy');
+		return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  array   $credentials
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($credentials, $skipConfirmEmail = false)
-    {
-        $user = $this->save($credentials);
-
-        if ($skipConfirmEmail) {
-            $user->confirmed = 1;
-            $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($credentials, $skipConfirmEmail = false)
+	{
+		$user = $this->save($credentials);
+
+		if ($skipConfirmEmail) {
+			$user->confirmed = 1;
+			$user->save();
+		} elseif (! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (! $user = $this->find($userId)) {
-            \ErrorHandler::notFound('user');
-        }
-        if (! $this->hasGroup(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        } elseif (\Auth::id() == $userId) {
-            \ErrorHandler::noPermissions();
-        } elseif ($user->groups->pluck('name')->search('Admin', true) !== false) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (! $user = $this->find($userId)) {
+			\ErrorHandler::notFound('user');
+		}
+		if (! $this->hasGroup(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		} elseif (\Auth::id() == $userId) {
+			\ErrorHandler::noPermissions();
+		} elseif ($user->groups->pluck('name')->search('Admin', true) !== false) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        if (! $this->hasGroup(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($userId);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->model->where('email', $email)->first()) {
-            \ErrorHandler::notFound('email');
-        }
-
-        $token = \Password::getRepository()->create($user);
-        \Core::notifications()->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return string|null
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-                //no break
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-                //no break
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-                //no break
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->first(['email' => $email]);
-        if ($user->confirmed) {
-            \ErrorHandler::emailAlreadyConfirmed();
-        }
-
-        $user->confirmed         = 0;
-        $user->confirmation_code = sha1(microtime());
-        $user->save();
-        \Core::notifications()->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     *
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function ($q) use ($groupName) {
-            $q->where('name', $groupName);
-        });
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		if (! $this->hasGroup(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($userId);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->model->where('email', $email)->first()) {
+			\ErrorHandler::notFound('email');
+		}
+
+		$token = \Password::getRepository()->create($user);
+		\Core::notifications()->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return string|null
+	 */
+	public function resetPassword($credentials)
+	{
+		$response = \Password::reset($credentials, function ($user, $password) {
+			$user->password = $password;
+			$user->save();
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+				//no break
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+				//no break
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+				//no break
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($credentials['old_password'], $user->password)) {
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->first(['email' => $email]);
+		if ($user->confirmed) {
+			\ErrorHandler::emailAlreadyConfirmed();
+		}
+
+		$user->confirmed         = 0;
+		$user->confirmation_code = sha1(microtime());
+		$user->save();
+		\Core::notifications()->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 *
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function ($q) use ($groupName) {
+			$q->where('name', $groupName);
+		});
 
         
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        if (Arr::has($data, 'profile_picture')) {
-            $data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
-        }
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) {
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		if (Arr::has($data, 'profile_picture')) {
+			$data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->save($data);
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+		$data['id'] = \Auth::id();
+		return $this->save($data);
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        \DB::table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		\DB::table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }

src/Modules/Acl/Http/Resources/AclPermission.php

Indentation +16 added lines, -16 removed lines

@@ -7,20 +7,20 @@
 
 class AclPermission extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'groups' => GroupResource::collection($this->whenLoaded('groups')),
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'groups' => GroupResource::collection($this->whenLoaded('groups')),
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }

src/Modules/Acl/Http/Resources/OauthClient.php

Indentation +20 added lines, -20 removed lines

@@ -7,24 +7,24 @@
 
 class OauthClient extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'redirect' => $this->redirect,
-            'user' => new UserResource($this->whenLoaded('user')),
-            'personalAccessClient' => $this->personal_access_client,
-            'passwordClient' => $this->password_client,
-            'revoked' => $this->revoked,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'redirect' => $this->redirect,
+			'user' => new UserResource($this->whenLoaded('user')),
+			'personalAccessClient' => $this->personal_access_client,
+			'passwordClient' => $this->password_client,
+			'revoked' => $this->revoked,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }

src/Modules/Acl/Http/Resources/AclUser.php

Indentation +24 added lines, -24 removed lines

@@ -9,28 +9,28 @@
 
 class AclUser extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'email' => $this->email,
-            'profilePicture' => $this->profile_picture,
-            'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
-            'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
-            'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
-            'groups' => AclGroupResource::collection($this->whenLoaded('groups')),
-            'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
-            'locale' => $this->locale,
-            'timeZone' => $this->time_zone,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'email' => $this->email,
+			'profilePicture' => $this->profile_picture,
+			'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
+			'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
+			'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
+			'groups' => AclGroupResource::collection($this->whenLoaded('groups')),
+			'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
+			'locale' => $this->locale,
+			'timeZone' => $this->time_zone,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }