From 165d50d9718f90c8a0280729be847d174494ad76 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 12 May 2017 07:19:45 +1000 Subject: [PATCH] Changed the logic to use the container binding event Validator is now deferred so this won't be available early --- modules/system/ServiceProvider.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index 83a50ff98..4de9d8f3d 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -472,18 +472,19 @@ class ServiceProvider extends ModuleServiceProvider */ protected function registerValidator() { - /* - * Allowed file extensions, as opposed to mime types. - * - extensions: png,jpg,txt - */ - Validator::extend('extensions', function ($attribute, $value, $parameters) { - $extension = strtolower($value->getClientOriginalExtension()); - return in_array($extension, $parameters); - }); + $this->app->resolving('validator', function($validator) { + /* + * Allowed file extensions, as opposed to mime types. + * - extensions: png,jpg,txt + */ + $validator->extend('extensions', function ($attribute, $value, $parameters) { + $extension = strtolower($value->getClientOriginalExtension()); + return in_array($extension, $parameters); + }); - Validator::replacer('extensions', function ($message, $attribute, $rule, $parameters) { - return strtr($message, [':values' => implode(', ', $parameters)]); + $validator->replacer('extensions', function ($message, $attribute, $rule, $parameters) { + return strtr($message, [':values' => implode(', ', $parameters)]); + }); }); } - }