diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 61f3635a3a..176c700678 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -66,9 +66,9 @@ use SilverStripe\Security\Security; use SilverStripe\Security\SecurityToken; use SilverStripe\SiteConfig\SiteConfig; -use SilverStripe\Versioned\ChangeSet; -use SilverStripe\Versioned\ChangeSetItem; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Staged\ChangeSet; +use SilverStripe\Versioned\Staged\ChangeSetItem; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController; use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; diff --git a/code/Controllers/CMSSiteTreeFilter.php b/code/Controllers/CMSSiteTreeFilter.php index d2c4d57ce8..5d4a97d581 100644 --- a/code/Controllers/CMSSiteTreeFilter.php +++ b/code/Controllers/CMSSiteTreeFilter.php @@ -10,7 +10,7 @@ use SilverStripe\Forms\DateField; use SilverStripe\ORM\DataList; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Base class for filtering the subtree for certain node statuses. diff --git a/code/Controllers/CMSSiteTreeFilter_ChangedPages.php b/code/Controllers/CMSSiteTreeFilter_ChangedPages.php index 5d180eccc9..6af8aa8cb0 100644 --- a/code/Controllers/CMSSiteTreeFilter_ChangedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_ChangedPages.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\ORM\DataObject; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Gets all pages which have changed on stage. diff --git a/code/Controllers/CMSSiteTreeFilter_DeletedPages.php b/code/Controllers/CMSSiteTreeFilter_DeletedPages.php index 926f2b749f..941dfa4a38 100644 --- a/code/Controllers/CMSSiteTreeFilter_DeletedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_DeletedPages.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Works a bit different than the other filters: diff --git a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php index 1e76cae021..e1a98a9c55 100644 --- a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * This filter will display the SiteTree as a site visitor might see the site, i.e only the diff --git a/code/Controllers/CMSSiteTreeFilter_Search.php b/code/Controllers/CMSSiteTreeFilter_Search.php index 64ba79587f..f9c0276edf 100644 --- a/code/Controllers/CMSSiteTreeFilter_Search.php +++ b/code/Controllers/CMSSiteTreeFilter_Search.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter { diff --git a/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php b/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php index a541011f83..1ecc4f1aca 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Filters pages which have a status "Deleted". diff --git a/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php b/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php index 95cc5d89b5..06db5eb5f9 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Filters pages which have a status "Draft". diff --git a/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php b/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php index e2e53db175..6d022541d5 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php @@ -4,7 +4,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Model\List\SS_List; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Filters pages which have a status "Removed from Draft". diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index ad3397e061..4f61637b67 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -23,7 +23,7 @@ use SilverStripe\Security\Permission; use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\View\Parsers\URLSegmentFilter; use SilverStripe\View\Requirements; use SilverStripe\View\SSViewer; diff --git a/code/Model/RedirectorPage.php b/code/Model/RedirectorPage.php index 6eaec82686..72369deda0 100644 --- a/code/Model/RedirectorPage.php +++ b/code/Model/RedirectorPage.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\HeaderField; use SilverStripe\Forms\OptionsetField; use SilverStripe\Forms\UrlField; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * A redirector page redirects when the page is visited. diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 2ee8e6b1d5..d3d288e44d 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -69,8 +69,8 @@ use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Subsites\Model\Subsite; -use SilverStripe\Versioned\RecursivePublishable; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Staged\RecursivePublishable; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Model\ArrayData; use SilverStripe\View\HTML; use SilverStripe\View\Parsers\HTMLValue; diff --git a/code/Model/SiteTreeLinkTracking.php b/code/Model/SiteTreeLinkTracking.php index 04385714f2..5f0001a2f7 100644 --- a/code/Model/SiteTreeLinkTracking.php +++ b/code/Model/SiteTreeLinkTracking.php @@ -9,7 +9,7 @@ use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBHTMLText; use SilverStripe\ORM\ManyManyThroughList; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\View\Parsers\HTMLValue; use SilverStripe\Core\Extension; diff --git a/code/Model/VirtualPage.php b/code/Model/VirtualPage.php index 1237d3eeec..26a0131e67 100644 --- a/code/Model/VirtualPage.php +++ b/code/Model/VirtualPage.php @@ -13,7 +13,7 @@ use SilverStripe\ORM\DataObject; use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\View\HTML; /** diff --git a/code/Reports/BrokenFilesReport.php b/code/Reports/BrokenFilesReport.php index 2c4b3426ec..f476ee88c3 100644 --- a/code/Reports/BrokenFilesReport.php +++ b/code/Reports/BrokenFilesReport.php @@ -10,7 +10,7 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Reports\Report; use SilverStripe\ORM\DB; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class BrokenFilesReport extends Report { diff --git a/code/Reports/BrokenLinksReport.php b/code/Reports/BrokenLinksReport.php index c74c990bf4..c75cbc8195 100644 --- a/code/Reports/BrokenLinksReport.php +++ b/code/Reports/BrokenLinksReport.php @@ -13,7 +13,7 @@ use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\Reports\Report; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Content side-report listing pages with broken links diff --git a/code/Reports/BrokenRedirectorPagesReport.php b/code/Reports/BrokenRedirectorPagesReport.php index 62b8086b04..23089fcf0e 100644 --- a/code/Reports/BrokenRedirectorPagesReport.php +++ b/code/Reports/BrokenRedirectorPagesReport.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\FieldList; use SilverStripe\ORM\DB; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Reports\Report; class BrokenRedirectorPagesReport extends Report diff --git a/code/Reports/BrokenVirtualPagesReport.php b/code/Reports/BrokenVirtualPagesReport.php index ed680fe897..478fa30f93 100644 --- a/code/Reports/BrokenVirtualPagesReport.php +++ b/code/Reports/BrokenVirtualPagesReport.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\FieldList; use SilverStripe\ORM\DB; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Reports\Report; class BrokenVirtualPagesReport extends Report diff --git a/tests/behat/src/FixtureContext.php b/tests/behat/src/FixtureContext.php index d261ec9f97..beb1168eaf 100644 --- a/tests/behat/src/FixtureContext.php +++ b/tests/behat/src/FixtureContext.php @@ -14,7 +14,7 @@ use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\FixtureBlueprint; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Context used to create fixtures in the SilverStripe ORM. diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php index 94598ea574..ece4c64597 100644 --- a/tests/php/Controllers/CMSBatchActionsTest.php +++ b/tests/php/Controllers/CMSBatchActionsTest.php @@ -8,7 +8,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Tests CMS Specific subclasses of {@see CMSBatchAction} diff --git a/tests/php/Controllers/CMSMainTest.php b/tests/php/Controllers/CMSMainTest.php index 205166b404..8adb39420d 100644 --- a/tests/php/Controllers/CMSMainTest.php +++ b/tests/php/Controllers/CMSMainTest.php @@ -23,7 +23,7 @@ use SilverStripe\Security\Member; use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class CMSMainTest extends FunctionalTest { diff --git a/tests/php/Controllers/CMSSiteTreeFilterTest.php b/tests/php/Controllers/CMSSiteTreeFilterTest.php index bf2a925323..074c4e9239 100644 --- a/tests/php/Controllers/CMSSiteTreeFilterTest.php +++ b/tests/php/Controllers/CMSSiteTreeFilterTest.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Tests\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search; use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_ChangedPages; use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_DeletedPages; diff --git a/tests/php/Controllers/ContentControllerPermissionsTest.php b/tests/php/Controllers/ContentControllerPermissionsTest.php index a1f19faa00..bec114c81e 100644 --- a/tests/php/Controllers/ContentControllerPermissionsTest.php +++ b/tests/php/Controllers/ContentControllerPermissionsTest.php @@ -2,7 +2,7 @@ namespace SilverStripe\CMS\Tests\Controllers; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\FunctionalTest; diff --git a/tests/php/Controllers/ContentControllerSearchExtensionTest.php b/tests/php/Controllers/ContentControllerSearchExtensionTest.php index 8eae5f00ee..d166be2be8 100644 --- a/tests/php/Controllers/ContentControllerSearchExtensionTest.php +++ b/tests/php/Controllers/ContentControllerSearchExtensionTest.php @@ -8,7 +8,7 @@ use SilverStripe\CMS\Search\ContentControllerSearchExtension; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\Search\FulltextSearchable; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class ContentControllerSearchExtensionTest extends SapphireTest { diff --git a/tests/php/Controllers/ContentControllerTest.php b/tests/php/Controllers/ContentControllerTest.php index b661fd6dd6..250a16b255 100644 --- a/tests/php/Controllers/ContentControllerTest.php +++ b/tests/php/Controllers/ContentControllerTest.php @@ -9,7 +9,7 @@ use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\FunctionalTest; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; class ContentControllerTest extends FunctionalTest { diff --git a/tests/php/Controllers/ModelAsControllerTest.php b/tests/php/Controllers/ModelAsControllerTest.php index 60c4351eba..9f165685b3 100644 --- a/tests/php/Controllers/ModelAsControllerTest.php +++ b/tests/php/Controllers/ModelAsControllerTest.php @@ -2,7 +2,7 @@ namespace SilverStripe\CMS\Tests\Controllers; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Controllers\OldPageRedirector; use SilverStripe\CMS\Controllers\RootURLController; diff --git a/tests/php/Forms/SiteTreeURLSegmentFieldTest.php b/tests/php/Forms/SiteTreeURLSegmentFieldTest.php index 1c9f7df338..71a898d7b6 100644 --- a/tests/php/Forms/SiteTreeURLSegmentFieldTest.php +++ b/tests/php/Forms/SiteTreeURLSegmentFieldTest.php @@ -9,7 +9,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Tests CMS Specific subclasses of {@see CMSBatchAction} diff --git a/tests/php/Model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php index 2786e271dc..82e1786e86 100644 --- a/tests/php/Model/SiteTreeActionsTest.php +++ b/tests/php/Model/SiteTreeActionsTest.php @@ -7,7 +7,7 @@ use SilverStripe\ORM\DB; use SilverStripe\Security\Member; use SilverStripe\Security\Security; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Possible actions: diff --git a/tests/php/Model/SiteTreeBacklinksTest.php b/tests/php/Model/SiteTreeBacklinksTest.php index 839ef32a37..5760042591 100644 --- a/tests/php/Model/SiteTreeBacklinksTest.php +++ b/tests/php/Model/SiteTreeBacklinksTest.php @@ -7,7 +7,7 @@ use SilverStripe\Control\HTTP; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\GridField\GridField; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Tests {@see SiteTreeLinkTracking} broken links feature: LinkTracking diff --git a/tests/php/Model/SiteTreeBrokenLinksTest.php b/tests/php/Model/SiteTreeBrokenLinksTest.php index 9caa07660b..028724d920 100644 --- a/tests/php/Model/SiteTreeBrokenLinksTest.php +++ b/tests/php/Model/SiteTreeBrokenLinksTest.php @@ -11,7 +11,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; /** * Tests {@see SiteTreeLinkTracking} broken links feature: LinkTracking diff --git a/tests/php/Model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php index 5241137182..8e0353695f 100644 --- a/tests/php/Model/SiteTreePermissionsTest.php +++ b/tests/php/Model/SiteTreePermissionsTest.php @@ -10,7 +10,7 @@ use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Subsites\Extensions\SiteTreeSubsites; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use PHPUnit\Framework\Attributes\DataProvider; class SiteTreePermissionsTest extends FunctionalTest diff --git a/tests/php/Model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php index 29476014fb..d95df1773a 100644 --- a/tests/php/Model/SiteTreeTest.php +++ b/tests/php/Model/SiteTreeTest.php @@ -32,7 +32,7 @@ use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Subsites\Extensions\SiteTreeSubsites; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use SilverStripe\View\Parsers\HtmlDiff; use SilverStripe\View\Parsers\ShortcodeParser; use SilverStripe\View\Parsers\URLSegmentFilter; diff --git a/tests/php/Model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php index af456105e7..b3c7d2561b 100644 --- a/tests/php/Model/VirtualPageTest.php +++ b/tests/php/Model/VirtualPageTest.php @@ -13,7 +13,7 @@ use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Member; use SilverStripe\Subsites\Extensions\SiteTreeSubsites; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use TractorCow\Fluent\Extension\FluentSiteTreeExtension; class VirtualPageTest extends FunctionalTest diff --git a/tests/php/Search/ZZZSearchFormTest.php b/tests/php/Search/ZZZSearchFormTest.php index 75f2769127..85651fa789 100644 --- a/tests/php/Search/ZZZSearchFormTest.php +++ b/tests/php/Search/ZZZSearchFormTest.php @@ -17,7 +17,7 @@ use SilverStripe\Security\Member; use SilverStripe\Security\Security; use SilverStripe\Subsites\Extensions\SiteTreeSubsites; -use SilverStripe\Versioned\Versioned; +use SilverStripe\Versioned\Mode\Versioned; use TractorCow\Fluent\Extension\FluentSiteTreeExtension; /**