From dca4404f0fa353845c59d3656e78f4e637e5c786 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:37:02 +1200 Subject: [PATCH] API Use new names for renamed classes (#3003) --- code/BatchActions/CMSBatchAction_Archive.php | 2 +- code/BatchActions/CMSBatchAction_Publish.php | 2 +- code/BatchActions/CMSBatchAction_Unpublish.php | 2 +- code/Controllers/CMSMain.php | 8 ++++---- code/Controllers/CMSPageAddController.php | 2 +- code/Controllers/CMSPageEditController.php | 4 ++-- code/Controllers/CMSPageSettingsController.php | 2 +- code/Controllers/CMSPagesController.php | 4 ++-- code/Controllers/CMSSiteTreeFilter.php | 2 +- code/Controllers/CMSSiteTreeFilter_PublishedPages.php | 2 +- code/Controllers/CMSSiteTreeFilter_Search.php | 2 +- code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php | 2 +- code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php | 2 +- .../CMSSiteTreeFilter_StatusRemovedFromDraftPages.php | 2 +- code/Controllers/ContentController.php | 4 ++-- code/Model/SiteTree.php | 6 +++--- code/Model/VirtualPage.php | 2 +- code/Reports/BrokenLinksReport.php | 2 +- code/Search/SearchForm.php | 2 +- tests/php/Controllers/CMSMainTest_ClassA.php | 2 +- tests/php/Controllers/CMSMainTest_ClassB.php | 2 +- tests/php/Model/SiteTreeTest.php | 2 +- tests/php/Model/VirtualPageTest.php | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-) diff --git a/code/BatchActions/CMSBatchAction_Archive.php b/code/BatchActions/CMSBatchAction_Archive.php index ccf989a8..fe956313 100644 --- a/code/BatchActions/CMSBatchAction_Archive.php +++ b/code/BatchActions/CMSBatchAction_Archive.php @@ -2,7 +2,7 @@ namespace SilverStripe\CMS\BatchActions; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Admin\CMSBatchAction; use SilverStripe\Control\HTTPResponse; diff --git a/code/BatchActions/CMSBatchAction_Publish.php b/code/BatchActions/CMSBatchAction_Publish.php index ffbfda98..376cb71a 100644 --- a/code/BatchActions/CMSBatchAction_Publish.php +++ b/code/BatchActions/CMSBatchAction_Publish.php @@ -4,7 +4,7 @@ namespace SilverStripe\CMS\BatchActions; use SilverStripe\Admin\CMSBatchAction; use SilverStripe\Control\HTTPResponse; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * Publish items batch action. diff --git a/code/BatchActions/CMSBatchAction_Unpublish.php b/code/BatchActions/CMSBatchAction_Unpublish.php index 6ae1fcda..eddafc47 100644 --- a/code/BatchActions/CMSBatchAction_Unpublish.php +++ b/code/BatchActions/CMSBatchAction_Unpublish.php @@ -4,7 +4,7 @@ namespace SilverStripe\CMS\BatchActions; use SilverStripe\Admin\CMSBatchAction; use SilverStripe\Control\HTTPResponse; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * Unpublish items batch action. diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 375c0827..61f3635a 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -48,7 +48,7 @@ use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\Tab; use SilverStripe\Forms\TabSet; use SilverStripe\Forms\TextField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\CMSPreviewable; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; @@ -57,8 +57,8 @@ use SilverStripe\ORM\FieldType\DBHTMLText; use SilverStripe\ORM\HiddenClass; use SilverStripe\ORM\Hierarchy\Hierarchy; use SilverStripe\ORM\Hierarchy\MarkedSet; -use SilverStripe\ORM\SS_List; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Model\List\SS_List; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\InheritedPermissions; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; @@ -70,7 +70,7 @@ use SilverStripe\Versioned\ChangeSet; use SilverStripe\Versioned\ChangeSetItem; use SilverStripe\Versioned\Versioned; use SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; /** diff --git a/code/Controllers/CMSPageAddController.php b/code/Controllers/CMSPageAddController.php index 87a236e8..37f1e221 100644 --- a/code/Controllers/CMSPageAddController.php +++ b/code/Controllers/CMSPageAddController.php @@ -18,7 +18,7 @@ use SilverStripe\Forms\SelectionGroup_Item; use SilverStripe\Forms\TreeDropdownField; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; diff --git a/code/Controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php index b15ff275..271d5929 100644 --- a/code/Controllers/CMSPageEditController.php +++ b/code/Controllers/CMSPageEditController.php @@ -10,9 +10,9 @@ use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Forms\Form; -use SilverStripe\ORM\ArrayLib; +use SilverStripe\Core\ArrayLib; use SilverStripe\ORM\FieldType\DBHTMLText; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; /** * @package cms diff --git a/code/Controllers/CMSPageSettingsController.php b/code/Controllers/CMSPageSettingsController.php index 1450a333..34353c7c 100644 --- a/code/Controllers/CMSPageSettingsController.php +++ b/code/Controllers/CMSPageSettingsController.php @@ -2,7 +2,7 @@ namespace SilverStripe\CMS\Controllers; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; class CMSPageSettingsController extends CMSMain { diff --git a/code/Controllers/CMSPagesController.php b/code/Controllers/CMSPagesController.php index 9d30509d..98e6c630 100644 --- a/code/Controllers/CMSPagesController.php +++ b/code/Controllers/CMSPagesController.php @@ -4,9 +4,9 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Control\Controller; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use stdClass; class CMSPagesController extends CMSMain diff --git a/code/Controllers/CMSSiteTreeFilter.php b/code/Controllers/CMSSiteTreeFilter.php index d73fe964..d2c4d57c 100644 --- a/code/Controllers/CMSSiteTreeFilter.php +++ b/code/Controllers/CMSSiteTreeFilter.php @@ -9,7 +9,7 @@ use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Forms\DateField; use SilverStripe\ORM\DataList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; /** diff --git a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php index 0501bd7d..1e76cae0 100644 --- a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; /** diff --git a/code/Controllers/CMSSiteTreeFilter_Search.php b/code/Controllers/CMSSiteTreeFilter_Search.php index d7c9d666..64ba7958 100644 --- a/code/Controllers/CMSSiteTreeFilter_Search.php +++ b/code/Controllers/CMSSiteTreeFilter_Search.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter diff --git a/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php b/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php index 039648df..a541011f 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusDeletedPages.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; /** diff --git a/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php b/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php index e15a0bca..95cc5d89 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusDraftPages.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; /** diff --git a/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php b/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php index d098f7ef..e2e53db1 100644 --- a/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php +++ b/code/Controllers/CMSSiteTreeFilter_StatusRemovedFromDraftPages.php @@ -3,7 +3,7 @@ namespace SilverStripe\CMS\Controllers; use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; /** diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 1e7f3ef0..f5ed8ba7 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -14,11 +14,11 @@ use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Manifest\ModuleManifest; use SilverStripe\i18n\i18n; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index c914eafa..846a60b3 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -49,7 +49,7 @@ use SilverStripe\Forms\TreeDropdownField; use SilverStripe\Forms\TreeMultiselectField; use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18nEntityProvider; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\CMSPreviewable; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; @@ -58,7 +58,7 @@ use SilverStripe\ORM\HasManyList; use SilverStripe\ORM\HiddenClass; use SilverStripe\ORM\Hierarchy\Hierarchy; use SilverStripe\ORM\ManyManyList; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Group; use SilverStripe\Security\InheritedPermissions; use SilverStripe\Security\InheritedPermissionsExtension; @@ -71,7 +71,7 @@ use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Versioned\RecursivePublishable; use SilverStripe\Versioned\Versioned; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\HTML; use SilverStripe\View\Parsers\HTMLValue; use SilverStripe\View\Parsers\ShortcodeParser; diff --git a/code/Model/VirtualPage.php b/code/Model/VirtualPage.php index 8c23de89..1237d3ee 100644 --- a/code/Model/VirtualPage.php +++ b/code/Model/VirtualPage.php @@ -11,7 +11,7 @@ use SilverStripe\Forms\TextareaField; use SilverStripe\Forms\TextField; use SilverStripe\Forms\TreeDropdownField; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Versioned\Versioned; use SilverStripe\View\HTML; diff --git a/code/Reports/BrokenLinksReport.php b/code/Reports/BrokenLinksReport.php index 4490658a..c74c990b 100644 --- a/code/Reports/BrokenLinksReport.php +++ b/code/Reports/BrokenLinksReport.php @@ -10,7 +10,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\FieldList; use SilverStripe\Subsites\Model\Subsite; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\Reports\Report; use SilverStripe\Versioned\Versioned; diff --git a/code/Search/SearchForm.php b/code/Search/SearchForm.php index 1d5ca3f6..95d3c720 100644 --- a/code/Search/SearchForm.php +++ b/code/Search/SearchForm.php @@ -12,7 +12,7 @@ use SilverStripe\Forms\FormAction; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\TextField; use SilverStripe\ORM\DB; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * Standard basic search form which conducts a fulltext search on all {@link SiteTree} diff --git a/tests/php/Controllers/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php index 725f731e..d86a7234 100644 --- a/tests/php/Controllers/CMSMainTest_ClassA.php +++ b/tests/php/Controllers/CMSMainTest_ClassA.php @@ -4,7 +4,7 @@ namespace SilverStripe\CMS\Tests\Controllers; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; class CMSMainTest_ClassA extends SiteTree implements TestOnly { diff --git a/tests/php/Controllers/CMSMainTest_ClassB.php b/tests/php/Controllers/CMSMainTest_ClassB.php index 610c83f6..3f3d065c 100644 --- a/tests/php/Controllers/CMSMainTest_ClassB.php +++ b/tests/php/Controllers/CMSMainTest_ClassB.php @@ -4,7 +4,7 @@ namespace SilverStripe\CMS\Tests\Controllers; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; class CMSMainTest_ClassB extends SiteTree implements TestOnly { diff --git a/tests/php/Model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php index e890cd12..e3eec345 100644 --- a/tests/php/Model/SiteTreeTest.php +++ b/tests/php/Model/SiteTreeTest.php @@ -24,7 +24,7 @@ use SilverStripe\i18n\i18n; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Group; use SilverStripe\Security\InheritedPermissions; use SilverStripe\Security\Member; diff --git a/tests/php/Model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php index 63e87b19..af456105 100644 --- a/tests/php/Model/VirtualPageTest.php +++ b/tests/php/Model/VirtualPageTest.php @@ -10,7 +10,7 @@ use SilverStripe\Control\ContentNegotiator; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\FunctionalTest; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Member; use SilverStripe\Subsites\Extensions\SiteTreeSubsites; use SilverStripe\Versioned\Versioned;