Merge branch '6.1' into 6

code/Extension/UserFormFieldEditorExtension.php

@@ -28,7 +28,7 @@ use Symbiote\GridFieldExtensions\GridFieldEditableColumns;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 
 /**
- * @method DataList|EditableFormField[] Fields()
+ * @method SilverStripe\ORM\HasManyList<EditableFormField> Fields()
  */
 class UserFormFieldEditorExtension extends DataExtension
 {

code/Extension/UserFormFileExtension.php

@@ -14,7 +14,7 @@ use SilverStripe\Versioned\Versioned;
 
 /**
  * @property string $UserFormUpload
- * @method File SubmittedFileField
+ * @method SubmittedFileField SubmittedFileField()
  */
 class UserFormFileExtension extends DataExtension
 {

code/Model/EditableCustomRule.php

@@ -20,8 +20,8 @@ use SilverStripe\Versioned\Versioned;
  * @property string $Display
  * @property string $FieldValue
  * @property int $ParentID
- * @method EditableFormField Parent()
  * @method EditableFormField ConditionField()
+ * @method EditableFormField Parent()
  */
 class EditableCustomRule extends DataObject
 {

code/Model/EditableFormField.php

@@ -57,9 +57,9 @@ use Symbiote\GridFieldExtensions\GridFieldEditableColumns;
  * @property int $ShowInSummary
  * @property int $ShowOnLoad
  * @property int $Sort
- * @method UserDefinedForm Parent() Parent page
- * @method HasManyList|EditableCustomRule[] DisplayRules() List of EditableCustomRule objects
  * @mixin Versioned
+ * @method HasManyList<EditableCustomRule> DisplayRules()
+ * @method DataObject Parent()
  */
 class EditableFormField extends DataObject
 {

code/Model/EditableFormField/EditableFieldGroup.php

@@ -12,7 +12,7 @@ use SilverStripe\UserForms\Model\EditableFormField;
  * Specifies that this ends a group of fields
  *
  * @property int $EditableFieldGroupEndID
- * @method EditableFieldGroupEnd EditableFieldGroupEnd()
+ * @method EditableFieldGroupEnd End()
  */
 class EditableFieldGroup extends EditableFormField
 {

code/Model/EditableFormField/EditableFileField.php

@@ -28,7 +28,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
  * @property int $FolderConfirmed
  * @property int $FolderID
  * @property float $MaxFileSizeMB
- * @method Folder Folder
+ * @method Folder Folder()
  */
 class EditableFileField extends EditableFormField
 {

code/Model/EditableFormField/EditableMultipleOptionField.php

@@ -31,7 +31,7 @@ use Symbiote\GridFieldExtensions\GridFieldTitleHeader;
  * @see EditableDropdownField
  *
  * @package userforms
- * @method HasManyList|EditableOption[] Options()
+ * @method HasManyList<EditableOption> Options()
  */
 class EditableMultipleOptionField extends EditableFormField
 {

code/Model/EditableFormField/EditableOption.php

@@ -16,8 +16,8 @@ use SilverStripe\Versioned\Versioned;
  * @property int $ParentID
  * @property int $Sort
  * @property string $Value
- * @method EditableMultipleOptionField Parent()
  * @mixin Versioned
+ * @method EditableMultipleOptionField Parent()
  */
 class EditableOption extends DataObject
 {

code/Model/Recipient/EmailRecipient.php

@@ -62,7 +62,7 @@ use Symbiote\GridFieldExtensions\GridFieldEditableColumns;
  * @property int $SendEmailFromFieldID
  * @property int $SendEmailSubjectFieldID
  * @property int $SendEmailToFieldID
- * @method HasManyList|EmailRecipientCondition[] CustomRules()
+ * @method HasManyList<EmailRecipientCondition> CustomRules()
  * @method DataObject Form()
  * @method EditableFormField SendEmailFromField()
  * @method EditableFormField SendEmailSubjectField()

code/Model/Submission/SubmittedForm.php

@@ -19,9 +19,9 @@ use SilverStripe\Security\Member;
  * @package userforms
  * @property int $SubmittedByID
  * @property int $ParentID
- * @method Member SubmittedBy()
  * @method DataObject Parent()
- * @method HasManyList|SubmittedFormField[] Values()
+ * @method Member SubmittedBy()
+ * @method HasManyList<SubmittedFormField> Values()
  */
 class SubmittedForm extends DataObject
 {

code/Model/Submission/SubmittedFormField.php

@@ -13,6 +13,7 @@ use SilverStripe\UserForms\Model\EditableFormField;
  * @package userforms
  * @property string $Name
  * @property string $Value
+ * @method SubmittedForm Parent()
  */
 class SubmittedFormField extends DataObject
 {

code/Model/UserDefinedForm.php

@@ -9,6 +9,8 @@ use SilverStripe\UserForms\Control\UserDefinedFormController;
 
 /**
  * @package userforms
+ * @method SilverStripe\ORM\HasManyList<SilverStripe\UserForms\Model\Recipient\EmailRecipient> EmailRecipients()
+ * @method SilverStripe\ORM\HasManyList<SilverStripe\UserForms\Model\Submission\SubmittedForm> Submissions()
  */
 class UserDefinedForm extends Page
 {