SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/BaseClasses/BaseService.php

Indentation +224 added lines, -224 removed lines

@@ -7,250 +7,250 @@
 
 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') {
-                /**
-                 * Prepare key based on the the requested lang if it was translatable.
-                 */
-                $key = in_array($key, $translatable) ? $key . '->' . (Session::get('locale') == 'all' ? 'en' : Session::get('locale')) : $key;
+	/**
+	 * 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') {
+				/**
+				 * Prepare key based on the the requested lang if it was translatable.
+				 */
+				$key = in_array($key, $translatable) ? $key . '->' . (Session::get('locale') == 'all' ? 'en' : Session::get('locale')) : $key;
 
-                /**
-                 * Convert 0/1 or true/false to boolean in case of not foreign 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);
+				/**
+				 * Convert 0/1 or true/false to boolean in case of not foreign 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);
 
-                /**
-                 * Use in operator in case of foreign and comma seperated values.
-                 */
-                } elseif (! is_array($value) && strpos($key, '_id') && $value) {
-                    $filters[$key] = [
-                        'op' => 'in',
-                        'val' => explode(',', $value)
-                    ];
+				/**
+				 * Use in operator in case of foreign and comma seperated values.
+				 */
+				} elseif (! is_array($value) && strpos($key, '_id') && $value) {
+					$filters[$key] = [
+						'op' => 'in',
+						'val' => explode(',', $value)
+					];
 
-                /**
-                 * Use null operator in case of 0 value and foreign.
-                 */
-                } elseif (strpos($key, '_id') && $value == 0) {
-                    $filters[$key] = [
-                        'op' => 'null'
-                    ];
+				/**
+				 * Use null operator in case of 0 value and foreign.
+				 */
+				} elseif (strpos($key, '_id') && $value == 0) {
+					$filters[$key] = [
+						'op' => 'null'
+					];
 
-                /**
-                 * Consider values as a sub conditions if it is array.
-                 */
-                } elseif (is_array($value)) {
-                    $filters[$key] = $value;
+				/**
+				 * Consider values as a sub conditions if it is array.
+				 */
+				} elseif (is_array($value)) {
+					$filters[$key] = $value;
 
-                /**
-                 * Default string filteration.
-                 */
-                } elseif ($value) {
-                    $key = 'LOWER(' . $key . ')';
-                    $value = strtolower($value);
-                    $filters[$key] = [
-                        'op' => 'like',
-                        'val' => '%' . $value . '%'
-                    ];
-                }
-            }
-        }
+				/**
+				 * Default string filteration.
+				 */
+				} elseif ($value) {
+					$key = 'LOWER(' . $key . ')';
+					$value = strtolower($value);
+					$filters[$key] = [
+						'op' => 'like',
+						'val' => '%' . $value . '%'
+					];
+				}
+			}
+		}
 
-        return $filters;
-    }
+		return $filters;
+	}
 }

src/Modules/Core/Setting.php

Indentation +17 added lines, -17 removed lines

@@ -9,23 +9,23 @@
 class Setting extends Model
 {
 
-    use SoftDeletes, Translatable;
-    protected $table = 'settings';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id', 'key'];
-    public $fillable = ['name', 'value'];
-    public $translatable = ['value'];
-    public $casts = ['value' => 'json'];
+	use SoftDeletes, Translatable;
+	protected $table = 'settings';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id', 'key'];
+	public $fillable = ['name', 'value'];
+	public $translatable = ['value'];
+	public $casts = ['value' => 'json'];
     
-    public function newCollection(array $models = [])
-    {
-        return parent::newCollection($models)->keyBy('key');
-    }
+	public function newCollection(array $models = [])
+	{
+		return parent::newCollection($models)->keyBy('key');
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Setting::observe(SettingsObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Setting::observe(SettingsObserver::class);
+	}
 }

src/Modules/Permissions/Http/Resources/Permission.php

Indentation +20 added lines, -20 removed lines

@@ -7,25 +7,25 @@
 
 class Permission extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        if (! $this->resource) {
-            return [];
-        }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		if (! $this->resource) {
+			return [];
+		}
 
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'model' => $this->model,
-            'roles' => RoleResource::collection($this->whenLoaded('roles')),
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'model' => $this->model,
+			'roles' => RoleResource::collection($this->whenLoaded('roles')),
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

files/Handler.php

Indentation +78 added lines, -78 removed lines

@@ -9,88 +9,88 @@
 

 class Handler extends ExceptionHandler

 {

-    /**

-     * A list of the exception types that are not reported.

-     *

-     * @var array

-     */

-    protected $dontReport = [

-        \League\OAuth2\Server\Exception\OAuthServerException::class,

-    ];

+	/**

+	 * A list of the exception types that are not reported.

+	 *

+	 * @var array

+	 */

+	protected $dontReport = [

+		\League\OAuth2\Server\Exception\OAuthServerException::class,

+	];

 

-    /**

-     * A list of the inputs that are never flashed for validation exceptions.

-     *

-     * @var array

-     */

-    protected $dontFlash = [

-        'password',

-        'password_confirmation',

-    ];

+	/**

+	 * A list of the inputs that are never flashed for validation exceptions.

+	 *

+	 * @var array

+	 */

+	protected $dontFlash = [

+		'password',

+		'password_confirmation',

+	];

 

-    /**

-     * Report or log an exception.

-     *

-     * @param  \Throwable  $exception

-     * @return void

-     *

-     * @throws \Exception

-     */

-    public function report(Throwable $exception)

-    {

-        parent::report($exception);

-    }

+	/**

+	 * Report or log an exception.

+	 *

+	 * @param  \Throwable  $exception

+	 * @return void

+	 *

+	 * @throws \Exception

+	 */

+	public function report(Throwable $exception)

+	{

+		parent::report($exception);

+	}

 

-    /**

-     * Render an exception into an HTTP response.

-     *

-     * @param  \Illuminate\Http\Request  $request

-     * @param  \Throwable  $exception

-     * @return \Symfony\Component\HttpFoundation\Response

-     *

-     * @throws \Throwable

-     */

-    public function render($request, Throwable $exception)

-    {

-        $errors = $this->getErrorHandlers();

+	/**

+	 * Render an exception into an HTTP response.

+	 *

+	 * @param  \Illuminate\Http\Request  $request

+	 * @param  \Throwable  $exception

+	 * @return \Symfony\Component\HttpFoundation\Response

+	 *

+	 * @throws \Throwable

+	 */

+	public function render($request, Throwable $exception)

+	{

+		$errors = $this->getErrorHandlers();

 

-        if ($request->wantsJson()) {

-            $exceptionClass = get_class($exception);

-            return Arr::has($errors, $exceptionClass) ? $errors[$exceptionClass]($request, $exception) : parent::render($request, $exception);

-        }

+		if ($request->wantsJson()) {

+			$exceptionClass = get_class($exception);

+			return Arr::has($errors, $exceptionClass) ? $errors[$exceptionClass]($request, $exception) : parent::render($request, $exception);

+		}

 

-        return parent::render($request, $exception);

-    }

+		return parent::render($request, $exception);

+	}

 

-    /**

-     * Return handler for defined error types

-     *

-     * @return  array

-     */

-    protected function getErrorHandlers()

-    {

-        return [

-            \Illuminate\Auth\AuthenticationException::class => function ($request, $exception) {

-                Errors::unAuthorized();

-            },

-            \Illuminate\Database\QueryException::class => function ($request, $exception) {

-                Errors::dbQueryError();

-            },

-            \predis\connection\connectionexception::class => function ($request, $exception) {

-                Errors::redisNotRunning();

-            },

-            \RedisException::class => function ($request, $exception) {

-                Errors::redisNotRunning();

-            },

-            \GuzzleHttp\Exception\ClientException::class => function ($request, $exception) {

-                Errors::connectionError();

-            },

-            \Symfony\Component\HttpKernel\Exception\HttpException::class => function ($request, $exception) {

-                return response()->json(['errors' => [$exception->getStatusCode() === 404 ? ($exception->getMessage() ?: 'not found') : $exception->getMessage()]], $exception->getStatusCode());

-            },

-            \Illuminate\Validation\ValidationException::class => function ($request, $exception) {

-                return response()->json(['errors' => $exception->errors()], 422);

-            }

-        ];

-    }

+	/**

+	 * Return handler for defined error types

+	 *

+	 * @return  array

+	 */

+	protected function getErrorHandlers()

+	{

+		return [

+			\Illuminate\Auth\AuthenticationException::class => function ($request, $exception) {

+				Errors::unAuthorized();

+			},

+			\Illuminate\Database\QueryException::class => function ($request, $exception) {

+				Errors::dbQueryError();

+			},

+			\predis\connection\connectionexception::class => function ($request, $exception) {

+				Errors::redisNotRunning();

+			},

+			\RedisException::class => function ($request, $exception) {

+				Errors::redisNotRunning();

+			},

+			\GuzzleHttp\Exception\ClientException::class => function ($request, $exception) {

+				Errors::connectionError();

+			},

+			\Symfony\Component\HttpKernel\Exception\HttpException::class => function ($request, $exception) {

+				return response()->json(['errors' => [$exception->getStatusCode() === 404 ? ($exception->getMessage() ?: 'not found') : $exception->getMessage()]], $exception->getStatusCode());

+			},

+			\Illuminate\Validation\ValidationException::class => function ($request, $exception) {

+				return response()->json(['errors' => $exception->errors()], 422);

+			}

+		];

+	}

 }

files/EventServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -8,29 +8,29 @@
 
 class EventServiceProvider extends ServiceProvider
 {
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        Registered::class => [
-            SendEmailVerificationNotification::class,
-        ],
-        \SocialiteProviders\Manager\SocialiteWasCalled::class => [
-            'SocialiteProviders\\Apple\\AppleExtendSocialite@handle',
-        ],
-    ];
+	/**
+	 * The event listener mappings for the application.
+	 *
+	 * @var array
+	 */
+	protected $listen = [
+		Registered::class => [
+			SendEmailVerificationNotification::class,
+		],
+		\SocialiteProviders\Manager\SocialiteWasCalled::class => [
+			'SocialiteProviders\\Apple\\AppleExtendSocialite@handle',
+		],
+	];
 
-    /**
-     * Register any events for your application.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
+	/**
+	 * Register any events for your application.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		parent::boot();
 
-        //
-    }
+		//
+	}
 }

files/HttpKernel.php

Indentation +75 added lines, -75 removed lines

@@ -6,83 +6,83 @@
 

 class Kernel extends HttpKernel

 {

-    /**

-     * The application's global HTTP middleware stack.

-     *

-     * These middleware are run during every request to your application.

-     *

-     * @var array

-     */

-    protected $middleware = [

-        \Fruitcake\Cors\HandleCors::class,

-        \App\Http\Middleware\TrustProxies::class,

-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

-        \App\Http\Middleware\TrimStrings::class,

-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

-    ];

+	/**

+	 * The application's global HTTP middleware stack.

+	 *

+	 * These middleware are run during every request to your application.

+	 *

+	 * @var array

+	 */

+	protected $middleware = [

+		\Fruitcake\Cors\HandleCors::class,

+		\App\Http\Middleware\TrustProxies::class,

+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

+		\App\Http\Middleware\TrimStrings::class,

+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

+	];

 

-    /**

-     * The application's route middleware groups.

-     *

-     * @var array

-     */

-    protected $middlewareGroups = [

-        'web' => [

-            \App\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

-            \Illuminate\Session\Middleware\StartSession::class,

-            // \Illuminate\Session\Middleware\AuthenticateSession::class,

-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \App\Http\Middleware\VerifyCsrfToken::class,

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            'etag'

-        ],

+	/**

+	 * The application's route middleware groups.

+	 *

+	 * @var array

+	 */

+	protected $middlewareGroups = [

+		'web' => [

+			\App\Http\Middleware\EncryptCookies::class,

+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

+			\Illuminate\Session\Middleware\StartSession::class,

+			// \Illuminate\Session\Middleware\AuthenticateSession::class,

+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+			\App\Http\Middleware\VerifyCsrfToken::class,

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			'etag'

+		],

 

-        'api' => [

-            'throttle:60,1',

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            \App\Modules\Core\Http\Middleware\SetSessions::class,

-            \App\Modules\Core\Http\Middleware\CheckPermissions::class,

-            \App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

-            \App\Modules\Core\Http\Middleware\SetRelations::class,

-            'etag'

-        ],

-    ];

+		'api' => [

+			'throttle:60,1',

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			\App\Modules\Core\Http\Middleware\SetSessions::class,

+			\App\Modules\Core\Http\Middleware\CheckPermissions::class,

+			\App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

+			\App\Modules\Core\Http\Middleware\SetRelations::class,

+			'etag'

+		],

+	];

 

-    /**

-     * The application's route middleware.

-     *

-     * These middleware may be assigned to groups or used individually.

-     *

-     * @var array

-     */

-    protected $routeMiddleware = [

-        'auth' => \App\Http\Middleware\Authenticate::class,

-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

-        'can' => \Illuminate\Auth\Middleware\Authorize::class,

-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

-    ];

+	/**

+	 * The application's route middleware.

+	 *

+	 * These middleware may be assigned to groups or used individually.

+	 *

+	 * @var array

+	 */

+	protected $routeMiddleware = [

+		'auth' => \App\Http\Middleware\Authenticate::class,

+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

+		'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

+		'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

+		'can' => \Illuminate\Auth\Middleware\Authorize::class,

+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

+		'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

+		'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

+		'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

+	];

 

-    /**

-     * The priority-sorted list of middleware.

-     *

-     * This forces non-global middleware to always be in the given order.

-     *

-     * @var array

-     */

-    protected $middlewarePriority = [

-        \Illuminate\Session\Middleware\StartSession::class,

-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-        \App\Http\Middleware\Authenticate::class,

-        \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        \Illuminate\Session\Middleware\AuthenticateSession::class,

-        \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        \Illuminate\Auth\Middleware\Authorize::class,

-    ];

+	/**

+	 * The priority-sorted list of middleware.

+	 *

+	 * This forces non-global middleware to always be in the given order.

+	 *

+	 * @var array

+	 */

+	protected $middlewarePriority = [

+		\Illuminate\Session\Middleware\StartSession::class,

+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+		\App\Http\Middleware\Authenticate::class,

+		\Illuminate\Routing\Middleware\ThrottleRequests::class,

+		\Illuminate\Session\Middleware\AuthenticateSession::class,

+		\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		\Illuminate\Auth\Middleware\Authorize::class,

+	];

 }

src/ApiSkeletonServiceProvider.php

Indentation +36 added lines, -36 removed lines

@@ -6,42 +6,42 @@
 

 class ApiSkeletonServiceProvider extends ServiceProvider

 {

-    /**

-     * Perform post-registration booting of services.

-     *

-     * @return void

-     */

-    public function boot()

-    {

-        $this->publishes([

-            __DIR__.'/Modules'                               => app_path('Modules'),

-            __DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

-            __DIR__.'/../lang'                               => base_path('resources/lang'),

-            __DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

-            __DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

-            __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

-            __DIR__.'/../files/EventServiceProvider.php'     => app_path('Providers/EventServiceProvider.php'),

-            __DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

-            __DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

-            __DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

-            __DIR__.'/../files/Jenkinsfile'                  => base_path('/Jenkinsfile'),

-            __DIR__.'/../files/phpcs.xml'                    => base_path('/phpcs.xml'),

-            __DIR__.'/../files/docker'                       => base_path('/docker'),

-            __DIR__.'/../files/.dockerignore'                => base_path('/.dockerignore'),

-        ]);

+	/**

+	 * Perform post-registration booting of services.

+	 *

+	 * @return void

+	 */

+	public function boot()

+	{

+		$this->publishes([

+			__DIR__.'/Modules'                               => app_path('Modules'),

+			__DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

+			__DIR__.'/../lang'                               => base_path('resources/lang'),

+			__DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

+			__DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

+			__DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

+			__DIR__.'/../files/EventServiceProvider.php'     => app_path('Providers/EventServiceProvider.php'),

+			__DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

+			__DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

+			__DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

+			__DIR__.'/../files/Jenkinsfile'                  => base_path('/Jenkinsfile'),

+			__DIR__.'/../files/phpcs.xml'                    => base_path('/phpcs.xml'),

+			__DIR__.'/../files/docker'                       => base_path('/docker'),

+			__DIR__.'/../files/.dockerignore'                => base_path('/.dockerignore'),

+		]);

 

-        $this->publishes([

-            __DIR__.'/../files/auth.php' => config_path('auth.php'),

-        ], 'config');

-    }

+		$this->publishes([

+			__DIR__.'/../files/auth.php' => config_path('auth.php'),

+		], 'config');

+	}

 

-    /**

-     * Register any package services.

-     *

-     * @return void

-     */

-    public function register()

-    {

-        //

-    }

+	/**

+	 * Register any package services.

+	 *

+	 * @return void

+	 */

+	public function register()

+	{

+		//

+	}

 }

src/Modules/Reporting/Providers/ModuleServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -6,29 +6,29 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
 
-        $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('reporting', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('reporting', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

src/Modules/Reporting/Database/Factories/ReportFactory.php

Indentation +20 added lines, -20 removed lines

@@ -7,25 +7,25 @@
 
 class ReportFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Report::class;
+	/**
+	 * The name of the factory's corresponding model.
+	 *
+	 * @var string
+	 */
+	protected $model = Report::class;
 
-    /**
-     * Define the model's default state.
-     *
-     * @return array
-     */
-    public function definition()
-    {
-        return [
-            'report_name' => $this->faker->randomElement(['Users Count', 'Low Stock Products', 'Active Users']),
-            'view_name'   => $this->faker->word(),
-            'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now'),
-            'updated_at'  => $this->faker->dateTimeBetween('-1 years', 'now')
-        ];
-    }
+	/**
+	 * Define the model's default state.
+	 *
+	 * @return array
+	 */
+	public function definition()
+	{
+		return [
+			'report_name' => $this->faker->randomElement(['Users Count', 'Low Stock Products', 'Active Users']),
+			'view_name'   => $this->faker->word(),
+			'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now'),
+			'updated_at'  => $this->faker->dateTimeBetween('-1 years', 'now')
+		];
+	}
 }