Merge branch '6.0' into 6

silverstripe · Dec 12, 2024 · eef42cf · eef42cf
2 parents 6c7dfdc + 564a4ad
commit eef42cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "silverstripe/framework": "^6",
         "silverstripe/admin": "^3",
         "silverstripe/siteconfig": "^6",
-        "defuse/php-encryption": "^2.3",
+        "defuse/php-encryption": "^2.4",
         "silverstripe/login-forms": "^6"
     },
     "require-dev": {

diff --git a/src/Extension/AccountReset/SecurityExtension.php b/src/Extension/AccountReset/SecurityExtension.php
@@ -12,7 +12,7 @@
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\PasswordField;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\MFA\JSONResponse;
 use SilverStripe\MFA\RequestHandler\BaseHandlerTrait;
 use SilverStripe\ORM\FieldType\DBDatetime;
@@ -123,7 +123,7 @@ public function ResetAccountForm(): Form
             FormAction::create('doResetAccount', 'Reset account'),
         ]);
 
-        $validation = RequiredFields::create(['NewPassword1', 'NewPassword2']);
+        $validation = RequiredFieldsValidator::create(['NewPassword1', 'NewPassword2']);
 
         $form = Form::create($this->owner, 'ResetAccountForm', $fields, $actions, $validation);
 

diff --git a/yarn.lock b/yarn.lock
@@ -2886,9 +2886,9 @@ create-jest@^29.7.0:
     prompts "^2.0.1"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
-  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"