silverstripe · emteknetnz · Oct 29, 2024
diff --git a/_config/archive-admin.yml b/_config/archive-admin.yml
@@ -1,7 +1,7 @@
 ---
 Name: archiveadmin
 ---
-SilverStripe\Versioned\VersionedGridFieldItemRequest:
+SilverStripe\Versioned\Versioned\VersionedGridFieldItemRequest:
   extensions:
     - SilverStripe\VersionedAdmin\Extensions\ArchiveRestoreAction
 ---

diff --git a/src/ArchiveAdmin.php b/src/ArchiveAdmin.php
@@ -19,9 +19,9 @@
 use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\Versioned\GridFieldRestoreAction;
-use SilverStripe\Versioned\Versioned;
-use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
+use SilverStripe\Versioned\Versioned\GridFieldRestoreAction;
+use SilverStripe\Versioned\Mode\Versioned;
+use SilverStripe\Versioned\Mode\VersionedGridFieldState\VersionedGridFieldState;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;
 use SilverStripe\Model\ArrayData;
 

diff --git a/src/Controllers/HistoryViewerController.php b/src/Controllers/HistoryViewerController.php
@@ -12,7 +12,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\DataObjectVersionFormFactory;
 use SilverStripe\VersionedAdmin\Forms\DiffTransformation;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;

diff --git a/src/Extensions/ArchiveRestoreAction.php b/src/Extensions/ArchiveRestoreAction.php
@@ -10,9 +10,9 @@
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Core\Validation\ValidationResult;
-use SilverStripe\Versioned\RestoreAction;
-use SilverStripe\Versioned\Versioned;
-use SilverStripe\Versioned\VersionedGridFieldItemRequest;
+use SilverStripe\Versioned\Versioned\RestoreAction;
+use SilverStripe\Versioned\Mode\Versioned;
+use SilverStripe\Versioned\Versioned\VersionedGridFieldItemRequest;
 use SilverStripe\VersionedAdmin\ArchiveAdmin;
 
 /**

diff --git a/src/Extensions/FileArchiveExtension.php b/src/Extensions/FileArchiveExtension.php
@@ -8,7 +8,7 @@
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\Versioned\GridFieldRestoreAction;
+use SilverStripe\Versioned\Versioned\GridFieldRestoreAction;
 use SilverStripe\VersionedAdmin\ArchiveAdmin;
 use SilverStripe\VersionedAdmin\Forms\GridField\GridFieldFileRestoreAction;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;

diff --git a/src/Extensions/UsedOnTableExtension.php b/src/Extensions/UsedOnTableExtension.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Admin\Forms\UsedOnTable;
 use SilverStripe\Core\Extension;
-use SilverStripe\Versioned\ChangeSetItem;
+use SilverStripe\Versioned\Staged\ChangeSetItem;
 
 /**
  * @extends Extension<UsedOnTable>

diff --git a/src/Forms/DiffField.php b/src/Forms/DiffField.php
@@ -15,7 +15,7 @@
  * e.g. a TextField with the value "Old data" can be transformed with {@see DiffTransformation}
  * and then having setValue called again to load in "New data" - this field will then render
  * the value "<ins>New</ins> <del>Old</del> data". Most useful in historic version comparisons
- * {@see SilverStripe\Versioned\Versioned}
+ * {@see SilverStripe\Versioned\Mode\Versioned}
  */
 class DiffField extends HTMLReadonlyField
 {

diff --git a/src/Forms/GridField/GridFieldFileRestoreAction.php b/src/Forms/GridField/GridFieldFileRestoreAction.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\VersionedAdmin\Forms\GridField;
 
 use SilverStripe\Assets\File;
-use SilverStripe\Versioned\GridFieldRestoreAction;
+use SilverStripe\Versioned\Versioned\GridFieldRestoreAction;
 
 /**
  * Extension of GridFieldRestoreAction to only show action if there is a valid file

diff --git a/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php b/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php
@@ -9,7 +9,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
 {

diff --git a/src/Navigator/SilverStripeNavigatorItem_LiveLink.php b/src/Navigator/SilverStripeNavigatorItem_LiveLink.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem
 {

diff --git a/src/Navigator/SilverStripeNavigatorItem_StageLink.php b/src/Navigator/SilverStripeNavigatorItem_StageLink.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem
 {

diff --git a/tests/ArchiveAdminTest/SingleStageObject.php b/tests/ArchiveAdminTest/SingleStageObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SingleStageObject extends DataObject implements TestOnly
 {

diff --git a/tests/ArchiveAdminTest/VersionedObject.php b/tests/ArchiveAdminTest/VersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedObject extends DataObject implements TestOnly
 {

diff --git a/tests/ArchiveAdminTest/ViewProviderChildObject.php b/tests/ArchiveAdminTest/ViewProviderChildObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Tests\ArchiveAdminTest\ViewProviderVersionedObject;
 
 class ViewProviderChildObject extends ViewProviderVersionedObject implements TestOnly

diff --git a/tests/ArchiveAdminTest/ViewProviderVersionedObject.php b/tests/ArchiveAdminTest/ViewProviderVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;
 
 class ViewProviderVersionedObject extends DataObject implements ArchiveViewProvider, TestOnly

diff --git a/tests/Controllers/HistoryViewerControllerTest.php b/tests/Controllers/HistoryViewerControllerTest.php
@@ -14,7 +14,7 @@
 use SilverStripe\VersionedAdmin\Tests\Controllers\HistoryViewerControllerTest\TestVersionedObject;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Security\SecurityToken;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
 use PHPUnit\Framework\Attributes\DataProvider;
 

diff --git a/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php b/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class TestVersionedObject extends DataObject implements TestOnly
 {

diff --git a/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php b/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class ViewableVersionedObject extends DataObject implements TestOnly
 {

diff --git a/tests/Extensions/ArchiveRestoreActionTest.php b/tests/Extensions/ArchiveRestoreActionTest.php
@@ -15,7 +15,7 @@
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Model\List\ArrayList;
 use SilverStripe\Model\ArrayData;
-use SilverStripe\Versioned\VersionedGridFieldItemRequest;
+use SilverStripe\Versioned\Versioned\VersionedGridFieldItemRequest;
 use SilverStripe\VersionedAdmin\ArchiveAdmin;
 use SilverStripe\VersionedAdmin\Tests\Controllers\HistoryViewerControllerTest\ViewableVersionedObject;
 use ReflectionMethod;

diff --git a/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php b/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
 
 class ObjectWithFields extends DataObject implements TestOnly

diff --git a/tests/Navigator/UnstagedRecord.php b/tests/Navigator/UnstagedRecord.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\CMSPreviewable;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Versioned but not staged

diff --git a/tests/Navigator/VersionedRecord.php b/tests/Navigator/VersionedRecord.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\CMSPreviewable;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedRecord extends DataObject implements TestOnly, CMSPreviewable
 {