SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Utl/ErrorHandler.php

Indentation +119 added lines, -119 removed lines

@@ -2,123 +2,123 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidRefreshToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noSocialEmail()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userAlreadyRegistered()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function connectionError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailNotConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailAlreadyConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidOldPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidConfirmationCode()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidConfirmationCode')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.generalError')];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidRefreshToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noSocialEmail()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userAlreadyRegistered()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function connectionError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailNotConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailAlreadyConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidOldPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidConfirmationCode()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidConfirmationCode')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.generalError')];
+		abort($error['status'], $error['message']);
+	}
 }

src/Modules/Core/Utl/ApiConsumer.php

Indentation +214 added lines, -214 removed lines

@@ -7,218 +7,218 @@
 class ApiConsumer
 {
 
-    private $app;
-
-    private $router;
-
-    private $request;
-
-    private $disableMiddleware = false;
-
-    /**
-     * @param \Illuminate\Foundation\Application $app
-     * @param \Illuminate\Http\Request $request,
-     * @param \Illuminate\Routing\Router $router
-     */
-    public function __construct(Application $app, Request $request, LaravelRouter $router)
-    {
-        $this->app = $app;
-        $this->request = $request;
-        $this->router = $router;
-    }
-
-    /**
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function get()
-    {
-        return $this->quickCall('GET', func_get_args());
-    }
-
-    /**
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function post()
-    {
-        return $this->quickCall('POST', func_get_args());
-    }
-
-    /**
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function put()
-    {
-        return $this->quickCall('PUT', func_get_args());
-    }
-
-    /**
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function delete()
-    {
-        return $this->quickCall('DELETE', func_get_args());
-    }
-
-    /**
-     * @param  array $requests An array of requests
-     * @return array
-     */
-    public function batchRequest(array $requests)
-    {
-        foreach ($requests as $i => $request) {
-            $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request);
-        }
-
-        return $requests;
-    }
-
-    /**
-     * @param  string $method
-     * @param  array  $args
-     * @return \Illuminate\Http\Response
-     */
-    public function quickCall($method, array $args)
-    {
-        array_unshift($args, $method);
-        return call_user_func_array([$this, "singleRequest"], $args);
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        // Save the current request so we can reset the router back to it
-        // after we've completed our internal request.
-        $currentRequest = $this->request->instance()->duplicate();
-
-        $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers);
-
-        if ($this->disableMiddleware) {
-            $this->app->instance('middleware.disable', true);
-        }
-
-        $response = $this->request($method, $uri, $data, $headers, $content);
-
-        if ($this->disableMiddleware) {
-            $this->app->instance('middleware.disable', false);
-        }
-
-        // Once the request has completed we reset the currentRequest of the router
-        // to match the original request.
-        $this->request->instance()->initialize(
-            $currentRequest->query->all(),
-            $currentRequest->request->all(),
-            $currentRequest->attributes->all(),
-            $currentRequest->cookies->all(),
-            $currentRequest->files->all(),
-            $currentRequest->server->all(),
-            $currentRequest->content
-        );
-
-        return $response;
-    }
-
-    private function overrideHeaders(array $default, array $headers)
-    {
-        $headers = $this->transformHeadersToUppercaseUnderscoreType($headers);
-        return array_merge($default, $headers);
-    }
-
-    public function enableMiddleware()
-    {
-        $this->disableMiddleware = false;
-    }
-
-    public function disableMiddleware()
-    {
-        $this->disableMiddleware = true;
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    private function request($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        // Create a new request object for the internal request
-        $request = $this->createRequest($method, $uri, $data, $headers, $content);
-
-        // Handle the request in the kernel and prepare a response
-        $response = $this->router->prepareResponse($request, $this->app->handle($request));
-
-        return $response;
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Request
-     */
-    private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        $server = $this->transformHeadersToServerVariables($headers);
-
-        return $this->request->create($uri, $method, $data, [], [], $server, $content);
-    }
-
-    private function transformHeadersToUppercaseUnderscoreType($headers)
-    {
-        $transformed = [];
-
-        foreach ($headers as $headerType => $headerValue) {
-            $headerType = strtoupper(str_replace('-', '_', $headerType));
-
-            $transformed[$headerType] = $headerValue;
-        }
-
-        return $transformed;
-    }
-
-    /**
-     * https://github.com/symfony/symfony/issues/5074
-     *
-     * @param  array $headers
-     * @return array
-     */
-    private function transformHeadersToServerVariables($headers)
-    {
-        $server = [];
-
-        foreach ($headers as $headerType => $headerValue) {
-            $headerType = 'HTTP_' . $headerType;
-
-            $server[$headerType] = $headerValue;
-        }
-
-        return $server;
-    }
+	private $app;
+
+	private $router;
+
+	private $request;
+
+	private $disableMiddleware = false;
+
+	/**
+	 * @param \Illuminate\Foundation\Application $app
+	 * @param \Illuminate\Http\Request $request,
+	 * @param \Illuminate\Routing\Router $router
+	 */
+	public function __construct(Application $app, Request $request, LaravelRouter $router)
+	{
+		$this->app = $app;
+		$this->request = $request;
+		$this->router = $router;
+	}
+
+	/**
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function get()
+	{
+		return $this->quickCall('GET', func_get_args());
+	}
+
+	/**
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function post()
+	{
+		return $this->quickCall('POST', func_get_args());
+	}
+
+	/**
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function put()
+	{
+		return $this->quickCall('PUT', func_get_args());
+	}
+
+	/**
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete()
+	{
+		return $this->quickCall('DELETE', func_get_args());
+	}
+
+	/**
+	 * @param  array $requests An array of requests
+	 * @return array
+	 */
+	public function batchRequest(array $requests)
+	{
+		foreach ($requests as $i => $request) {
+			$requests[$i] = call_user_func_array([$this, 'singleRequest'], $request);
+		}
+
+		return $requests;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  array  $args
+	 * @return \Illuminate\Http\Response
+	 */
+	public function quickCall($method, array $args)
+	{
+		array_unshift($args, $method);
+		return call_user_func_array([$this, "singleRequest"], $args);
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		// Save the current request so we can reset the router back to it
+		// after we've completed our internal request.
+		$currentRequest = $this->request->instance()->duplicate();
+
+		$headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers);
+
+		if ($this->disableMiddleware) {
+			$this->app->instance('middleware.disable', true);
+		}
+
+		$response = $this->request($method, $uri, $data, $headers, $content);
+
+		if ($this->disableMiddleware) {
+			$this->app->instance('middleware.disable', false);
+		}
+
+		// Once the request has completed we reset the currentRequest of the router
+		// to match the original request.
+		$this->request->instance()->initialize(
+			$currentRequest->query->all(),
+			$currentRequest->request->all(),
+			$currentRequest->attributes->all(),
+			$currentRequest->cookies->all(),
+			$currentRequest->files->all(),
+			$currentRequest->server->all(),
+			$currentRequest->content
+		);
+
+		return $response;
+	}
+
+	private function overrideHeaders(array $default, array $headers)
+	{
+		$headers = $this->transformHeadersToUppercaseUnderscoreType($headers);
+		return array_merge($default, $headers);
+	}
+
+	public function enableMiddleware()
+	{
+		$this->disableMiddleware = false;
+	}
+
+	public function disableMiddleware()
+	{
+		$this->disableMiddleware = true;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	private function request($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		// Create a new request object for the internal request
+		$request = $this->createRequest($method, $uri, $data, $headers, $content);
+
+		// Handle the request in the kernel and prepare a response
+		$response = $this->router->prepareResponse($request, $this->app->handle($request));
+
+		return $response;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Request
+	 */
+	private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		$server = $this->transformHeadersToServerVariables($headers);
+
+		return $this->request->create($uri, $method, $data, [], [], $server, $content);
+	}
+
+	private function transformHeadersToUppercaseUnderscoreType($headers)
+	{
+		$transformed = [];
+
+		foreach ($headers as $headerType => $headerValue) {
+			$headerType = strtoupper(str_replace('-', '_', $headerType));
+
+			$transformed[$headerType] = $headerValue;
+		}
+
+		return $transformed;
+	}
+
+	/**
+	 * https://github.com/symfony/symfony/issues/5074
+	 *
+	 * @param  array $headers
+	 * @return array
+	 */
+	private function transformHeadersToServerVariables($headers)
+	{
+		$server = [];
+
+		foreach ($headers as $headerType => $headerValue) {
+			$headerType = 'HTTP_' . $headerType;
+
+			$server[$headerType] = $headerValue;
+		}
+
+		return $server;
+	}
 }

src/Modules/Core/Routes/api.php

Indentation +11 added lines, -11 removed lines

@@ -13,16 +13,16 @@
 
 Route::group(['prefix' => 'core'], function () {
 
-    Route::group(['prefix' => 'settings'], function () {
+	Route::group(['prefix' => 'settings'], function () {
         
-        Route::get('list/{sortBy?}/{desc?}', 'SettingsController@index');
-        Route::get('find/{id}', 'SettingsController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@paginate');
-        Route::post('first', 'SettingsController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'SettingsController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@paginateby');
-        Route::post('save', 'SettingsController@save');
-        Route::post('save/many', 'SettingsController@saveMany');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'SettingsController@index');
+		Route::get('find/{id}', 'SettingsController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@paginate');
+		Route::post('first', 'SettingsController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'SettingsController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'SettingsController@paginateby');
+		Route::post('save', 'SettingsController@save');
+		Route::post('save/many', 'SettingsController@saveMany');
+	});
 });

src/Modules/Core/ModelObservers/SettingsObserver.php

Indentation +54 added lines, -54 removed lines

@@ -6,67 +6,67 @@
 class SettingsObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent the creating of the settings.
-     *
-     * @param  object $model the model beign created.
-     * @return void
-     */
-    public function creating($model)
-    {
-        \ErrorHandler::cannotCreateSetting();
-    }
+	/**
+	 * Prevent the creating of the settings.
+	 *
+	 * @param  object $model the model beign created.
+	 * @return void
+	 */
+	public function creating($model)
+	{
+		\ErrorHandler::cannotCreateSetting();
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the setting key.
-     *
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal('key') !== $model->key) {
-            \ErrorHandler::cannotUpdateSettingKey();
-        }
-    }
+	/**
+	 * Prevent updating of the setting key.
+	 *
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal('key') !== $model->key) {
+			\ErrorHandler::cannotUpdateSettingKey();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    public function deleting($model)
-    {
-        //
-    }
+	public function deleting($model)
+	{
+		//
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Core/Traits/Translatable.php

Indentation +36 added lines, -36 removed lines

@@ -2,46 +2,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);
+	/**
+	 * 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);
-            }
-        }
+		foreach ($model->attributes as $key => $value) {
+			if (isset($this->translatable) && in_array($key, $this->translatable)) {
+				$model->$key = $this->getTranslatedAttribute($value);
+			}
+		}
 
-        return $model;
-    }
+		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';
+	/**
+	 * 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 == 'all') {
+			return $values;
+		}
 
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
-        }
+		if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
+		}
 
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }

src/Modules/Notifications/Resources/Lang/en/notifications.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your notification messages.
-     */
+	/**
+	 * Here goes your notification messages.
+	 */
 
 ];

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +48 added lines, -48 removed lines

@@ -6,53 +6,53 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
-
-        $factory = app('Illuminate\Database\Eloquent\Factory');
-        $factory->load(__DIR__.'/../Database/Factories');
-    }
-
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the IoC Container
-        \App::bind('Core', function () {
-            return new \App\Modules\Core\Core;
-        });
-
-        //Bind ErrorHandler Facade to the IoC Container
-        \App::bind('ErrorHandler', function () {
-            return new \App\Modules\Core\Utl\ErrorHandler;
-        });
-
-        //Bind CoreConfig Facade to the IoC Container
-        \App::bind('CoreConfig', function () {
-            return new \App\Modules\Core\Utl\CoreConfig;
-        });
-
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('Media', function () {
-            return new \App\Modules\Core\Utl\Media;
-        });
-
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('ApiConsumer', function () {
-            $app = app();
-            return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
-        });
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+
+		$factory = app('Illuminate\Database\Eloquent\Factory');
+		$factory->load(__DIR__.'/../Database/Factories');
+	}
+
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the IoC Container
+		\App::bind('Core', function () {
+			return new \App\Modules\Core\Core;
+		});
+
+		//Bind ErrorHandler Facade to the IoC Container
+		\App::bind('ErrorHandler', function () {
+			return new \App\Modules\Core\Utl\ErrorHandler;
+		});
+
+		//Bind CoreConfig Facade to the IoC Container
+		\App::bind('CoreConfig', function () {
+			return new \App\Modules\Core\Utl\CoreConfig;
+		});
+
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('Media', function () {
+			return new \App\Modules\Core\Utl\Media;
+		});
+
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('ApiConsumer', function () {
+			$app = app();
+			return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

src/ApiSkeletonServiceProvider.php

Indentation +35 added lines, -35 removed lines

@@ -6,41 +6,41 @@
 
 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/Kernel.php'                   => app_path('Console/Kernel.php'),
-            __DIR__.'/../files/channels.php'                 => app_path('routes/channels.php'),
-            __DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),
-        ]);
+	/**
+	 * 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/Kernel.php'                   => app_path('Console/Kernel.php'),
+			__DIR__.'/../files/channels.php'                 => app_path('routes/channels.php'),
+			__DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),
+		]);
 
-        $this->publishes([
-            __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
-            __DIR__.'/../files/auth.php'      => config_path('auth.php'),
-        ], 'config');
-    }
+		$this->publishes([
+			__DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
+			__DIR__.'/../files/auth.php'      => config_path('auth.php'),
+		], 'config');
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/skeleton.php',
-            'skeleton'
-        );
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../config/skeleton.php',
+			'skeleton'
+		);
+	}
 }

files/Handler.php

Indentation +59 added lines, -59 removed lines

@@ -7,67 +7,67 @@
 
 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.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
-     * @return void
-     */
-    public function report(Exception $exception)
-    {
-        parent::report($exception);
-    }
+	/**
+	 * Report or log an exception.
+	 *
+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+	 *
+	 * @param  \Exception  $exception
+	 * @return void
+	 */
+	public function report(Exception $exception)
+	{
+		parent::report($exception);
+	}
 
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        if ($request->wantsJson()) {
-            if ($exception instanceof \Illuminate\Auth\AuthenticationException) {
-                \ErrorHandler::unAuthorized();
-            }
-            if ($exception instanceof \Illuminate\Database\QueryException) {
-                \ErrorHandler::dbQueryError();
-            } elseif ($exception instanceof \predis\connection\connectionexception) {
-                \ErrorHandler::redisNotRunning();
-            } elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {
-                \ErrorHandler::connectionError();
-            } elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
-                $errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();
-                return \Response::json(['errors' => [$errors]], $exception->getStatusCode());
-            } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {
-                return \Response::json(['errors' => $exception->errors()], 422);
-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
-                return parent::render($request, $exception);
-            }
-        }
+	/**
+	 * Render an exception into an HTTP response.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Exception  $exception
+	 * @return \Illuminate\Http\Response
+	 */
+	public function render($request, Exception $exception)
+	{
+		if ($request->wantsJson()) {
+			if ($exception instanceof \Illuminate\Auth\AuthenticationException) {
+				\ErrorHandler::unAuthorized();
+			}
+			if ($exception instanceof \Illuminate\Database\QueryException) {
+				\ErrorHandler::dbQueryError();
+			} elseif ($exception instanceof \predis\connection\connectionexception) {
+				\ErrorHandler::redisNotRunning();
+			} elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {
+				\ErrorHandler::connectionError();
+			} elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
+				$errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();
+				return \Response::json(['errors' => [$errors]], $exception->getStatusCode());
+			} elseif ($exception instanceof \Illuminate\Validation\ValidationException) {
+				return \Response::json(['errors' => $exception->errors()], 422);
+			} elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
+				return parent::render($request, $exception);
+			}
+		}
         
-        return parent::render($request, $exception);
-    }
+		return parent::render($request, $exception);
+	}
 }