From 099a1174abe4422bef76bdbeb526ab86a6fc05ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20V=C3=A1radi?= <netpok@gmail.com>
Date: Thu, 10 Jun 2021 17:07:32 +0200
Subject: [PATCH 1/2] Replace foundation translate call

---
 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..dddc116d9bf4 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.
      *
@@ -162,6 +170,19 @@ public function setData($data)
         return $this;
     }
 
+    /**
+     * Set the performing validator.
+     *
+     * @param \Illuminate\Contracts\Validation\Validator $validator
+     * @return $this
+     */
+    public function setValidator($validator)
+    {
+        $this->validator = $validator;
+
+        return $this;
+    }
+
     /**
      * Sets the minimum size of the password.
      *
@@ -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);

From 9ac38b8e61830eafc48b2c5f1988807d0be5aa0b Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Thu, 10 Jun 2021 10:34:20 -0500
Subject: [PATCH 2/2] Update Password.php

---
 src/Illuminate/Validation/Rules/Password.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Illuminate/Validation/Rules/Password.php b/src/Illuminate/Validation/Rules/Password.php
index dddc116d9bf4..8b2607acba0f 100644
--- a/src/Illuminate/Validation/Rules/Password.php
+++ b/src/Illuminate/Validation/Rules/Password.php
@@ -158,27 +158,27 @@ public static function sometimes()
     }
 
     /**
-     * Set the data under validation.
+     * Set the performing validator.
      *
-     * @param  array  $data
+     * @param \Illuminate\Contracts\Validation\Validator $validator
      * @return $this
      */
-    public function setData($data)
+    public function setValidator($validator)
     {
-        $this->data = $data;
+        $this->validator = $validator;
 
         return $this;
-    }
+    }    
 
     /**
-     * Set the performing validator.
+     * Set the data under validation.
      *
-     * @param \Illuminate\Contracts\Validation\Validator $validator
+     * @param  array  $data
      * @return $this
      */
-    public function setValidator($validator)
+    public function setData($data)
     {
-        $this->validator = $validator;
+        $this->data = $data;
 
         return $this;
     }