From bb969c61d41ec479adbe4a6da797831002b75092 Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Tue, 8 Oct 2019 22:44:05 +0200
Subject: [PATCH 1/5] Fixes required version of the framework within
 `composer.json` (#5130)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7cd832e8..288180d5 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^6.2",
         "laravel/tinker": "^1.0"
     },
     "require-dev": {

From 400df0b02bcc0e3fc8bc1c75ea494242c3f392af Mon Sep 17 00:00:00 2001
From: Gert de Pagter <BackEndTea@users.noreply.github.com>
Date: Wed, 16 Oct 2019 15:18:19 +0200
Subject: [PATCH 2/5] Add xml schema to phpunit (#5139)

This allows an IDE to do auto completion, and show any errors in the configuration
---
 phpunit.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml b/phpunit.xml
index da4add30..c1a4100a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"

From ace38c133f3d8088fc7477f56b9db6fdc0098d06 Mon Sep 17 00:00:00 2001
From: Michael Chernyshev <chmv-git@allnetic.com>
Date: Fri, 18 Oct 2019 13:57:19 +0300
Subject: [PATCH 3/5] Security fix: Waiting before retrying password reset

---
 config/auth.php                 | 1 +
 resources/lang/en/passwords.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/auth.php b/config/auth.php
index f1e9b2da..f7dab7bb 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -97,6 +97,7 @@
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
+            'timeout' => 60,
         ],
     ],
 
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index f3b01a46..68c6658d 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -17,5 +17,6 @@
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
+    'timeout' => 'Please wait before retrying.',
 
 ];

From ba2f2abe830f5d03c52fd9c88411859cf863abd6 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Mon, 21 Oct 2019 13:42:31 -0500
Subject: [PATCH 4/5] tweak formatting

---
 config/auth.php                 | 2 +-
 resources/lang/en/passwords.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/auth.php b/config/auth.php
index f7dab7bb..aaf982bc 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -97,7 +97,7 @@
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
-            'timeout' => 60,
+            'throttle' => 60,
         ],
     ],
 
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index 68c6658d..2fc7abad 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -17,6 +17,6 @@
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'timeout' => 'Please wait before retrying.',
+    'throttle' => 'Please wait before retrying.',
 
 ];

From 953b488b8bb681d4d6e12227645c7c1b7ac26935 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Mon, 21 Oct 2019 13:47:27 -0500
Subject: [PATCH 5/5] fix key

---
 resources/lang/en/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index 2fc7abad..86f1082b 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -17,6 +17,6 @@
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'throttle' => 'Please wait before retrying.',
+    'throttled' => 'Please wait before retrying.',
 
 ];