From fe2d991918b6ca57f622daded7da0e097f107b8e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 17 Sep 2024 13:43:05 +1200 Subject: [PATCH] API Use new names for renamed classes --- src/Admin/GridFieldCategorisationConfig.php | 2 +- src/Admin/GridFieldMergeAction.php | 2 +- src/Forms/GridField/GridFieldAddByDBField.php | 4 ++-- src/Model/Blog.php | 2 +- src/Model/BlogController.php | 6 +++--- src/Model/BlogObject.php | 2 +- src/Model/BlogPost.php | 6 +++--- src/Model/BlogPostNotifications.php | 2 +- tests/php/BlogCategoryTest.php | 2 +- tests/php/BlogTagTest.php | 2 +- tests/php/BlogTest.php | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Admin/GridFieldCategorisationConfig.php b/src/Admin/GridFieldCategorisationConfig.php index 05d36d97a..3c3844174 100644 --- a/src/Admin/GridFieldCategorisationConfig.php +++ b/src/Admin/GridFieldCategorisationConfig.php @@ -7,7 +7,7 @@ use SilverStripe\Forms\GridField\GridFieldAddNewButton; use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor; use SilverStripe\Forms\GridField\GridFieldDataColumns; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; class GridFieldCategorisationConfig extends GridFieldConfig_RecordEditor { diff --git a/src/Admin/GridFieldMergeAction.php b/src/Admin/GridFieldMergeAction.php index 22622ee3a..42e7bb55e 100644 --- a/src/Admin/GridFieldMergeAction.php +++ b/src/Admin/GridFieldMergeAction.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridField_ActionProvider; use SilverStripe\Forms\GridField\GridField_ColumnProvider; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; class GridFieldMergeAction implements GridField_ColumnProvider, GridField_ActionProvider { diff --git a/src/Forms/GridField/GridFieldAddByDBField.php b/src/Forms/GridField/GridFieldAddByDBField.php index 956130571..fec4688fc 100644 --- a/src/Forms/GridField/GridFieldAddByDBField.php +++ b/src/Forms/GridField/GridFieldAddByDBField.php @@ -11,11 +11,11 @@ use SilverStripe\Forms\GridField\GridField_FormAction; use SilverStripe\Forms\GridField\GridField_HTMLProvider; use SilverStripe\Forms\TextField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; use UnexpectedValueException; diff --git a/src/Model/Blog.php b/src/Model/Blog.php index 003e06452..4898e2171 100644 --- a/src/Model/Blog.php +++ b/src/Model/Blog.php @@ -19,7 +19,7 @@ use SilverStripe\ORM\DB; use SilverStripe\ORM\HasManyList; use SilverStripe\ORM\ManyManyList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\ORM\UnsavedRelationList; use SilverStripe\Security\Group; use SilverStripe\Security\Member; diff --git a/src/Model/BlogController.php b/src/Model/BlogController.php index 352736ffb..8ed12261b 100644 --- a/src/Model/BlogController.php +++ b/src/Model/BlogController.php @@ -6,16 +6,16 @@ use SilverStripe\Control\Director; use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Control\RSS\RSSFeed; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataList; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\PaginatedList; +use SilverStripe\Model\List\PaginatedList; use SilverStripe\Security\Member; use SilverStripe\Blog\Model\BlogTag; use SilverStripe\Blog\Model\BlogCategory; use SilverStripe\View\Parsers\URLSegmentFilter; use SilverStripe\Control\HTTPRequest; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * @extends PageController diff --git a/src/Model/BlogObject.php b/src/Model/BlogObject.php index 1f11f8b18..b86af00e9 100644 --- a/src/Model/BlogObject.php +++ b/src/Model/BlogObject.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\TabSet; use SilverStripe\Forms\TextField; use SilverStripe\ORM\DataList; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\View\Parsers\URLSegmentFilter; diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php index c73352290..bc68c620a 100644 --- a/src/Model/BlogPost.php +++ b/src/Model/BlogPost.php @@ -9,18 +9,18 @@ use SilverStripe\Forms\ListboxField; use SilverStripe\Forms\TextField; use SilverStripe\Forms\ToggleCompositeField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBHTMLText; use SilverStripe\ORM\ManyManyList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\ORM\UnsavedRelationList; use SilverStripe\Security\Group; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; use SilverStripe\Versioned\Versioned; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; /** diff --git a/src/Model/BlogPostNotifications.php b/src/Model/BlogPostNotifications.php index a920c7aa5..bb45c8282 100644 --- a/src/Model/BlogPostNotifications.php +++ b/src/Model/BlogPostNotifications.php @@ -4,7 +4,7 @@ use SilverStripe\Comments\Model\Comment; use SilverStripe\Core\Config\Config; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Member; use SilverStripe\Core\Extension; diff --git a/tests/php/BlogCategoryTest.php b/tests/php/BlogCategoryTest.php index db60046cc..5e6319513 100755 --- a/tests/php/BlogCategoryTest.php +++ b/tests/php/BlogCategoryTest.php @@ -9,7 +9,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Dev\FunctionalTest; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Member; use SilverStripe\Security\Security; diff --git a/tests/php/BlogTagTest.php b/tests/php/BlogTagTest.php index 754b338ce..69b3fac51 100755 --- a/tests/php/BlogTagTest.php +++ b/tests/php/BlogTagTest.php @@ -8,7 +8,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Dev\FunctionalTest; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Member; use SilverStripe\Security\Security; diff --git a/tests/php/BlogTest.php b/tests/php/BlogTest.php index 1bfb303a5..53c3f7301 100755 --- a/tests/php/BlogTest.php +++ b/tests/php/BlogTest.php @@ -14,7 +14,7 @@ use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Member; class BlogTest extends SapphireTest