From 45262e6d0451b1f08cbde5a08b4d3c6d40cf8dfd Mon Sep 17 00:00:00 2001 From: netpok Date: Thu, 10 Jun 2021 22:30:28 +0200 Subject: [PATCH] [8.x] Remove illuminate/foundation dependency from Password validation (#37648) * Replace foundation translate call * Update Password.php Co-authored-by: Taylor Otwell --- src/Illuminate/Validation/Rules/Password.php | 25 ++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Validation/Rules/Password.php b/src/Illuminate/Validation/Rules/Password.php index 33ce90ab136c..8b2607acba0f 100644 --- a/src/Illuminate/Validation/Rules/Password.php +++ b/src/Illuminate/Validation/Rules/Password.php @@ -6,15 +6,23 @@ use Illuminate\Contracts\Validation\DataAwareRule; use Illuminate\Contracts\Validation\Rule; use Illuminate\Contracts\Validation\UncompromisedVerifier; +use Illuminate\Contracts\Validation\ValidatorAwareRule; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Traits\Conditionable; use InvalidArgumentException; -class Password implements Rule, DataAwareRule +class Password implements Rule, DataAwareRule, ValidatorAwareRule { use Conditionable; + /** + * The validator performing the validation. + * + * @var \Illuminate\Contracts\Validation\Validator + */ + protected $validator; + /** * The data under validation. * @@ -149,6 +157,19 @@ public static function sometimes() return ['sometimes', static::default()]; } + /** + * Set the performing validator. + * + * @param \Illuminate\Contracts\Validation\Validator $validator + * @return $this + */ + public function setValidator($validator) + { + $this->validator = $validator; + + return $this; + } + /** * Set the data under validation. * @@ -306,7 +327,7 @@ public function message() protected function fail($messages) { $messages = collect(Arr::wrap($messages))->map(function ($message) { - return __($message); + return $this->validator->getTranslator()->get($message); })->all(); $this->messages = array_merge($this->messages, $messages);