API Use updated Versioned and Staged classes

emteknetnz · emteknetnz · commit 2d84a0c31fa8 · 2024-10-29T14:23:11.000+13:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use SilverStripe\CMS\Model\SiteTree;`
`6`	`6`	`use SilverStripe\Model\List\SS_List;`
`7`		`-use SilverStripe\Versioned\Versioned;`
	`7`	`+use SilverStripe\Versioned\Mode\Versioned;`
`8`	`8`
`9`	`9`	`class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use SilverStripe\Forms\FieldList;`
`11`	`11`	`use SilverStripe\Reports\Report;`
`12`	`12`	`use SilverStripe\ORM\DB;`
`13`		`-use SilverStripe\Versioned\Versioned;`
	`13`	`+use SilverStripe\Versioned\Mode\Versioned;`
`14`	`14`
`15`	`15`	`class BrokenFilesReport extends Report`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`use SilverStripe\Security\Member;`
`24`	`24`	`use SilverStripe\Security\Security;`
`25`	`25`	`use SilverStripe\SiteConfig\SiteConfig;`
`26`		`-use SilverStripe\Versioned\Versioned;`
	`26`	`+use SilverStripe\Versioned\Mode\Versioned;`
`27`	`27`
`28`	`28`	`class CMSMainTest extends FunctionalTest`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use SilverStripe\CMS\Search\ContentControllerSearchExtension;`
`9`	`9`	`use SilverStripe\Dev\SapphireTest;`
`10`	`10`	`use SilverStripe\ORM\Search\FulltextSearchable;`
`11`		`-use SilverStripe\Versioned\Versioned;`
	`11`	`+use SilverStripe\Versioned\Mode\Versioned;`
`12`	`12`
`13`	`13`	`class ContentControllerSearchExtensionTest extends SapphireTest`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use SilverStripe\Control\HTTPResponse_Exception;`
`10`	`10`	`use SilverStripe\Core\Config\Config;`
`11`	`11`	`use SilverStripe\Dev\FunctionalTest;`
`12`		`-use SilverStripe\Versioned\Versioned;`
	`12`	`+use SilverStripe\Versioned\Mode\Versioned;`
`13`	`13`
`14`	`14`	`class ContentControllerTest extends FunctionalTest`
`15`	`15`	`{`