From 9162ab80027a2312a06214dc9ff81c0831394790 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:33:44 +1200 Subject: [PATCH] API Use new names for renamed classes (#1824) --- code/CMSBatchAction.php | 2 +- code/CMSBatchActionHandler.php | 6 +++--- code/CMSProfileController.php | 2 +- code/Forms/UsedOnTable.php | 2 +- code/LeftAndMain.php | 14 +++++++------- code/ModelAdmin.php | 8 ++++---- code/Navigator/SilverStripeNavigator.php | 8 ++++---- code/Navigator/SilverStripeNavigatorItem.php | 4 ++-- code/SudoModeController.php | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php index e6607803f..c94185a86 100644 --- a/code/CMSBatchAction.php +++ b/code/CMSBatchAction.php @@ -7,7 +7,7 @@ use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\ORM\DataObject; use SilverStripe\Versioned\Versioned; diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php index b2529d61d..6b077b660 100644 --- a/code/CMSBatchActionHandler.php +++ b/code/CMSBatchActionHandler.php @@ -8,13 +8,13 @@ use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\RequestHandler; use SilverStripe\Core\Config\Config; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DB; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; use SilverStripe\ORM\DataObject; use SilverStripe\Security\SecurityToken; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use InvalidArgumentException; /** diff --git a/code/CMSProfileController.php b/code/CMSProfileController.php index 5d745800b..7bb527e46 100644 --- a/code/CMSProfileController.php +++ b/code/CMSProfileController.php @@ -7,7 +7,7 @@ use SilverStripe\Forms\Form; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\FormAction; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; diff --git a/code/Forms/UsedOnTable.php b/code/Forms/UsedOnTable.php index 53efa32bc..5897e0012 100644 --- a/code/Forms/UsedOnTable.php +++ b/code/Forms/UsedOnTable.php @@ -5,7 +5,7 @@ use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Forms\FormField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\Versioned\RecursivePublishable; use SilverStripe\Versioned\Versioned; diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 5828d6926..9eb920f7b 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -34,15 +34,15 @@ use SilverStripe\Forms\PrintableTransformation; use SilverStripe\Forms\Schema\FormSchema; use SilverStripe\i18n\i18n; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\CMSPreviewable; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBHTMLText; use SilverStripe\ORM\Hierarchy\Hierarchy; -use SilverStripe\ORM\SS_List; -use SilverStripe\ORM\ValidationException; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Model\List\SS_List; +use SilverStripe\Core\Validation\ValidationException; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\PermissionProvider; @@ -50,7 +50,7 @@ use SilverStripe\Security\SecurityToken; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Versioned\Versioned; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; use SilverStripe\View\SSViewer; @@ -1979,8 +1979,8 @@ public function LogoutURL() } /** - * Same as {@link ViewableData->CSSClasses()}, but with a changed name - * to avoid problems when using {@link ViewableData->customise()} + * Same as {@link ModelData->CSSClasses()}, but with a changed name + * to avoid problems when using {@link ModelData->customise()} * (which always returns "ArrayData" from the $original object). * * @return string diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index cf3a2bfaa..9ef852670 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -27,11 +27,11 @@ use SilverStripe\Forms\GridField\GridFieldPrintButton; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\LiteralField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; /** * Generates a three-pane UI for editing model classes, tabular results and edit forms. @@ -412,7 +412,7 @@ public function getModelClass() } /** - * @return \SilverStripe\ORM\ArrayList An ArrayList of all managed models to build the tabs for this ModelAdmin + * @return \SilverStripe\Model\List\ArrayList An ArrayList of all managed models to build the tabs for this ModelAdmin */ protected function getManagedModelTabs() { diff --git a/code/Navigator/SilverStripeNavigator.php b/code/Navigator/SilverStripeNavigator.php index e86c49d84..baa6259c8 100644 --- a/code/Navigator/SilverStripeNavigator.php +++ b/code/Navigator/SilverStripeNavigator.php @@ -4,11 +4,11 @@ use InvalidArgumentException; use SilverStripe\Core\ClassInfo; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\CMSPreviewable; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\SS_List; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\List\SS_List; +use SilverStripe\Model\ModelData; /** * Utility class representing links to different views of a record @@ -20,7 +20,7 @@ * for example the "cmsworkflow" module defines a new "future state" item with a date selector * to view embargoed data at a future point in time. So the item doesn't always have to be a simple link. */ -class SilverStripeNavigator extends ViewableData +class SilverStripeNavigator extends ModelData { /** diff --git a/code/Navigator/SilverStripeNavigatorItem.php b/code/Navigator/SilverStripeNavigatorItem.php index 205da1946..7aed57036 100644 --- a/code/Navigator/SilverStripeNavigatorItem.php +++ b/code/Navigator/SilverStripeNavigatorItem.php @@ -7,14 +7,14 @@ use SilverStripe\ORM\DataObject; use SilverStripe\Versioned\Versioned; use SilverStripe\Security\Member; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ModelData; /** * SilverStripeNavigator items are links that appear in the $SilverStripeNavigator bar. * To add an item, extend this class - it will be automatically picked up. * When instanciating items manually, please ensure to call {@link canView()}. */ -abstract class SilverStripeNavigatorItem extends ViewableData +abstract class SilverStripeNavigatorItem extends ModelData { /** * @param DataObject|CMSPreviewable diff --git a/code/SudoModeController.php b/code/SudoModeController.php index fd29e20c0..0a5376d5e 100644 --- a/code/SudoModeController.php +++ b/code/SudoModeController.php @@ -6,7 +6,7 @@ use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Core\Injector\Injector; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Authenticator; use SilverStripe\Security\Security; use SilverStripe\Security\SecurityToken;