From b6fbd374ea2f8e0fa4aa96650c2e73b6940fde68 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 20 Jan 2023 16:21:49 +1300 Subject: [PATCH] MNT Remove legacy upgrader config --- .upgrade.yml | 63 ------------------- _config/legacy.yml | 31 --------- code/Control/UserDefinedFormController.php | 1 - .../EditableMemberListField.php | 1 - .../EditableFormField/EditableTextField.php | 1 - code/Model/Recipient/EmailRecipient.php | 1 - 6 files changed, 98 deletions(-) delete mode 100644 .upgrade.yml delete mode 100644 _config/legacy.yml diff --git a/.upgrade.yml b/.upgrade.yml deleted file mode 100644 index 1f5fd04..0000000 --- a/.upgrade.yml +++ /dev/null @@ -1,63 +0,0 @@ -mappings: - SecureEditableFileField: SilverStripe\UserForms\Extension\SecureEditableFileField - UserFormFieldEditorExtension: SilverStripe\UserForms\Extension\UserFormFieldEditorExtension - UserFormValidator: SilverStripe\UserForms\Extension\UserFormValidator - GridFieldAddClassesButton: SilverStripe\UserForms\Form\GridFieldAddClassesButton - UserForm: SilverStripe\UserForms\Form\UserForm - UserFormsGridFieldFilterHeader: SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader - UserFormsCheckboxSetField: SilverStripe\UserForms\FormField\UserFormsCheckboxSetField - UserFormsCompositeField: SilverStripe\UserForms\FormField\UserFormsCompositeField - UserFormsFieldContainer: SilverStripe\UserForms\FormField\UserFormsFieldContainer - UserFormsFieldList: SilverStripe\UserForms\FormField\UserFormsFieldList - UserFormsGroupField: SilverStripe\UserForms\FormField\UserFormsGroupField - UserFormsStepField: SilverStripe\UserForms\FormField\UserFormsStepField - EditableCustomRule: SilverStripe\UserForms\Model\EditableCustomRule - UserDefinedForm: SilverStripe\UserForms\Model\UserDefinedForm - UserDefinedFormController: SilverStripe\UserForms\Control\UserDefinedFormController - EditableCheckbox: SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox - EditableCheckboxGroupField: SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField - EditableCountryDropdownField: SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField - EditableDateField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField - EditableDateField_FormField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField\FormField - EditableDropdown: SilverStripe\UserForms\Model\EditableFormField\EditableDropdown - EditableEmailField: SilverStripe\UserForms\Model\EditableFormField\EditableEmailField - EditableFieldGroup: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup - EditableFieldGroupEnd: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd - EditableFileField: SilverStripe\UserForms\Model\EditableFormField\EditableFileField - EditableFormField: SilverStripe\UserForms\Model\EditableFormField - EditableFormFieldValidator: SilverStripe\UserForms\Model\EditableFormField\Validator - EditableFormHeading: SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading - EditableFormStep: SilverStripe\UserForms\Model\EditableFormField\EditableFormStep - EditableLiteralField: SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField - EditableMemberListField: SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField - EditableMultipleOptionField: SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField - EditableNumericField: SilverStripe\UserForms\Model\EditableFormField\EditableNumericField - EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption - EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField - EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField - UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient - UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition - UserFormRecipientItemRequest: SilverStripe\UserForms\Model\Recipient\UserFormRecipientItemRequest - SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField - SubmittedForm: SilverStripe\UserForms\Model\Submission\SubmittedForm - SubmittedFormField: SilverStripe\UserForms\Model\Submission\SubmittedFormField - DisambiguationSegmentFieldModifier: SilverStripe\UserForms\Modifier\DisambiguationSegmentFieldModifier - UnderscoreSegmentFieldModifier: SilverStripe\UserForms\Modifier\UnderscoreSegmentFieldModifier - UserFormsColumnCleanTask: SilverStripe\UserForms\Task\UserFormsColumnCleanTask - UserFormTest: SilverStripe\UserForms\Tests\Form\UserFormTest - UserFormsCheckboxSetFieldTest: SilverStripe\UserForms\Tests\FormField\UserFormsCheckboxSetFieldTest - EditableCustomRuleTest: SilverStripe\UserForms\Tests\Model\EditableCustomRuleTest - UserDefinedFormControllerTest: SilverStripe\UserForms\Tests\Control\UserDefinedFormControllerTest - UserDefinedFormTest: SilverStripe\UserForms\Tests\Model\UserDefinedFormTest - EditableDropdownTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableDropdownTest - EditableFileFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableFileFieldTest - EditableFormFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormFieldTest - EditableLiteralFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableLiteralFieldTest - SecureEditableFileFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\SecureEditableFileFieldTest - UserDefinedForm_EmailRecipientConditionTest: SilverStripe\UserForms\Tests\Model\Recipient\EmailRecipientConditionTest - -warnings: - methods: - 'SilverStripe\UserForms\Model\EditableFormField->EffectiveDisplayRules()': - message: 'EffectiveDisplayRules deprecated because of new support for conditional required field' - url: 'https://github.com/silverstripe/silverstripe-userforms/pull/770/' diff --git a/_config/legacy.yml b/_config/legacy.yml deleted file mode 100644 index 1362d45..0000000 --- a/_config/legacy.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -Name: userformslegacy ---- -SilverStripe\ORM\DatabaseAdmin: - classname_value_remapping: - EditableCheckbox: SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox - EditableCheckboxGroupField: SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField - EditableCountryDropdownField: SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField - EditableDateField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField - EditableDropdown: SilverStripe\UserForms\Model\EditableFormField\EditableDropdown - EditableEmailField: SilverStripe\UserForms\Model\EditableFormField\EditableEmailField - EditableFieldGroup: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup - EditableFieldGroupEnd: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd - EditableFileField: SilverStripe\UserForms\Model\EditableFormField\EditableFileField - EditableFormHeading: SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading - EditableFormStep: SilverStripe\UserForms\Model\EditableFormField\EditableFormStep - EditableLiteralField: SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField - EditableMemberListField: SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField - EditableMultipleOptionField: SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField - EditableNumericField: SilverStripe\UserForms\Model\EditableFormField\EditableNumericField - EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption - EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField - EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField - UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient - UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition - SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField - SubmittedForm: SilverStripe\UserForms\Model\Submission\SubmittedForm - SubmittedFormField: SilverStripe\UserForms\Model\Submission\SubmittedFormField - EditableCustomRule: SilverStripe\UserForms\Model\EditableCustomRule - EditableFormField: SilverStripe\UserForms\Model\EditableFormField - UserDefinedForm: SilverStripe\UserForms\Model\UserDefinedForm diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php index 8d838dc..adbba86 100644 --- a/code/Control/UserDefinedFormController.php +++ b/code/Control/UserDefinedFormController.php @@ -178,7 +178,6 @@ class UserDefinedFormController extends PageController public function Form() { $form = UserForm::create($this, 'Form_' . $this->ID); - /** @skipUpgrade */ $form->setFormAction(Controller::join_links($this->Link(), 'Form')); $this->generateConditionalJavascript(); return $form; diff --git a/code/Model/EditableFormField/EditableMemberListField.php b/code/Model/EditableFormField/EditableMemberListField.php index b632983..fb124a1 100644 --- a/code/Model/EditableFormField/EditableMemberListField.php +++ b/code/Model/EditableFormField/EditableMemberListField.php @@ -36,7 +36,6 @@ class EditableMemberListField extends EditableFormField $fields->removeByName('Default'); $fields->removeByName('Validation'); - /** @skipUpgrade */ $fields->addFieldToTab( 'Root.Main', DropdownField::create( diff --git a/code/Model/EditableFormField/EditableTextField.php b/code/Model/EditableFormField/EditableTextField.php index e5b418d..2d54bc2 100644 --- a/code/Model/EditableFormField/EditableTextField.php +++ b/code/Model/EditableFormField/EditableTextField.php @@ -32,7 +32,6 @@ class EditableTextField extends EditableFormField private static $has_placeholder = true; - /** @skipUpgrade */ private static $autocomplete_options = [ 'off' => 'Off', 'on' => 'On', diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php index 975d8d5..59202e3 100644 --- a/code/Model/Recipient/EmailRecipient.php +++ b/code/Model/Recipient/EmailRecipient.php @@ -152,7 +152,6 @@ class EmailRecipient extends DataObject { $fields = parent::summaryFields(); if (isset($fields['EmailAddress'])) { - /** @skipUpgrade */ $fields['EmailAddress'] = _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.EMAILADDRESS', 'Email'); } if (isset($fields['EmailSubject'])) {