@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Authentication Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
| 17 | - 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
| 16 | + 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
| 17 | + 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
| 18 | 18 | |
| 19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Password Reminder Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
| 17 | - 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
| 18 | - 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
| 19 | - 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
| 20 | - 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
| 16 | + 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
| 17 | + 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
| 18 | + 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
| 19 | + 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
| 20 | + 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
| 21 | 21 | |
| 22 | 22 | ]; |
@@ -2,27 +2,27 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * List of error messages used in core module. |
|
| 7 | - */ |
|
| 8 | - 'unAuthorized' => 'Please login before any action', |
|
| 9 | - 'invalidRefreshToken' => 'Invalid refresh token', |
|
| 10 | - 'noPermissions' => 'No permissions', |
|
| 11 | - 'loginFailed' => 'Wrong mail or password', |
|
| 12 | - 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
| 13 | - 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
| 14 | - 'connectionError' => 'Connection error', |
|
| 15 | - 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
| 16 | - 'dbQueryError' => 'Please check the given inputes', |
|
| 17 | - 'cannotCreateSetting' => 'Can\'t create setting', |
|
| 18 | - 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
| 19 | - 'userIsBlocked' => 'You have been blocked', |
|
| 20 | - 'invalidResetToken' => 'Reset password token is invalid', |
|
| 21 | - 'invalidResetPassword' => 'Reset password is invalid', |
|
| 22 | - 'invalidOldPassword' => 'Old password is invalid', |
|
| 23 | - 'notFound' => 'The requested :replace not found', |
|
| 24 | - 'generalError' => 'Something went wrong', |
|
| 25 | - 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
| 26 | - 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
| 5 | + /** |
|
| 6 | + * List of error messages used in core module. |
|
| 7 | + */ |
|
| 8 | + 'unAuthorized' => 'Please login before any action', |
|
| 9 | + 'invalidRefreshToken' => 'Invalid refresh token', |
|
| 10 | + 'noPermissions' => 'No permissions', |
|
| 11 | + 'loginFailed' => 'Wrong mail or password', |
|
| 12 | + 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
| 13 | + 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
| 14 | + 'connectionError' => 'Connection error', |
|
| 15 | + 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
| 16 | + 'dbQueryError' => 'Please check the given inputes', |
|
| 17 | + 'cannotCreateSetting' => 'Can\'t create setting', |
|
| 18 | + 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
| 19 | + 'userIsBlocked' => 'You have been blocked', |
|
| 20 | + 'invalidResetToken' => 'Reset password token is invalid', |
|
| 21 | + 'invalidResetPassword' => 'Reset password is invalid', |
|
| 22 | + 'invalidOldPassword' => 'Old password is invalid', |
|
| 23 | + 'notFound' => 'The requested :replace not found', |
|
| 24 | + 'generalError' => 'Something went wrong', |
|
| 25 | + 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
| 26 | + 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
| 27 | 27 | |
| 28 | 28 | ]; |
| 29 | 29 | \ No newline at end of file |
@@ -2,27 +2,27 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * List of error messages used in core module. |
|
| 7 | - */ |
|
| 8 | - 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
| 9 | - 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
| 10 | - 'noPermissions' => 'لا توجد صلاحية', |
|
| 11 | - 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
| 12 | - 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
| 13 | - 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
| 14 | - 'connectionError' => 'خطأ في الاتصال', |
|
| 15 | - 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
| 16 | - 'dbQueryError' => 'خطا في البيانات', |
|
| 17 | - 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
| 18 | - 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
| 19 | - 'userIsBlocked' => 'لقد تم حظرك', |
|
| 20 | - 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
| 21 | - 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
| 22 | - 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
| 23 | - 'notFound' => 'ال :replace المطلوب غير موجود', |
|
| 24 | - 'generalError' => 'حدث خطا ما', |
|
| 25 | - 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
| 26 | - 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
| 5 | + /** |
|
| 6 | + * List of error messages used in core module. |
|
| 7 | + */ |
|
| 8 | + 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
| 9 | + 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
| 10 | + 'noPermissions' => 'لا توجد صلاحية', |
|
| 11 | + 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
| 12 | + 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
| 13 | + 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
| 14 | + 'connectionError' => 'خطأ في الاتصال', |
|
| 15 | + 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
| 16 | + 'dbQueryError' => 'خطا في البيانات', |
|
| 17 | + 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
| 18 | + 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
| 19 | + 'userIsBlocked' => 'لقد تم حظرك', |
|
| 20 | + 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
| 21 | + 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
| 22 | + 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
| 23 | + 'notFound' => 'ال :replace المطلوب غير موجود', |
|
| 24 | + 'generalError' => 'حدث خطا ما', |
|
| 25 | + 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
| 26 | + 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
| 27 | 27 | |
| 28 | 28 | ]; |
| 29 | 29 | \ No newline at end of file |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * Here goes your notification messages. |
|
| 7 | - */ |
|
| 5 | + /** |
|
| 6 | + * Here goes your notification messages. |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | ]; |
| 10 | 10 | \ No newline at end of file |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * Here goes your notification messages. |
|
| 7 | - */ |
|
| 5 | + /** |
|
| 6 | + * Here goes your notification messages. |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | ]; |
| 10 | 10 | \ No newline at end of file |
@@ -8,31 +8,31 @@ |
||
| 8 | 8 | |
| 9 | 9 | class AuthServiceProvider extends ServiceProvider |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * The policy mappings for the application. |
|
| 13 | - * |
|
| 14 | - * @var array |
|
| 15 | - */ |
|
| 16 | - protected $policies = [ |
|
| 17 | - 'App\Model' => 'App\Policies\ModelPolicy', |
|
| 18 | - ]; |
|
| 11 | + /** |
|
| 12 | + * The policy mappings for the application. |
|
| 13 | + * |
|
| 14 | + * @var array |
|
| 15 | + */ |
|
| 16 | + protected $policies = [ |
|
| 17 | + 'App\Model' => 'App\Policies\ModelPolicy', |
|
| 18 | + ]; |
|
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * Register any authentication / authorization services. |
|
| 22 | - * |
|
| 23 | - * @return void |
|
| 24 | - */ |
|
| 25 | - public function boot() |
|
| 26 | - { |
|
| 27 | - $this->registerPolicies(); |
|
| 20 | + /** |
|
| 21 | + * Register any authentication / authorization services. |
|
| 22 | + * |
|
| 23 | + * @return void |
|
| 24 | + */ |
|
| 25 | + public function boot() |
|
| 26 | + { |
|
| 27 | + $this->registerPolicies(); |
|
| 28 | 28 | |
| 29 | - Passport::routes(function ($router) { |
|
| 30 | - $router->forAuthorization(); |
|
| 31 | - $router->forAccessTokens(); |
|
| 32 | - $router->forPersonalAccessTokens(); |
|
| 33 | - $router->forTransientTokens(); |
|
| 34 | - }); |
|
| 35 | - Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10)); |
|
| 36 | - Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10)); |
|
| 37 | - } |
|
| 29 | + Passport::routes(function ($router) { |
|
| 30 | + $router->forAuthorization(); |
|
| 31 | + $router->forAccessTokens(); |
|
| 32 | + $router->forPersonalAccessTokens(); |
|
| 33 | + $router->forTransientTokens(); |
|
| 34 | + }); |
|
| 35 | + Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10)); |
|
| 36 | + Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10)); |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | { |
| 27 | 27 | $this->registerPolicies(); |
| 28 | 28 | |
| 29 | - Passport::routes(function ($router) { |
|
| 29 | + Passport::routes(function($router) { |
|
| 30 | 30 | $router->forAuthorization(); |
| 31 | 31 | $router->forAccessTokens(); |
| 32 | 32 | $router->forPersonalAccessTokens(); |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Authentication Defaults |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'defaults' => [ |
|
| 17 | - 'guard' => 'web', |
|
| 18 | - 'passwords' => 'users', |
|
| 19 | - ], |
|
| 16 | + 'defaults' => [ |
|
| 17 | + 'guard' => 'web', |
|
| 18 | + 'passwords' => 'users', |
|
| 19 | + ], |
|
| 20 | 20 | |
| 21 | - /* |
|
| 21 | + /* |
|
| 22 | 22 | |-------------------------------------------------------------------------- |
| 23 | 23 | | Authentication Guards |
| 24 | 24 | |-------------------------------------------------------------------------- |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | | |
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | - 'guards' => [ |
|
| 39 | - 'web' => [ |
|
| 40 | - 'driver' => 'session', |
|
| 41 | - 'provider' => 'users', |
|
| 42 | - ], |
|
| 38 | + 'guards' => [ |
|
| 39 | + 'web' => [ |
|
| 40 | + 'driver' => 'session', |
|
| 41 | + 'provider' => 'users', |
|
| 42 | + ], |
|
| 43 | 43 | |
| 44 | - 'api' => [ |
|
| 45 | - 'driver' => 'passport', |
|
| 46 | - 'provider' => 'users', |
|
| 47 | - ], |
|
| 48 | - ], |
|
| 44 | + 'api' => [ |
|
| 45 | + 'driver' => 'passport', |
|
| 46 | + 'provider' => 'users', |
|
| 47 | + ], |
|
| 48 | + ], |
|
| 49 | 49 | |
| 50 | - /* |
|
| 50 | + /* |
|
| 51 | 51 | |-------------------------------------------------------------------------- |
| 52 | 52 | | User Providers |
| 53 | 53 | |-------------------------------------------------------------------------- |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | | |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - 'providers' => [ |
|
| 68 | - 'users' => [ |
|
| 69 | - 'driver' => 'eloquent', |
|
| 70 | - 'model' => App\Modules\Acl\AclUser::class, |
|
| 71 | - ], |
|
| 67 | + 'providers' => [ |
|
| 68 | + 'users' => [ |
|
| 69 | + 'driver' => 'eloquent', |
|
| 70 | + 'model' => App\Modules\Acl\AclUser::class, |
|
| 71 | + ], |
|
| 72 | 72 | |
| 73 | - // 'users' => [ |
|
| 74 | - // 'driver' => 'database', |
|
| 75 | - // 'table' => 'users', |
|
| 76 | - // ], |
|
| 77 | - ], |
|
| 73 | + // 'users' => [ |
|
| 74 | + // 'driver' => 'database', |
|
| 75 | + // 'table' => 'users', |
|
| 76 | + // ], |
|
| 77 | + ], |
|
| 78 | 78 | |
| 79 | - /* |
|
| 79 | + /* |
|
| 80 | 80 | |-------------------------------------------------------------------------- |
| 81 | 81 | | Resetting Passwords |
| 82 | 82 | |-------------------------------------------------------------------------- |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | | |
| 92 | 92 | */ |
| 93 | 93 | |
| 94 | - 'passwords' => [ |
|
| 95 | - 'users' => [ |
|
| 96 | - 'provider' => 'users', |
|
| 97 | - 'table' => 'password_resets', |
|
| 98 | - 'expire' => 60, |
|
| 99 | - ], |
|
| 100 | - ], |
|
| 94 | + 'passwords' => [ |
|
| 95 | + 'users' => [ |
|
| 96 | + 'provider' => 'users', |
|
| 97 | + 'table' => 'password_resets', |
|
| 98 | + 'expire' => 60, |
|
| 99 | + ], |
|
| 100 | + ], |
|
| 101 | 101 | |
| 102 | 102 | ]; |
@@ -7,81 +7,81 @@ |
||
| 7 | 7 | |
| 8 | 8 | class Handler extends ExceptionHandler |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * A list of the exception types that are not reported. |
|
| 12 | - * |
|
| 13 | - * @var array |
|
| 14 | - */ |
|
| 15 | - protected $dontReport = [ |
|
| 16 | - \League\OAuth2\Server\Exception\OAuthServerException::class, |
|
| 17 | - ]; |
|
| 10 | + /** |
|
| 11 | + * A list of the exception types that are not reported. |
|
| 12 | + * |
|
| 13 | + * @var array |
|
| 14 | + */ |
|
| 15 | + protected $dontReport = [ |
|
| 16 | + \League\OAuth2\Server\Exception\OAuthServerException::class, |
|
| 17 | + ]; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * A list of the inputs that are never flashed for validation exceptions. |
|
| 21 | - * |
|
| 22 | - * @var array |
|
| 23 | - */ |
|
| 24 | - protected $dontFlash = [ |
|
| 25 | - 'password', |
|
| 26 | - 'password_confirmation', |
|
| 27 | - ]; |
|
| 19 | + /** |
|
| 20 | + * A list of the inputs that are never flashed for validation exceptions. |
|
| 21 | + * |
|
| 22 | + * @var array |
|
| 23 | + */ |
|
| 24 | + protected $dontFlash = [ |
|
| 25 | + 'password', |
|
| 26 | + 'password_confirmation', |
|
| 27 | + ]; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Report or log an exception. |
|
| 31 | - * |
|
| 32 | - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 33 | - * |
|
| 34 | - * @param \Exception $exception |
|
| 35 | - * @return void |
|
| 36 | - */ |
|
| 37 | - public function report(Exception $exception) |
|
| 38 | - { |
|
| 39 | - parent::report($exception); |
|
| 40 | - } |
|
| 29 | + /** |
|
| 30 | + * Report or log an exception. |
|
| 31 | + * |
|
| 32 | + * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 33 | + * |
|
| 34 | + * @param \Exception $exception |
|
| 35 | + * @return void |
|
| 36 | + */ |
|
| 37 | + public function report(Exception $exception) |
|
| 38 | + { |
|
| 39 | + parent::report($exception); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * Render an exception into an HTTP response. |
|
| 44 | - * |
|
| 45 | - * @param \Illuminate\Http\Request $request |
|
| 46 | - * @param \Exception $exception |
|
| 47 | - * @return \Illuminate\Http\Response |
|
| 48 | - */ |
|
| 49 | - public function render($request, Exception $exception) |
|
| 50 | - { |
|
| 51 | - if ($request->wantsJson()) |
|
| 52 | - { |
|
| 53 | - if ($exception instanceof \Illuminate\Auth\AuthenticationException) |
|
| 54 | - { |
|
| 55 | - \ErrorHandler::unAuthorized(); |
|
| 56 | - } |
|
| 57 | - if ($exception instanceof \Illuminate\Database\QueryException) |
|
| 58 | - { |
|
| 59 | - \ErrorHandler::dbQueryError(); |
|
| 60 | - } |
|
| 61 | - else if ($exception instanceof \predis\connection\connectionexception) |
|
| 62 | - { |
|
| 63 | - \ErrorHandler::redisNotRunning(); |
|
| 64 | - } |
|
| 65 | - else if ($exception instanceof \GuzzleHttp\Exception\ClientException) |
|
| 66 | - { |
|
| 67 | - \ErrorHandler::connectionError(); |
|
| 68 | - } |
|
| 69 | - else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) |
|
| 70 | - { |
|
| 71 | - return \Response::json($exception->getMessage(), $exception->getStatusCode()); |
|
| 72 | - } |
|
| 73 | - else if ($exception instanceof \Illuminate\Validation\ValidationException) |
|
| 74 | - { |
|
| 75 | - return \Response::json($exception->errors(), 422); |
|
| 76 | - } |
|
| 77 | - else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException) |
|
| 78 | - { |
|
| 79 | - return parent::render($request, $exception); |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - else |
|
| 83 | - { |
|
| 84 | - return parent::render($request, $exception); |
|
| 85 | - } |
|
| 86 | - } |
|
| 42 | + /** |
|
| 43 | + * Render an exception into an HTTP response. |
|
| 44 | + * |
|
| 45 | + * @param \Illuminate\Http\Request $request |
|
| 46 | + * @param \Exception $exception |
|
| 47 | + * @return \Illuminate\Http\Response |
|
| 48 | + */ |
|
| 49 | + public function render($request, Exception $exception) |
|
| 50 | + { |
|
| 51 | + if ($request->wantsJson()) |
|
| 52 | + { |
|
| 53 | + if ($exception instanceof \Illuminate\Auth\AuthenticationException) |
|
| 54 | + { |
|
| 55 | + \ErrorHandler::unAuthorized(); |
|
| 56 | + } |
|
| 57 | + if ($exception instanceof \Illuminate\Database\QueryException) |
|
| 58 | + { |
|
| 59 | + \ErrorHandler::dbQueryError(); |
|
| 60 | + } |
|
| 61 | + else if ($exception instanceof \predis\connection\connectionexception) |
|
| 62 | + { |
|
| 63 | + \ErrorHandler::redisNotRunning(); |
|
| 64 | + } |
|
| 65 | + else if ($exception instanceof \GuzzleHttp\Exception\ClientException) |
|
| 66 | + { |
|
| 67 | + \ErrorHandler::connectionError(); |
|
| 68 | + } |
|
| 69 | + else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) |
|
| 70 | + { |
|
| 71 | + return \Response::json($exception->getMessage(), $exception->getStatusCode()); |
|
| 72 | + } |
|
| 73 | + else if ($exception instanceof \Illuminate\Validation\ValidationException) |
|
| 74 | + { |
|
| 75 | + return \Response::json($exception->errors(), 422); |
|
| 76 | + } |
|
| 77 | + else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException) |
|
| 78 | + { |
|
| 79 | + return parent::render($request, $exception); |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + else |
|
| 83 | + { |
|
| 84 | + return parent::render($request, $exception); |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -57,29 +57,23 @@ |
||
| 57 | 57 | if ($exception instanceof \Illuminate\Database\QueryException) |
| 58 | 58 | { |
| 59 | 59 | \ErrorHandler::dbQueryError(); |
| 60 | - } |
|
| 61 | - else if ($exception instanceof \predis\connection\connectionexception) |
|
| 60 | + } else if ($exception instanceof \predis\connection\connectionexception) |
|
| 62 | 61 | { |
| 63 | 62 | \ErrorHandler::redisNotRunning(); |
| 64 | - } |
|
| 65 | - else if ($exception instanceof \GuzzleHttp\Exception\ClientException) |
|
| 63 | + } else if ($exception instanceof \GuzzleHttp\Exception\ClientException) |
|
| 66 | 64 | { |
| 67 | 65 | \ErrorHandler::connectionError(); |
| 68 | - } |
|
| 69 | - else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) |
|
| 66 | + } else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) |
|
| 70 | 67 | { |
| 71 | 68 | return \Response::json($exception->getMessage(), $exception->getStatusCode()); |
| 72 | - } |
|
| 73 | - else if ($exception instanceof \Illuminate\Validation\ValidationException) |
|
| 69 | + } else if ($exception instanceof \Illuminate\Validation\ValidationException) |
|
| 74 | 70 | { |
| 75 | 71 | return \Response::json($exception->errors(), 422); |
| 76 | - } |
|
| 77 | - else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException) |
|
| 72 | + } else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException) |
|
| 78 | 73 | { |
| 79 | 74 | return parent::render($request, $exception); |
| 80 | 75 | } |
| 81 | - } |
|
| 82 | - else |
|
| 76 | + } else |
|
| 83 | 77 | { |
| 84 | 78 | return parent::render($request, $exception); |
| 85 | 79 | } |