Merge branch '7.0' into 7

code/Form/UserFormsRequiredFields.php

@@ -9,6 +9,7 @@
 use SilverStripe\Forms\RequiredFields;
 use SilverStripe\Core\ArrayLib;
 use SilverStripe\UserForms\Model\EditableFormField;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * An extension of RequiredFields which handles conditionally required fields.
@@ -19,9 +20,17 @@
  *
  * Required fields will be validated as usual.
  * Conditionally required fields will be validated IF the display rules are satisfied in the submitted dataset.
+ *
+ * @deprecated 5.4.0 Will be renamed to SilverStripe\UserForms\Form\UserFormsRequiredFieldsValidator
  */
 class UserFormsRequiredFields extends RequiredFields
 {
+    public function __construct()
+    {
+        Deprecation::noticeWithNoReplacment('5.4.0', 'Will be renamed to SilverStripe\\UserForms\\Form\\UserFormsRequiredFieldsValidator', Deprecation::SCOPE_CLASS);
+        parent::__construct(...func_get_args());
+    }
+
     /**
      * Allows validation of fields via specification of a php function for
      * validation which is executed after the form is submitted.

docs/en/userguide/index.md

@@ -24,14 +24,13 @@ Here are a few tips to get you started:
 - Ensure you have the necessary consents for processing and storing data according to your legislation (e.g. GDPR)
 - Only accept form submissions via encrypted transfers (HTTPS) - check our [Secure Coding](https://docs.silverstripe.org/en/developer_guides/security/secure_coding/) guidelines
 - Control access to form submissions (via CMS page access controls)
-- Control access to files uploaded with submissions (via [folder access controls](field-types.md#file-upload-field))
+- Control access to files uploaded with submissions (via [folder access controls](./field-types#file-upload-field))
 - Create a process to limit the types of data you are allowed to collect via this feature (e.g. no payment information or health data)
 - Create a process for limiting submission storage duration (manual deletion)
 - Consider further safeguards such as at-rest encryption (check [encryption related addons](https://addons.silverstripe.org/add-ons?search=encrypt))
 
 ## Features
 
-- [Create and edit forms](creating-and-editing-forms.md)
-- [Add different field types to a form](field-types.md)
-- [Set up multipage forms](multipage-forms.md)
-- [View submissions and set up automated emails upon form completion](form-submissions.md)
+- [Create and edit forms](./creating-and-editing-forms)
+- [Add different field types to a form](./field-types)
+- [View submissions and set up automated emails upon form completion](./form-submissions)

yarn.lock

@@ -2184,9 +2184,9 @@ cosmiconfig@^9.0.0:
     parse-json "^5.2.0"
 
 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"