From e987568376cc02303002e1e2a194c2a88baa3962 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 29 Oct 2024 13:58:14 +1300
Subject: [PATCH] API Split apart Versioned and Staged

---
 _config/versionedextension.yml                            | 2 +-
 _config/versionedownership.yml                            | 8 ++++----
 _config/versionedrequestprocessors.yml                    | 2 +-
 src/{ => Staged}/ChangeSet.php                            | 2 +-
 src/{ => Staged}/ChangeSetItem.php                        | 3 ++-
 src/{ => Staged}/RecursivePublishable.php                 | 6 ++++--
 src/{ => Staged}/RecursivePublishableHandler.php          | 3 ++-
 src/{ => Staged}/RecursiveStagesInterface.php             | 2 +-
 src/{ => Staged}/RecursiveStagesService.php               | 3 ++-
 src/{ => Staged}/VersionedHTTPMiddleware.php              | 3 ++-
 src/{ => Staged}/VersionedTableDataQueryExtension.php     | 3 ++-
 src/Versioned.php                                         | 1 +
 tests/php/ChangeSetItemTest.php                           | 2 +-
 tests/php/ChangeSetTest.php                               | 4 ++--
 tests/php/ChangeSetTest/ChangeSetSyncStub.php             | 2 +-
 .../PolymorphicIntermediary.php                           | 2 +-
 .../PolymorphicOwned.php                                  | 2 +-
 .../PolymorphicOwner.php                                  | 2 +-
 tests/php/PublishRecursive/PublishRecursiveTest.php       | 2 +-
 tests/php/VersionedDeletedVersionsTest.php                | 2 +-
 .../UnversionedObject.php                                 | 2 +-
 .../UnversionedOwner.php                                  | 2 +-
 .../VersionedGridFieldItemRequestTest/VersionedObject.php | 2 +-
 .../VersionedGridFieldItemRequestTest/VersionedOwner.php  | 2 +-
 .../VersionedManyManyThroughListTest/VersionedObject.php  | 2 +-
 tests/php/VersionedOwnershipTest.php                      | 4 ++--
 tests/php/VersionedOwnershipTest/Attachment.php           | 2 +-
 tests/php/VersionedOwnershipTest/Banner.php               | 2 +-
 tests/php/VersionedOwnershipTest/CustomRelation.php       | 2 +-
 tests/php/VersionedOwnershipTest/Image.php                | 2 +-
 tests/php/VersionedOwnershipTest/OwnedByUnversioned.php   | 2 +-
 tests/php/VersionedOwnershipTest/Related.php              | 2 +-
 tests/php/VersionedOwnershipTest/RelatedMany.php          | 2 +-
 tests/php/VersionedOwnershipTest/TestObject.php           | 2 +-
 tests/php/VersionedOwnershipTest/TestPage.php             | 2 +-
 tests/php/VersionedOwnershipTest/UnversionedOwner.php     | 2 +-
 tests/php/VersionedTest.php                               | 2 +-
 tests/php/VersionedTest/ChangeSetTestObject.php           | 2 +-
 tests/php/VersionedTest/TestObject.php                    | 2 +-
 .../VersionsDeletedVersionsTest/CompanyOfficeLocation.php | 2 +-
 tests/php/VersionsDeletedVersionsTest/CompanyPage.php     | 2 +-
 tests/php/VersionsDeletedVersionsTest/GalleryBlock.php    | 2 +-
 .../php/VersionsDeletedVersionsTest/GalleryBlockItem.php  | 2 +-
 .../php/VersionsDeletedVersionsTest/GalleryBlockPage.php  | 2 +-
 tests/php/VersionsDeletedVersionsTest/OfficeLocation.php  | 2 +-
 45 files changed, 58 insertions(+), 50 deletions(-)
 rename src/{ => Staged}/ChangeSet.php (99%)
 rename src/{ => Staged}/ChangeSetItem.php (99%)
 rename src/{ => Staged}/RecursivePublishable.php (98%)
 rename src/{ => Staged}/RecursivePublishableHandler.php (90%)
 rename src/{ => Staged}/RecursiveStagesInterface.php (91%)
 rename src/{ => Staged}/RecursiveStagesService.php (98%)
 rename src/{ => Staged}/VersionedHTTPMiddleware.php (96%)
 rename src/{ => Staged}/VersionedTableDataQueryExtension.php (91%)

diff --git a/_config/versionedextension.yml b/_config/versionedextension.yml
index 40a99720..1304cb9f 100644
--- a/_config/versionedextension.yml
+++ b/_config/versionedextension.yml
@@ -19,4 +19,4 @@ Name: versioned-table
 ---
 SilverStripe\ORM\DataQuery:
   extensions:
-    - SilverStripe\Versioned\VersionedTableDataQueryExtension
+    - SilverStripe\Versioned\Staged\VersionedTableDataQueryExtension
diff --git a/_config/versionedownership.yml b/_config/versionedownership.yml
index a6b43386..26833e2f 100644
--- a/_config/versionedownership.yml
+++ b/_config/versionedownership.yml
@@ -3,11 +3,11 @@ Name: versionedownership
 ---
 SilverStripe\ORM\DataObject:
   extensions:
-    RecursivePublishable: SilverStripe\Versioned\RecursivePublishable
+    RecursivePublishable: SilverStripe\Versioned\Staged\RecursivePublishable
 
 SilverStripe\Core\Injector\Injector:
-  SilverStripe\Versioned\RecursiveStagesInterface:
-    class: SilverStripe\Versioned\RecursiveStagesService
+  SilverStripe\Versioned\Staged\RecursiveStagesInterface:
+    class: SilverStripe\Versioned\Staged\RecursiveStagesService
 ---
 Name: versionedownership-admin
 OnlyIf:
@@ -15,4 +15,4 @@ OnlyIf:
 ---
 SilverStripe\Admin\LeftAndMain:
   extensions:
-    RecursivePublishableHandler: SilverStripe\Versioned\RecursivePublishableHandler
+    RecursivePublishableHandler: SilverStripe\Versioned\Staged\RecursivePublishableHandler
diff --git a/_config/versionedrequestprocessors.yml b/_config/versionedrequestprocessors.yml
index 7161f7b6..8cefbd00 100644
--- a/_config/versionedrequestprocessors.yml
+++ b/_config/versionedrequestprocessors.yml
@@ -8,4 +8,4 @@ SilverStripe\Core\Injector\Injector:
   SilverStripe\Control\Director:
     properties:
       Middlewares:
-        VersionedMiddleware: '%$SilverStripe\Versioned\VersionedHTTPMiddleware'
+        VersionedMiddleware: '%$SilverStripe\Versioned\Staged\VersionedHTTPMiddleware'
diff --git a/src/ChangeSet.php b/src/Staged/ChangeSet.php
similarity index 99%
rename from src/ChangeSet.php
rename to src/Staged/ChangeSet.php
index c3e5f315..364e1abc 100644
--- a/src/ChangeSet.php
+++ b/src/Staged/ChangeSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use BadMethodCallException;
 use Exception;
diff --git a/src/ChangeSetItem.php b/src/Staged/ChangeSetItem.php
similarity index 99%
rename from src/ChangeSetItem.php
rename to src/Staged/ChangeSetItem.php
index 3bb83bd0..23d23bee 100644
--- a/src/ChangeSetItem.php
+++ b/src/Staged/ChangeSetItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use BadMethodCallException;
 use InvalidArgumentException;
@@ -17,6 +17,7 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * A single line in a changeset
diff --git a/src/RecursivePublishable.php b/src/Staged/RecursivePublishable.php
similarity index 98%
rename from src/RecursivePublishable.php
rename to src/Staged/RecursivePublishable.php
index 014ba676..31ec51da 100644
--- a/src/RecursivePublishable.php
+++ b/src/Staged/RecursivePublishable.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use InvalidArgumentException;
 use SilverStripe\Core\ClassInfo;
@@ -12,6 +12,8 @@
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\Queries\SQLUpdate;
 use SilverStripe\Model\List\SS_List;
+use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\ReadingMode;
 
 /**
  * Provides owns / owned_by and recursive publishing API for all objects.
@@ -84,7 +86,7 @@ public function publishRecursive()
             );
 
             $changeset->write();
-            $changeset->addObject($owner);
+            $changeset->addObject($owner); // will add a ChangeSetItem to $changeset->Changes()
 
             $result = $changeset->publish(true);
             if (!$result) {
diff --git a/src/RecursivePublishableHandler.php b/src/Staged/RecursivePublishableHandler.php
similarity index 90%
rename from src/RecursivePublishableHandler.php
rename to src/Staged/RecursivePublishableHandler.php
index 6432fc49..99ee4354 100644
--- a/src/RecursivePublishableHandler.php
+++ b/src/Staged/RecursivePublishableHandler.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * Provides recursive publishable behaviour for LeftAndMain and GridFieldDetailForm_ItemRequest
diff --git a/src/RecursiveStagesInterface.php b/src/Staged/RecursiveStagesInterface.php
similarity index 91%
rename from src/RecursiveStagesInterface.php
rename to src/Staged/RecursiveStagesInterface.php
index 41c588a3..466861d1 100644
--- a/src/RecursiveStagesInterface.php
+++ b/src/Staged/RecursiveStagesInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use SilverStripe\ORM\DataObject;
 
diff --git a/src/RecursiveStagesService.php b/src/Staged/RecursiveStagesService.php
similarity index 98%
rename from src/RecursiveStagesService.php
rename to src/Staged/RecursiveStagesService.php
index eb439a4b..3ccb7c6c 100644
--- a/src/RecursiveStagesService.php
+++ b/src/Staged/RecursiveStagesService.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Resettable;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * Functionality for detecting the need of publishing nested objects owned by common parent / ancestor object
diff --git a/src/VersionedHTTPMiddleware.php b/src/Staged/VersionedHTTPMiddleware.php
similarity index 96%
rename from src/VersionedHTTPMiddleware.php
rename to src/Staged/VersionedHTTPMiddleware.php
index 2757c79a..e38d6e3c 100644
--- a/src/VersionedHTTPMiddleware.php
+++ b/src/Staged/VersionedHTTPMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
@@ -10,6 +10,7 @@
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\Security\Security;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * Initialises the versioned stage when a request is made.
diff --git a/src/VersionedTableDataQueryExtension.php b/src/Staged/VersionedTableDataQueryExtension.php
similarity index 91%
rename from src/VersionedTableDataQueryExtension.php
rename to src/Staged/VersionedTableDataQueryExtension.php
index 3557dc83..369467c0 100644
--- a/src/VersionedTableDataQueryExtension.php
+++ b/src/Staged/VersionedTableDataQueryExtension.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace SilverStripe\Versioned;
+namespace SilverStripe\Versioned\Staged;
 
 use SilverStripe\Core\Extensible;
 use SilverStripe\Core\Extension;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DataQuery;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * Applies correct stage to tables
diff --git a/src/Versioned.php b/src/Versioned.php
index 87858e5a..0d90efcc 100644
--- a/src/Versioned.php
+++ b/src/Versioned.php
@@ -26,6 +26,7 @@
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
 use SilverStripe\View\TemplateGlobalProvider;
+use SilverStripe\Versioned\Staged\RecursiveStagesInterface;
 
 /**
  * The Versioned extension allows your DataObjects to have several versions,
diff --git a/tests/php/ChangeSetItemTest.php b/tests/php/ChangeSetItemTest.php
index 148cec16..4e3cc45c 100644
--- a/tests/php/ChangeSetItemTest.php
+++ b/tests/php/ChangeSetItemTest.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\Versioned\Tests;
 
-use SilverStripe\Versioned\ChangeSetItem;
+use SilverStripe\Versioned\Staged\ChangeSetItem;
 use SilverStripe\Dev\SapphireTest;
 
 class ChangeSetItemTest extends SapphireTest
diff --git a/tests/php/ChangeSetTest.php b/tests/php/ChangeSetTest.php
index 8bf43647..2cc3348d 100644
--- a/tests/php/ChangeSetTest.php
+++ b/tests/php/ChangeSetTest.php
@@ -7,8 +7,8 @@
 use SebastianBergmann\Comparator\ComparisonFailure;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\ChangeSet;
-use SilverStripe\Versioned\ChangeSetItem;
+use SilverStripe\Versioned\Staged\ChangeSet;
+use SilverStripe\Versioned\Staged\ChangeSetItem;
 use SilverStripe\Versioned\Tests\ChangeSetTest\BaseObject;
 use SilverStripe\Versioned\Tests\ChangeSetTest\ChangeSetSyncStub;
 use SilverStripe\Versioned\Tests\ChangeSetTest\MidObject;
diff --git a/tests/php/ChangeSetTest/ChangeSetSyncStub.php b/tests/php/ChangeSetTest/ChangeSetSyncStub.php
index a8c6d0ed..73bef901 100644
--- a/tests/php/ChangeSetTest/ChangeSetSyncStub.php
+++ b/tests/php/ChangeSetTest/ChangeSetSyncStub.php
@@ -2,7 +2,7 @@
 namespace SilverStripe\Versioned\Tests\ChangeSetTest;
 
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\Versioned\ChangeSet;
+use SilverStripe\Versioned\Staged\ChangeSet;
 
 class ChangeSetSyncStub extends ChangeSet implements TestOnly
 {
diff --git a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicIntermediary.php b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicIntermediary.php
index ed8307fc..ca490f69 100644
--- a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicIntermediary.php
+++ b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicIntermediary.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwned.php b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwned.php
index 9fb88e30..550c98ab 100644
--- a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwned.php
+++ b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwned.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwner.php b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwner.php
index 9c7c379b..7a903a6a 100644
--- a/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwner.php
+++ b/tests/php/PolymorphicVersionedOwnershipTest/PolymorphicOwner.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/PublishRecursive/PublishRecursiveTest.php b/tests/php/PublishRecursive/PublishRecursiveTest.php
index 42217a18..aab2f4ce 100644
--- a/tests/php/PublishRecursive/PublishRecursiveTest.php
+++ b/tests/php/PublishRecursive/PublishRecursiveTest.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\Queries\SQLSelect;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 class PublishRecursiveTest extends SapphireTest
diff --git a/tests/php/VersionedDeletedVersionsTest.php b/tests/php/VersionedDeletedVersionsTest.php
index 471c9a82..96446960 100644
--- a/tests/php/VersionedDeletedVersionsTest.php
+++ b/tests/php/VersionedDeletedVersionsTest.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\Queries\SQLSelect;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Tests\VersionsDeletedVersionsTest\CompanyOfficeLocation;
 use SilverStripe\Versioned\Tests\VersionsDeletedVersionsTest\CompanyPage;
 use SilverStripe\Versioned\Tests\VersionsDeletedVersionsTest\GalleryBlock;
diff --git a/tests/php/VersionedGridFieldItemRequestTest/UnversionedObject.php b/tests/php/VersionedGridFieldItemRequestTest/UnversionedObject.php
index f17ac33c..9ddfa6ef 100644
--- a/tests/php/VersionedGridFieldItemRequestTest/UnversionedObject.php
+++ b/tests/php/VersionedGridFieldItemRequestTest/UnversionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 
 /**
  * @mixin RecursivePublishable
diff --git a/tests/php/VersionedGridFieldItemRequestTest/UnversionedOwner.php b/tests/php/VersionedGridFieldItemRequestTest/UnversionedOwner.php
index 09252caa..43c936e3 100644
--- a/tests/php/VersionedGridFieldItemRequestTest/UnversionedOwner.php
+++ b/tests/php/VersionedGridFieldItemRequestTest/UnversionedOwner.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 
 /**
  * @mixin RecursivePublishable
diff --git a/tests/php/VersionedGridFieldItemRequestTest/VersionedObject.php b/tests/php/VersionedGridFieldItemRequestTest/VersionedObject.php
index 0520ca93..77029c8e 100644
--- a/tests/php/VersionedGridFieldItemRequestTest/VersionedObject.php
+++ b/tests/php/VersionedGridFieldItemRequestTest/VersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedGridFieldItemRequestTest/VersionedOwner.php b/tests/php/VersionedGridFieldItemRequestTest/VersionedOwner.php
index b8ed53e6..a1446c5b 100644
--- a/tests/php/VersionedGridFieldItemRequestTest/VersionedOwner.php
+++ b/tests/php/VersionedGridFieldItemRequestTest/VersionedOwner.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedManyManyThroughListTest/VersionedObject.php b/tests/php/VersionedManyManyThroughListTest/VersionedObject.php
index 6d900bf6..75e55262 100644
--- a/tests/php/VersionedManyManyThroughListTest/VersionedObject.php
+++ b/tests/php/VersionedManyManyThroughListTest/VersionedObject.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ManyManyThroughList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest.php b/tests/php/VersionedOwnershipTest.php
index 825a5b8a..7cfc3ffb 100644
--- a/tests/php/VersionedOwnershipTest.php
+++ b/tests/php/VersionedOwnershipTest.php
@@ -2,8 +2,8 @@
 
 namespace SilverStripe\Versioned\Tests;
 
-use SilverStripe\Versioned\ChangeSet;
-use SilverStripe\Versioned\ChangeSetItem;
+use SilverStripe\Versioned\Staged\ChangeSet;
+use SilverStripe\Versioned\Staged\ChangeSetItem;
 use SilverStripe\Versioned\Tests\VersionedOwnershipTest\Attachment;
 use SilverStripe\Versioned\Tests\VersionedOwnershipTest\Banner;
 use SilverStripe\Versioned\Tests\VersionedOwnershipTest\Image;
diff --git a/tests/php/VersionedOwnershipTest/Attachment.php b/tests/php/VersionedOwnershipTest/Attachment.php
index 9d50a5b1..c1e498a7 100644
--- a/tests/php/VersionedOwnershipTest/Attachment.php
+++ b/tests/php/VersionedOwnershipTest/Attachment.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/Banner.php b/tests/php/VersionedOwnershipTest/Banner.php
index 431a1df2..36164c2f 100644
--- a/tests/php/VersionedOwnershipTest/Banner.php
+++ b/tests/php/VersionedOwnershipTest/Banner.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/CustomRelation.php b/tests/php/VersionedOwnershipTest/CustomRelation.php
index 4f2bd34b..d2f161b8 100644
--- a/tests/php/VersionedOwnershipTest/CustomRelation.php
+++ b/tests/php/VersionedOwnershipTest/CustomRelation.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/Image.php b/tests/php/VersionedOwnershipTest/Image.php
index 5156e114..6d6c3fdb 100644
--- a/tests/php/VersionedOwnershipTest/Image.php
+++ b/tests/php/VersionedOwnershipTest/Image.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/OwnedByUnversioned.php b/tests/php/VersionedOwnershipTest/OwnedByUnversioned.php
index 75ad2ac9..9bfd3100 100644
--- a/tests/php/VersionedOwnershipTest/OwnedByUnversioned.php
+++ b/tests/php/VersionedOwnershipTest/OwnedByUnversioned.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/Related.php b/tests/php/VersionedOwnershipTest/Related.php
index ce8b1867..f5397c2c 100644
--- a/tests/php/VersionedOwnershipTest/Related.php
+++ b/tests/php/VersionedOwnershipTest/Related.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/RelatedMany.php b/tests/php/VersionedOwnershipTest/RelatedMany.php
index d713b53c..97da9596 100644
--- a/tests/php/VersionedOwnershipTest/RelatedMany.php
+++ b/tests/php/VersionedOwnershipTest/RelatedMany.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/TestObject.php b/tests/php/VersionedOwnershipTest/TestObject.php
index 49f0ab97..7b7a070a 100644
--- a/tests/php/VersionedOwnershipTest/TestObject.php
+++ b/tests/php/VersionedOwnershipTest/TestObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/TestPage.php b/tests/php/VersionedOwnershipTest/TestPage.php
index 253e5379..71c4bd49 100644
--- a/tests/php/VersionedOwnershipTest/TestPage.php
+++ b/tests/php/VersionedOwnershipTest/TestPage.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionedOwnershipTest/UnversionedOwner.php b/tests/php/VersionedOwnershipTest/UnversionedOwner.php
index 06102369..b37c2085 100644
--- a/tests/php/VersionedOwnershipTest/UnversionedOwner.php
+++ b/tests/php/VersionedOwnershipTest/UnversionedOwner.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 
 /**
  * @mixin RecursivePublishable
diff --git a/tests/php/VersionedTest.php b/tests/php/VersionedTest.php
index 3539fd78..f6262c74 100644
--- a/tests/php/VersionedTest.php
+++ b/tests/php/VersionedTest.php
@@ -22,7 +22,7 @@
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Security\IdentityStore;
-use SilverStripe\Versioned\ChangeSet;
+use SilverStripe\Versioned\Staged\ChangeSet;
 use SilverStripe\Versioned\Versioned;
 
 class VersionedTest extends SapphireTest
diff --git a/tests/php/VersionedTest/ChangeSetTestObject.php b/tests/php/VersionedTest/ChangeSetTestObject.php
index d4459212..95e56d39 100644
--- a/tests/php/VersionedTest/ChangeSetTestObject.php
+++ b/tests/php/VersionedTest/ChangeSetTestObject.php
@@ -6,7 +6,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\ManyManyList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
 
diff --git a/tests/php/VersionedTest/TestObject.php b/tests/php/VersionedTest/TestObject.php
index 210c1465..1ee40ec4 100644
--- a/tests/php/VersionedTest/TestObject.php
+++ b/tests/php/VersionedTest/TestObject.php
@@ -6,7 +6,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\ManyManyList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/CompanyOfficeLocation.php b/tests/php/VersionsDeletedVersionsTest/CompanyOfficeLocation.php
index 6098a8be..d98a2415 100644
--- a/tests/php/VersionsDeletedVersionsTest/CompanyOfficeLocation.php
+++ b/tests/php/VersionsDeletedVersionsTest/CompanyOfficeLocation.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/CompanyPage.php b/tests/php/VersionsDeletedVersionsTest/CompanyPage.php
index 89bc73ba..75b69c4d 100644
--- a/tests/php/VersionsDeletedVersionsTest/CompanyPage.php
+++ b/tests/php/VersionsDeletedVersionsTest/CompanyPage.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ManyManyThroughList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/GalleryBlock.php b/tests/php/VersionsDeletedVersionsTest/GalleryBlock.php
index 505d40a7..70f25461 100644
--- a/tests/php/VersionsDeletedVersionsTest/GalleryBlock.php
+++ b/tests/php/VersionsDeletedVersionsTest/GalleryBlock.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/GalleryBlockItem.php b/tests/php/VersionsDeletedVersionsTest/GalleryBlockItem.php
index f1d75e91..fc041ad3 100644
--- a/tests/php/VersionsDeletedVersionsTest/GalleryBlockItem.php
+++ b/tests/php/VersionsDeletedVersionsTest/GalleryBlockItem.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/GalleryBlockPage.php b/tests/php/VersionsDeletedVersionsTest/GalleryBlockPage.php
index 70082131..d57dfcaa 100644
--- a/tests/php/VersionsDeletedVersionsTest/GalleryBlockPage.php
+++ b/tests/php/VersionsDeletedVersionsTest/GalleryBlockPage.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**
diff --git a/tests/php/VersionsDeletedVersionsTest/OfficeLocation.php b/tests/php/VersionsDeletedVersionsTest/OfficeLocation.php
index d53138c1..13e01996 100644
--- a/tests/php/VersionsDeletedVersionsTest/OfficeLocation.php
+++ b/tests/php/VersionsDeletedVersionsTest/OfficeLocation.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 
 /**