SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Roles/Http/Requests/StoreRole.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class StoreRole extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function rules()
     {
         return [
-            'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
+            'name' => 'required|string|max:100|unique:roles,name,'.$this->route('id')
         ];
     }
 }

src/Modules/Roles/Services/RoleService.php

Indentation +27 added lines, -27 removed lines

@@ -7,33 +7,33 @@
 
 class RoleService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   RoleRepository $repo
-     * @return  void
-     */
-    public function __construct(RoleRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   RoleRepository $repo
+	 * @return  void
+	 */
+	public function __construct(RoleRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Assign the given permission ids to the given role.
-     *
-     * @param  integer $roleId
-     * @param  array   $permissionIds
-     * @return object
-     */
-    public function assignPermissions($roleId, $permissionIds)
-    {
-        $role = false;
-        \DB::transaction(function () use ($roleId, $permissionIds, &$role) {
-            $role = $this->repo->find($roleId);
-            $this->repo->detachPermissions($role);
-            $this->repo->attachPermissions($role, $permissionIds);
-        });
+	/**
+	 * Assign the given permission ids to the given role.
+	 *
+	 * @param  integer $roleId
+	 * @param  array   $permissionIds
+	 * @return object
+	 */
+	public function assignPermissions($roleId, $permissionIds)
+	{
+		$role = false;
+		\DB::transaction(function () use ($roleId, $permissionIds, &$role) {
+			$role = $this->repo->find($roleId);
+			$this->repo->detachPermissions($role);
+			$this->repo->attachPermissions($role, $permissionIds);
+		});
 
-        return $role;
-    }
+		return $role;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function assignPermissions($roleId, $permissionIds)
     {
         $role = false;
-        \DB::transaction(function () use ($roleId, $permissionIds, &$role) {
+        \DB::transaction(function() use ($roleId, $permissionIds, &$role) {
             $role = $this->repo->find($roleId);
             $this->repo->detachPermissions($role);
             $this->repo->attachPermissions($role, $permissionIds);

src/Modules/Roles/Repositories/RoleRepository.php

Indentation +33 added lines, -33 removed lines

@@ -7,39 +7,39 @@
 
 class RoleRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   Role $model
-     * @return  void
-     */
-    public function __construct(Role $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Role $model
+	 * @return  void
+	 */
+	public function __construct(Role $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Detach all permissions from the given role.
-     *
-     * @param  mixed $role
-     * @return object
-     */
-    public function detachPermissions($role)
-    {
-        $role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
-        $role->permissions()->detach();
-    }
+	/**
+	 * Detach all permissions from the given role.
+	 *
+	 * @param  mixed $role
+	 * @return object
+	 */
+	public function detachPermissions($role)
+	{
+		$role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
+		$role->permissions()->detach();
+	}
 
-    /**
-     * Attach permission ids to the given role.
-     *
-     * @param  mixed $role
-     * @param  array $permissionIds
-     * @return object
-     */
-    public function attachPermissions($role, $permissionIds)
-    {
-        $role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
-        $role->permissions()->attach($permissionIds);
-    }
+	/**
+	 * Attach permission ids to the given role.
+	 *
+	 * @param  mixed $role
+	 * @param  array $permissionIds
+	 * @return object
+	 */
+	public function attachPermissions($role, $permissionIds)
+	{
+		$role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
+		$role->permissions()->attach($permissionIds);
+	}
 }

src/Modules/OauthClients/Services/OauthClientService.php

Indentation +55 added lines, -55 removed lines

@@ -7,63 +7,63 @@
 
 class OauthClientService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   OauthClientRepository $repo
-     * @return  void
-     */
-    public function __construct(OauthClientRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   OauthClientRepository $repo
+	 * @return  void
+	 */
+	public function __construct(OauthClientRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
-        \DB::transaction(function () use ($clientId) {
-            $client = $this->repo->find($clientId);
-            $this->repo->revokeClientTokens($client);
-            $this->repo->save(['id'=> $clientId, 'revoked' => true]);
-        });
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
+		\DB::transaction(function () use ($clientId) {
+			$client = $this->repo->find($clientId);
+			$this->repo->revokeClientTokens($client);
+			$this->repo->save(['id'=> $clientId, 'revoked' => true]);
+		});
+	}
 
-    /**
-     * UnRevoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function unRevoke($clientId)
-    {
-        $this->repo->save(['id'=> $clientId, 'revoked' => false]);
-    }
+	/**
+	 * UnRevoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function unRevoke($clientId)
+	{
+		$this->repo->save(['id'=> $clientId, 'revoked' => false]);
+	}
 
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        return $this->oauthClientRepository->accessTokenExpiredOrRevoked($accessToken);
-    }
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		return $this->oauthClientRepository->accessTokenExpiredOrRevoked($accessToken);
+	}
 
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        return $this->oauthClientRepository->revokeAccessToken($accessToken);
-    }
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		return $this->oauthClientRepository->revokeAccessToken($accessToken);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function revoke($clientId)
     {
-        \DB::transaction(function () use ($clientId) {
+        \DB::transaction(function() use ($clientId) {
             $client = $this->repo->find($clientId);
             $this->repo->revokeClientTokens($client);
             $this->repo->save(['id'=> $clientId, 'revoked' => true]);

src/Modules/OauthClients/Repositories/OauthClientRepository.php

Indentation +54 added lines, -54 removed lines

@@ -7,64 +7,64 @@
 
 class OauthClientRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   OauthClient $model
-     * @return  void
-     */
-    public function __construct(OauthClient $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   OauthClient $model
+	 * @return  void
+	 */
+	public function __construct(OauthClient $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Revoke the given client tokens.
-     *
-     * @param  mixed  $client
-     * @return void
-     */
-    public function revokeClientTokens($client)
-    {
-        $client = ! filter_var($client, FILTER_VALIDATE_INT) ? $client : $this->find($client);
-        $client->tokens()->update(['revoked' => true]);
-    }
+	/**
+	 * Revoke the given client tokens.
+	 *
+	 * @param  mixed  $client
+	 * @return void
+	 */
+	public function revokeClientTokens($client)
+	{
+		$client = ! filter_var($client, FILTER_VALIDATE_INT) ? $client : $this->find($client);
+		$client->tokens()->update(['revoked' => true]);
+	}
 
-    /**
-     * 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();
+	/**
+	 * 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;
-        }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
 
-        return false;
-    }
+		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
-            ]);
+	/**
+	 * 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();
-    }
+		$accessToken->revoke();
+	}
 }

src/Modules/Core/Core.php

Indentation +25 added lines, -25 removed lines

@@ -6,30 +6,30 @@
 
 class Core implements BaseFactoryInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
-            $model = ucfirst(\Str::singular($name));
-            if(count($arguments) == 1 && $arguments[0]) {
-                $class = $nameSpace . '\\Services\\' . $model . 'Service';
-            } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
-            }
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'] ;
+			$model = ucfirst(\Str::singular($name));
+			if(count($arguments) == 1 && $arguments[0]) {
+				$class = $nameSpace . '\\Services\\' . $model . 'Service';
+			} else {
+				$class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+			}
 
-            if (class_exists($class)) {
-                return \App::make($class);
-            }
-        }
-    }
+			if (class_exists($class)) {
+				return \App::make($class);
+			}
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
     public function __call($name, $arguments)
     {
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
             $model = ucfirst(\Str::singular($name));
-            if(count($arguments) == 1 && $arguments[0]) {
-                $class = $nameSpace . '\\Services\\' . $model . 'Service';
+            if (count($arguments) == 1 && $arguments[0]) {
+                $class = $nameSpace.'\\Services\\'.$model.'Service';
             } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+                $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
             }
 
             if (class_exists($class)) {

src/Modules/Core/Traits/Translatable.php

Indentation +42 added lines, -42 removed lines

@@ -4,46 +4,46 @@
 
 trait Translatable
 {
-    /**
-     * Create a new model instance that is existing.
-     *
-     * @param  array  $attributes
-     * @param  string|null  $connection
-     * @return static
-     */
-    public function newFromBuilder($attributes = [], $connection = null)
-    {
-        $model = parent::newFromBuilder($attributes, $connection);
-
-        foreach ($model->attributes as $key => $value) {
-            if (isset($this->translatable) && in_array($key, $this->translatable)) {
-                $model->$key = $this->getTranslatedAttribute($value);
-            }
-        }
-
-        return $model;
-    }
-
-    /**
-     * Returns a translatable model attribute based on the application's locale settings.
-     *
-     * @param $values
-     * @return string
-     */
-    protected function getTranslatedAttribute($values)
-    {
-        $values         = json_decode($values);
-        $primaryLocale  = \Session::get('locale');
-        $fallbackLocale = 'en';
-
-        if ($primaryLocale == 'all') {
-            return $values;
-        }
-
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
-            return $values ? (isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values) : '';
-        }
-
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+	/**
+	 * Create a new model instance that is existing.
+	 *
+	 * @param  array  $attributes
+	 * @param  string|null  $connection
+	 * @return static
+	 */
+	public function newFromBuilder($attributes = [], $connection = null)
+	{
+		$model = parent::newFromBuilder($attributes, $connection);
+
+		foreach ($model->attributes as $key => $value) {
+			if (isset($this->translatable) && in_array($key, $this->translatable)) {
+				$model->$key = $this->getTranslatedAttribute($value);
+			}
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Returns a translatable model attribute based on the application's locale settings.
+	 *
+	 * @param $values
+	 * @return string
+	 */
+	protected function getTranslatedAttribute($values)
+	{
+		$values         = json_decode($values);
+		$primaryLocale  = \Session::get('locale');
+		$fallbackLocale = 'en';
+
+		if ($primaryLocale == 'all') {
+			return $values;
+		}
+
+		if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+			return $values ? (isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values) : '';
+		}
+
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             return $values;
         }
 
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
             return $values ? (isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values) : '';
         }
 

src/Modules/Core/BaseClasses/BaseService.php

Indentation +202 added lines, -202 removed lines

@@ -6,223 +6,223 @@
 
 abstract class BaseService implements BaseServiceInterface
 {
-    /**
-     * @var object
-     */
-    public $repo;
+	/**
+	 * @var object
+	 */
+	public $repo;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed  $repo
-     * @return  void
-     */
-    public function __construct($repo)
-    {
-        $this->repo = $repo;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed  $repo
+	 * @return  void
+	 */
+	public function __construct($repo)
+	{
+		$this->repo = $repo;
+	}
 
-    /**
-     * Fetch records with relations based on the given params.
-     *
-     * @param   array   $relations
-     * @param   array   $conditions
-     * @param   integer $perPage
-     * @param   string  $sortBy
-     * @param   boolean $desc
-     * @param   boolean $trashed
-     * @return collection
-     */
-    public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
-    {
-        $translatable = $this->repo->model->translatable ?? [];
-        $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . \Session::get('locale') : $sortBy;
+	/**
+	 * Fetch records with relations based on the given params.
+	 *
+	 * @param   array   $relations
+	 * @param   array   $conditions
+	 * @param   integer $perPage
+	 * @param   string  $sortBy
+	 * @param   boolean $desc
+	 * @param   boolean $trashed
+	 * @return collection
+	 */
+	public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
+	{
+		$translatable = $this->repo->model->translatable ?? [];
+		$filters = $this->constructFilters($conditions);
+		$sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . \Session::get('locale') : $sortBy;
 
-        if ($trashed) {
-            return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if ($trashed) {
+			return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
+		}
         
-        if (count($filters)) {
-            return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if (count($filters)) {
+			return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-    }
+		return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+	}
 
-    /**
-     * 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 = ['*'])
-    {
-        return $this->repo->all($relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * 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 = ['*'])
+	{
+		return $this->repo->all($relations, $sortBy, $desc, $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 = ['*'])
-    {
-        return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $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 = ['*'])
+	{
+		return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $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 = ['*'])
-    {
-        return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $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 = ['*'])
+	{
+		return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        return $this->repo->save($data);
-    }
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function save(array $data)
+	{
+		return $this->repo->save($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')
-    {
-        return $this->repo->delete($value, $attribute);
-    }
+	/**
+	 * 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')
+	{
+		return $this->repo->delete($value, $attribute);
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = ['*'])
-    {
-        return $this->repo->find($id, $relations, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = ['*'])
+	{
+		return $this->repo->find($id, $relations, $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 = ['*'])
-    {
-        return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $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 = ['*'])
+	{
+		return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $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 = ['*'])
-    {
-        return $this->repo->first($conditions, $relations, $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 = ['*'])
+	{
+		return $this->repo->first($conditions, $relations, $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 = ['*'])
-    {
-        return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $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 = ['*'])
+	{
+		return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        return $this->repo->restore($id);
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		return $this->repo->restore($id);
+	}
 
-    /**
-     * Prepare filters for repo.
-     *
-     * @param  array   $conditions
-     * @return array
-     */
-    public function constructFilters($conditions)
-    {
-        $filters = [];
-        $translatable = $this->repo->model->translatable ?? [];
-        foreach ($conditions as $key => $value) {
-            if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
-                $key = in_array($key, $translatable) ? $key . '->' . (\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
-                if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && ! is_null($value)) {
-                    $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
-                } elseif (! is_array($value) && strpos($key, '_id')) {
-                    $filters[$key] = [
-                        'op' => 'in',
-                        'val' => explode(',', $value)
-                    ];
-                } elseif (is_array($value)) {
-                    $filters[$key] = $value;
-                } elseif($value) {
-                    $key = 'LOWER(' . $key . ')';
-                    $value = strtolower($value);
-                    $filters[$key] = [
-                        'op' => 'like',
-                        'val' => '%' . $value . '%'
-                    ];
-                }
-            }
-        }
+	/**
+	 * Prepare filters for repo.
+	 *
+	 * @param  array   $conditions
+	 * @return array
+	 */
+	public function constructFilters($conditions)
+	{
+		$filters = [];
+		$translatable = $this->repo->model->translatable ?? [];
+		foreach ($conditions as $key => $value) {
+			if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
+				$key = in_array($key, $translatable) ? $key . '->' . (\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
+				if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && ! is_null($value)) {
+					$filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+				} elseif (! is_array($value) && strpos($key, '_id')) {
+					$filters[$key] = [
+						'op' => 'in',
+						'val' => explode(',', $value)
+					];
+				} elseif (is_array($value)) {
+					$filters[$key] = $value;
+				} elseif($value) {
+					$key = 'LOWER(' . $key . ')';
+					$value = strtolower($value);
+					$filters[$key] = [
+						'op' => 'like',
+						'val' => '%' . $value . '%'
+					];
+				}
+			}
+		}
 
-        return $filters;
-    }
+		return $filters;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
     {
         $translatable = $this->repo->model->translatable ?? [];
         $filters = $this->constructFilters($conditions);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . \Session::get('locale') : $sortBy;
+        $sortBy = in_array($sortBy, $translatable) ? $sortBy.'->'.\Session::get('locale') : $sortBy;
 
         if ($trashed) {
             return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
@@ -202,22 +202,22 @@ 
         $translatable = $this->repo->model->translatable ?? [];
         foreach ($conditions as $key => $value) {
             if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
-                $key = in_array($key, $translatable) ? $key . '->' . (\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
+                $key = in_array($key, $translatable) ? $key.'->'.(\Session::get('locale') == 'all' ? 'en' : \Session::get('locale')) : $key;
                 if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && ! is_null($value)) {
                     $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
-                } elseif (! is_array($value) && strpos($key, '_id')) {
+                } elseif ( ! is_array($value) && strpos($key, '_id')) {
                     $filters[$key] = [
                         'op' => 'in',
                         'val' => explode(',', $value)
                     ];
                 } elseif (is_array($value)) {
                     $filters[$key] = $value;
-                } elseif($value) {
-                    $key = 'LOWER(' . $key . ')';
+                } elseif ($value) {
+                    $key = 'LOWER('.$key.')';
                     $value = strtolower($value);
                     $filters[$key] = [
                         'op' => 'like',
-                        'val' => '%' . $value . '%'
+                        'val' => '%'.$value.'%'
                     ];
                 }
             }

src/Modules/Core/Decorators/CachingDecorator.php

Indentation +71 added lines, -71 removed lines

@@ -7,84 +7,84 @@
 
 class CachingDecorator
 {
-    /**
-     * @var String
-     */
-    public $service;
+	/**
+	 * @var String
+	 */
+	public $service;
 
-    /**
-     * @var Cache
-     */
-    protected $cache;
+	/**
+	 * @var Cache
+	 */
+	protected $cache;
 
-    /**
-     * @var mixed
-     */
-    public $cacheConfig;
+	/**
+	 * @var mixed
+	 */
+	public $cacheConfig;
 
-    /**
-     * @var string
-     */
-    public $cacheTag;
+	/**
+	 * @var string
+	 */
+	public $cacheTag;
     
-    /**
-     * Init new object.
-     *
-     * @param  Object $service
-     * @param  Cache  $cache
-     *
-     * @return  void
-     */
-    public function __construct($service, Cache $cache)
-    {
-        $this->service    = $service;
-        $this->cache      = $cache;
-        $serviceClass     = explode('\\', get_class($this->service));
-        $serviceName      = end($serviceClass);
-        $this->cacheTag   = lcfirst(substr($serviceName, 0, strpos($serviceName, 'Service')));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param  Object $service
+	 * @param  Cache  $cache
+	 *
+	 * @return  void
+	 */
+	public function __construct($service, Cache $cache)
+	{
+		$this->service    = $service;
+		$this->cache      = $cache;
+		$serviceClass     = explode('\\', get_class($this->service));
+		$serviceName      = end($serviceClass);
+		$this->cacheTag   = lcfirst(substr($serviceName, 0, strpos($serviceName, 'Service')));
+	}
 
-    /**
-     * Handle the cache mechanism for the called method
-     * based the configurations.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        $this->setCacheConfig($name);
+	/**
+	 * Handle the cache mechanism for the called method
+	 * based the configurations.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		$this->setCacheConfig($name);
 
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') {
-            $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) {
-                return call_user_func_array([$this->service, $name], $arguments);
-            });
-        } elseif ($this->cacheConfig) {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->service, $name], $arguments);
-        }
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') {
+			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
+			$cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
+			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) {
+				return call_user_func_array([$this->service, $name], $arguments);
+			});
+		} elseif ($this->cacheConfig) {
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->service, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->service, $name], $arguments);
-    }
+		return call_user_func_array([$this->service, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     *
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {
-        $cacheConfig       = Arr::get(config('core.cache_config'), $this->cacheTag, false);
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 *
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{
+		$cacheConfig       = Arr::get(config('core.cache_config'), $this->cacheTag, false);
+		$this->cacheConfig = false;
 
-        if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
-            $this->cacheConfig = 'cache';
-        } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
+			$this->cacheConfig = 'cache';
+		} elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }