From 27652eb4d0aa80684d93fa0c4122c6d3e7922583 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 29 Oct 2024 17:58:08 +1300 Subject: [PATCH] API Use updated Versioned and Staged classes --- code/Control/UserDefinedFormAdmin.php | 2 +- code/Control/UserDefinedFormController.php | 2 +- code/Extension/UserFormFieldEditorExtension.php | 2 +- code/Model/EditableCustomRule.php | 2 +- code/Model/EditableFormField.php | 2 +- code/Model/EditableFormField/EditableOption.php | 2 +- code/Model/Submission/SubmittedFileField.php | 2 +- code/Task/RecoverUploadLocationsHelper.php | 2 +- tests/Extension/UserFormFieldEditorExtensionTest.php | 2 +- tests/behat/src/FixtureContext.php | 2 +- tests/php/Control/UserDefinedFormControllerTest.php | 2 +- tests/php/Model/SubmittedFileFieldTest.php | 2 +- tests/php/Model/UserDefinedFormTest.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/Control/UserDefinedFormAdmin.php b/code/Control/UserDefinedFormAdmin.php index d81be80af..0e7970676 100644 --- a/code/Control/UserDefinedFormAdmin.php +++ b/code/Control/UserDefinedFormAdmin.php @@ -27,7 +27,7 @@ use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFileField; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Provides a few endpoints the user form CMS UI targets with some AJAX request. diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php index 951c9a90f..8ffc68b6d 100644 --- a/code/Control/UserDefinedFormController.php +++ b/code/Control/UserDefinedFormController.php @@ -28,7 +28,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedForm; use SilverStripe\UserForms\Model\Submission\SubmittedFileField; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; use SilverStripe\View\SSViewer; diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php index 027b764f6..2bf178282 100644 --- a/code/Extension/UserFormFieldEditorExtension.php +++ b/code/Extension/UserFormFieldEditorExtension.php @@ -24,7 +24,7 @@ use SilverStripe\UserForms\Model\EditableFormField\EditableFileField; use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep; use SilverStripe\UserForms\Model\EditableFormField\EditableTextField; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\View\Requirements; use Symbiote\GridFieldExtensions\GridFieldEditableColumns; use Symbiote\GridFieldExtensions\GridFieldOrderableRows; diff --git a/code/Model/EditableCustomRule.php b/code/Model/EditableCustomRule.php index 08fa1b407..cb3e59c68 100644 --- a/code/Model/EditableCustomRule.php +++ b/code/Model/EditableCustomRule.php @@ -9,7 +9,7 @@ use SilverStripe\Core\Convert; use SilverStripe\ORM\DataObject; use SilverStripe\Security\Member; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * A custom rule for showing / hiding an EditableFormField diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php index 231cd0fea..626e94473 100755 --- a/code/Model/EditableFormField.php +++ b/code/Model/EditableFormField.php @@ -35,7 +35,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedFormField; use SilverStripe\UserForms\Modifier\DisambiguationSegmentFieldModifier; use SilverStripe\UserForms\Modifier\UnderscoreSegmentFieldModifier; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use Symbiote\GridFieldExtensions\GridFieldAddNewInlineButton; use Symbiote\GridFieldExtensions\GridFieldEditableColumns; diff --git a/code/Model/EditableFormField/EditableOption.php b/code/Model/EditableFormField/EditableOption.php index dce01cef9..9ef26a8d9 100644 --- a/code/Model/EditableFormField/EditableOption.php +++ b/code/Model/EditableFormField/EditableOption.php @@ -4,7 +4,7 @@ use SilverStripe\ORM\DataObject; use SilverStripe\Security\Member; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Base Class for EditableOption Fields such as the ones used in diff --git a/code/Model/Submission/SubmittedFileField.php b/code/Model/Submission/SubmittedFileField.php index 8b3c73f4f..3b1adcad7 100755 --- a/code/Model/Submission/SubmittedFileField.php +++ b/code/Model/Submission/SubmittedFileField.php @@ -5,7 +5,7 @@ use SilverStripe\Assets\File; use SilverStripe\Control\Director; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Security\Member; use SilverStripe\Security\Security; diff --git a/code/Task/RecoverUploadLocationsHelper.php b/code/Task/RecoverUploadLocationsHelper.php index 75764f819..ee4eb2a4e 100644 --- a/code/Task/RecoverUploadLocationsHelper.php +++ b/code/Task/RecoverUploadLocationsHelper.php @@ -22,7 +22,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedForm; use SilverStripe\UserForms\Model\Submission\SubmittedFormField; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * A helper to recover the UserForm uploads targeting folders incorrectly migrated from Silverstripe CMS 3 diff --git a/tests/Extension/UserFormFieldEditorExtensionTest.php b/tests/Extension/UserFormFieldEditorExtensionTest.php index 067d6e4b6..4517cd578 100644 --- a/tests/Extension/UserFormFieldEditorExtensionTest.php +++ b/tests/Extension/UserFormFieldEditorExtensionTest.php @@ -5,7 +5,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class UserFormFieldEditorExtensionTest extends SapphireTest { diff --git a/tests/behat/src/FixtureContext.php b/tests/behat/src/FixtureContext.php index 831a0c4cc..8db7a4b6d 100644 --- a/tests/behat/src/FixtureContext.php +++ b/tests/behat/src/FixtureContext.php @@ -8,7 +8,7 @@ use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep; use SilverStripe\UserForms\Model\EditableFormField\EditableTextField; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Context used to create fixtures in the SilverStripe ORM. diff --git a/tests/php/Control/UserDefinedFormControllerTest.php b/tests/php/Control/UserDefinedFormControllerTest.php index 36dccbf9a..fb06b9ee5 100644 --- a/tests/php/Control/UserDefinedFormControllerTest.php +++ b/tests/php/Control/UserDefinedFormControllerTest.php @@ -26,7 +26,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedFormField; use SilverStripe\UserForms\Model\UserDefinedForm; use SilverStripe\UserForms\Tests\Control\fixtures\SizeStringTestableController; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Model\ArrayData; use SilverStripe\View\SSViewer; use function filesize; diff --git a/tests/php/Model/SubmittedFileFieldTest.php b/tests/php/Model/SubmittedFileFieldTest.php index d88304bea..b8ca5ae04 100644 --- a/tests/php/Model/SubmittedFileFieldTest.php +++ b/tests/php/Model/SubmittedFileFieldTest.php @@ -10,7 +10,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\UserForms\Model\Submission\SubmittedFileField; use SilverStripe\UserForms\Model\Submission\SubmittedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class SubmittedFileFieldTest extends SapphireTest { diff --git a/tests/php/Model/UserDefinedFormTest.php b/tests/php/Model/UserDefinedFormTest.php index e538d19a5..44bbb47a4 100644 --- a/tests/php/Model/UserDefinedFormTest.php +++ b/tests/php/Model/UserDefinedFormTest.php @@ -22,7 +22,7 @@ use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; use SilverStripe\UserForms\Model\Recipient\EmailRecipient; use SilverStripe\UserForms\Model\UserDefinedForm; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * @package userforms