API Use updated Versioned and Staged classes

emteknetnz · emteknetnz · commit ecc01612396a · 2024-10-29T18:55:40.000+13:00
diff --git a/src/Control/Director.php b/src/Control/Director.php
@@ -13,7 +13,7 @@
 use SilverStripe\Core\Kernel;
 use SilverStripe\Core\Path;
 use SilverStripe\PolyExecution\PolyCommand;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\Requirements_Backend;
 use SilverStripe\View\TemplateGlobalProvider;
diff --git a/src/Dev/Command/DbBuild.php b/src/Dev/Command/DbBuild.php
@@ -18,7 +18,7 @@
 use SilverStripe\ORM\FieldType\DBClassName;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Dev/DevelopmentAdmin.php b/src/Dev/DevelopmentAdmin.php
@@ -18,7 +18,7 @@
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Model\ModelData;
 
 /**
diff --git a/src/ORM/Hierarchy/Hierarchy.php b/src/ORM/Hierarchy/Hierarchy.php
@@ -12,7 +12,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DB;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use Exception;
diff --git a/src/Security/InheritedPermissions.php b/src/Security/InheritedPermissions.php
@@ -7,7 +7,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use Psr\SimpleCache\CacheInterface;
 use SilverStripe\Core\Cache\MemberCacheFlusher;
 use SilverStripe\Dev\Deprecation;
diff --git a/src/Security/MemberAuthenticator/MemberAuthenticator.php b/src/Security/MemberAuthenticator/MemberAuthenticator.php
@@ -12,7 +12,7 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\PasswordEncryptor;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Authenticator for the default "member" method
diff --git a/tests/php/Core/ObjectTest.php b/tests/php/Core/ObjectTest.php
@@ -20,7 +20,7 @@
 use SilverStripe\Core\Tests\ObjectTest\MySubObject;
 use SilverStripe\Core\Tests\ObjectTest\TestExtension;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class ObjectTest extends SapphireTest
 {
diff --git a/tests/php/Forms/FormFactoryTest.php b/tests/php/Forms/FormFactoryTest.php
@@ -9,7 +9,7 @@
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class FormFactoryTest extends SapphireTest
 {
diff --git a/tests/php/Forms/FormFactoryTest/ControllerExtension.php b/tests/php/Forms/FormFactoryTest/ControllerExtension.php
@@ -12,7 +12,7 @@
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Provides versionable extensions to a controller / scaffolder
diff --git a/tests/php/Forms/FormFactoryTest/TestController.php b/tests/php/Forms/FormFactoryTest/TestController.php
@@ -5,7 +5,7 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Forms\Form;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Edit controller for this form
diff --git a/tests/php/Forms/FormFactoryTest/TestObject.php b/tests/php/Forms/FormFactoryTest/TestObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin Versioned
diff --git a/tests/php/Forms/GridField/GridFieldReadonlyTest.php b/tests/php/Forms/GridField/GridFieldReadonlyTest.php
@@ -22,7 +22,7 @@
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldViewButton;
 use SilverStripe\Forms\Tests\GridField\GridFieldReadonlyTest\GridFieldViewButtonReplacement;
-use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
+use SilverStripe\Versioned\Mode\VersionedGridFieldState\VersionedGridFieldState;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class GridFieldReadonlyTest extends SapphireTest
diff --git a/tests/php/Forms/GridField/GridFieldTest.php b/tests/php/Forms/GridField/GridFieldTest.php
@@ -37,7 +37,7 @@
 use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
-use SilverStripe\Versioned\VersionedGridFieldStateExtension;
+use SilverStripe\Versioned\Versioned\VersionedGridFieldStateExtension;
 
 class GridFieldTest extends SapphireTest
 {
diff --git a/tests/php/ORM/HierarchyCachingTest.php b/tests/php/ORM/HierarchyCachingTest.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\ORM\Tests\HierarchyTest\TestObject;
 use SilverStripe\ORM\Tests\HierarchyTest\HideTestObject;
 use SilverStripe\ORM\Tests\HierarchyTest\HideTestSubObject;
diff --git a/tests/php/ORM/HierarchyTest.php b/tests/php/ORM/HierarchyTest.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\ORM\Tests;
 
 use SilverStripe\Core\Validation\ValidationException;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Dev\SapphireTest;
 
 class HierarchyTest extends SapphireTest
diff --git a/tests/php/ORM/HierarchyTest/HideTestObject.php b/tests/php/ORM/HierarchyTest/HideTestObject.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin Versioned
diff --git a/tests/php/ORM/HierarchyTest/HideTestSubObject.php b/tests/php/ORM/HierarchyTest/HideTestSubObject.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\ORM\Tests\HierarchyTest;
 
 use SilverStripe\ORM\Hierarchy\Hierarchy;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin Versioned
diff --git a/tests/php/ORM/HierarchyTest/HierarchyOnSubclassTestObject.php b/tests/php/ORM/HierarchyTest/HierarchyOnSubclassTestObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin Versioned
diff --git a/tests/php/ORM/HierarchyTest/TestObject.php b/tests/php/ORM/HierarchyTest/TestObject.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin Versioned
diff --git a/tests/php/ORM/MarkedSetTest.php b/tests/php/ORM/MarkedSetTest.php
@@ -7,7 +7,7 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Hierarchy\MarkedSet;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Test set of marked Hierarchy-extended DataObjects
diff --git a/tests/php/Security/InheritedPermissionsTest.php b/tests/php/Security/InheritedPermissionsTest.php
@@ -11,7 +11,7 @@
 use SilverStripe\Security\Tests\InheritedPermissionsTest\TestPermissionNode;
 use SilverStripe\Security\Tests\InheritedPermissionsTest\TestDefaultPermissionChecker;
 use SilverStripe\Security\Tests\InheritedPermissionsTest\UnstagedNode;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use Psr\SimpleCache\CacheInterface;
 use ReflectionClass;
 
diff --git a/tests/php/Security/InheritedPermissionsTest/TestPermissionNode.php b/tests/php/Security/InheritedPermissionsTest/TestPermissionNode.php
@@ -9,7 +9,7 @@
 use SilverStripe\Security\InheritedPermissionsExtension;
 use SilverStripe\Security\PermissionChecker;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @method TestPermissionNode Parent()
diff --git a/tests/php/Security/InheritedPermissionsTest/UnstagedNode.php b/tests/php/Security/InheritedPermissionsTest/UnstagedNode.php
@@ -9,7 +9,7 @@
 use SilverStripe\Security\InheritedPermissionsExtension;
 use SilverStripe\Security\PermissionChecker;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @method UnstagedNode Parent()
diff --git a/tests/php/Security/VersionedMemberAuthenticatorTest.php b/tests/php/Security/VersionedMemberAuthenticatorTest.php
@@ -8,7 +8,7 @@
 use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedMemberAuthenticatorTest extends SapphireTest
 {
diff --git a/tests/php/View/SSViewerCacheBlockTest.php b/tests/php/View/SSViewerCacheBlockTest.php
@@ -5,7 +5,7 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Kernel;
 use SilverStripe\Core\TempFolder;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use Psr\SimpleCache\CacheInterface;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Control\Director;
diff --git a/tests/php/View/SSViewerCacheBlockTest/VersionedModel.php b/tests/php/View/SSViewerCacheBlockTest/VersionedModel.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedModel extends DataObject implements TestOnly
 {
diff --git a/tests/php/i18n/i18nTextCollectorTest.php b/tests/php/i18n/i18nTextCollectorTest.php
@@ -313,7 +313,7 @@ class MyClass extends Base implements SomeService {
     public function getNewLines(\$class) {
         if (
             !is_subclass_of(\$class, DataObject::class)
-            || !Object::has_extension(\$class, \SilverStripe\Versioned\Versioned::class)
+            || !Object::has_extension(\$class, \SilverStripe\Versioned\Mode\Versioned::class)
         ) {
             return null;
         }
@@ -364,7 +364,7 @@ public function testCollectFromClassSyntax()
         namespace SilverStripe\Framework\Core;
 
         use SilverStripe\ORM\DataObject;
-        use SilverStripe\Versioned\Versioned;
+        use SilverStripe\Versioned\Mode\Versioned;
         use Some\Space\MyClass as AliasClass;
         use NoNamespaceClass;
 
@@ -428,7 +428,7 @@ class MyTrait extends Base implements SomeService {
     public function getNewLines(\$class) {
         if (
             !is_subclass_of(\$class, DataObject::class)
-            || !Object::has_extension(\$class, \SilverStripe\Versioned\Versioned::class)
+            || !Object::has_extension(\$class, \SilverStripe\Versioned\Mode\Versioned::class)
         ) {
             return null;
         }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use SilverStripe\Core\Tests\ObjectTest\MySubObject;`
`21`	`21`	`use SilverStripe\Core\Tests\ObjectTest\TestExtension;`
`22`	`22`	`use SilverStripe\Dev\SapphireTest;`
`23`		`-use SilverStripe\Versioned\Versioned;`
	`23`	`+use SilverStripe\Versioned\Mode\Versioned;`
`24`	`24`
`25`	`25`	`class ObjectTest extends SapphireTest`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use SilverStripe\Forms\HiddenField;`
`10`	`10`	`use SilverStripe\Forms\LiteralField;`
`11`	`11`	`use SilverStripe\Forms\TextField;`
`12`		`-use SilverStripe\Versioned\Versioned;`
	`12`	`+use SilverStripe\Versioned\Mode\Versioned;`
`13`	`13`
`14`	`14`	`class FormFactoryTest extends SapphireTest`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`use SilverStripe\Core\Validation\ValidationResult;`
`38`	`38`	`use SilverStripe\Security\Group;`
`39`	`39`	`use SilverStripe\Security\Member;`
`40`		`-use SilverStripe\Versioned\VersionedGridFieldStateExtension;`
	`40`	`+use SilverStripe\Versioned\Versioned\VersionedGridFieldStateExtension;`
`41`	`41`
`42`	`42`	`class GridFieldTest extends SapphireTest`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use SilverStripe\Core\Validation\ValidationResult;`
`9`	`9`	`use SilverStripe\Security\Member;`
`10`	`10`	`use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;`
`11`		`-use SilverStripe\Versioned\Versioned;`
	`11`	`+use SilverStripe\Versioned\Mode\Versioned;`
`12`	`12`
`13`	`13`	`class VersionedMemberAuthenticatorTest extends SapphireTest`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use SilverStripe\Dev\TestOnly;`
`6`	`6`	`use SilverStripe\ORM\DataObject;`
`7`		`-use SilverStripe\Versioned\Versioned;`
	`7`	`+use SilverStripe\Versioned\Mode\Versioned;`
`8`	`8`
`9`	`9`	`class VersionedModel extends DataObject implements TestOnly`
`10`	`10`	`{`