From d8737799560ac757f1218da4185ea5ec3560109a Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 24 May 2019 12:25:16 +1200
Subject: [PATCH] API checkHistoricalPasswords(), characterStrength() and
 minLength() are now correctly deprecated from 4.5.0 onwards

---
 docs/en/04_Changelogs/4.5.0.md     | 10 ++++++++++
 src/Security/PasswordValidator.php | 14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 docs/en/04_Changelogs/4.5.0.md

diff --git a/docs/en/04_Changelogs/4.5.0.md b/docs/en/04_Changelogs/4.5.0.md
new file mode 100644
index 000000000..78ca71b4a
--- /dev/null
+++ b/docs/en/04_Changelogs/4.5.0.md
@@ -0,0 +1,10 @@
+# 4.5.0 (Unreleased)
+
+## Overview {#overview}
+
+TBC.
+
+## Deprecation
+
+* `PasswordValidator` methods `minLength`, `characterStrength`, and `checkHistoricalPasswords` are now deprecated from
+  4.5.0 onwards (previously 5.0).
diff --git a/src/Security/PasswordValidator.php b/src/Security/PasswordValidator.php
index af9e6ec83..b08cc5990 100644
--- a/src/Security/PasswordValidator.php
+++ b/src/Security/PasswordValidator.php
@@ -76,7 +76,7 @@ class PasswordValidator
     protected $historicalPasswordCount = null;
 
     /**
-     * @deprecated 5.0
+     * @deprecated 4.5.0
      * Minimum password length
      *
      * @param int $minLength
@@ -84,12 +84,12 @@ class PasswordValidator
      */
     public function minLength($minLength)
     {
-        Deprecation::notice('5.0', 'Use ->setMinLength($value) instead.');
+        Deprecation::notice('4.5.0', 'Use ->setMinLength($value) instead.');
         return $this->setMinLength($minLength);
     }
 
     /**
-     * @deprecated 5.0
+     * @deprecated 4.5.0
      * Check the character strength of the password.
      *
      * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
@@ -101,8 +101,8 @@ class PasswordValidator
     public function characterStrength($minScore, $testNames = null)
     {
         Deprecation::notice(
-            '5.0',
-            'Use ->setMinTestScore($score) and ->setTextNames($names) instead.'
+            '4.5.0',
+            'Use ->setMinTestScore($score) and ->setTestNames($names) instead.'
         );
         $this->setMinTestScore($minScore);
         if ($testNames) {
@@ -112,7 +112,7 @@ class PasswordValidator
     }
 
     /**
-     * @deprecated 5.0
+     * @deprecated 4.5.0
      * Check a number of previous passwords that the user has used, and don't let them change to that.
      *
      * @param int $count
@@ -120,7 +120,7 @@ class PasswordValidator
      */
     public function checkHistoricalPasswords($count)
     {
-        Deprecation::notice('5.0', 'Use ->setHistoricCount($value) instead.');
+        Deprecation::notice('4.5.0', 'Use ->setHistoricCount($value) instead.');
         return $this->setHistoricCount($count);
     }