From efd5ce9d40e9010805ceb9e392472bebad8824ac Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 12 Sep 2024 12:21:03 +1200 Subject: [PATCH] API Use new names for renamed classes --- code/GridFieldArbitraryData/ArbitraryDataAdmin.php | 4 ++-- code/GridFieldArbitraryData/ArbitraryDataModel.php | 2 +- code/elemental/ElementContentExtension.php | 2 +- code/fields/NestedGridField/NonRelationalData.php | 2 +- code/tasks/FTPageMakerTask.php | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/GridFieldArbitraryData/ArbitraryDataAdmin.php b/code/GridFieldArbitraryData/ArbitraryDataAdmin.php index d16fc9d..96fb09c 100644 --- a/code/GridFieldArbitraryData/ArbitraryDataAdmin.php +++ b/code/GridFieldArbitraryData/ArbitraryDataAdmin.php @@ -20,10 +20,10 @@ use SilverStripe\Forms\GridField\GridFieldViewButton; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\TextField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\Queries\SQLSelect; use SilverStripe\ORM\Search\BasicSearchContext; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; class ArbitraryDataAdmin extends LeftAndMain { diff --git a/code/GridFieldArbitraryData/ArbitraryDataModel.php b/code/GridFieldArbitraryData/ArbitraryDataModel.php index 56bfbec..2bd3d3b 100644 --- a/code/GridFieldArbitraryData/ArbitraryDataModel.php +++ b/code/GridFieldArbitraryData/ArbitraryDataModel.php @@ -12,7 +12,7 @@ use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\Queries\SQLDelete; use SilverStripe\ORM\Search\BasicSearchContext; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; /** * A class of arbitrary data for testing GridField components. diff --git a/code/elemental/ElementContentExtension.php b/code/elemental/ElementContentExtension.php index fda1075..a517a50 100644 --- a/code/elemental/ElementContentExtension.php +++ b/code/elemental/ElementContentExtension.php @@ -6,7 +6,7 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Core\Extension; use SilverStripe\Forms\FieldList; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Forms\CompositeValidator; use SilverStripe\Forms\NumericField; use SilverStripe\Forms\RequiredFields; diff --git a/code/fields/NestedGridField/NonRelationalData.php b/code/fields/NestedGridField/NonRelationalData.php index 3c77a5a..9f268dc 100644 --- a/code/fields/NestedGridField/NonRelationalData.php +++ b/code/fields/NestedGridField/NonRelationalData.php @@ -3,7 +3,7 @@ namespace SilverStripe\FrameworkTest\Fields\NestedGridField; use SilverStripe\FrameworkTest\Model\Company; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; class NonRelationalData extends DataObject diff --git a/code/tasks/FTPageMakerTask.php b/code/tasks/FTPageMakerTask.php index 4d8b276..3c7005b 100644 --- a/code/tasks/FTPageMakerTask.php +++ b/code/tasks/FTPageMakerTask.php @@ -128,7 +128,7 @@ protected function generateBlocksForPage(Page $page) /** * @param SiteTree&ElementalPageExtension|null $page * @return ElementContent - * @throws \SilverStripe\ORM\ValidationException + * @throws \SilverStripe\Core\Validation\ValidationException */ public static function generateContentBlock(?SiteTree $page = null) { @@ -147,7 +147,7 @@ public static function generateContentBlock(?SiteTree $page = null) /** * @param SiteTree&ElementalPageExtension|null $page * @return FileBlock - * @throws \SilverStripe\ORM\ValidationException + * @throws \SilverStripe\Core\Validation\ValidationException */ public static function generateFileBlock(?SiteTree $page = null): FileBlock { @@ -172,7 +172,7 @@ public static function generateFileBlock(?SiteTree $page = null): FileBlock /** * @param SiteTree&ElementalPageExtension|null $page * @return BannerBlock - * @throws \SilverStripe\ORM\ValidationException + * @throws \SilverStripe\Core\Validation\ValidationException */ public static function generateBannerBlock(?SiteTree $page = null): BannerBlock {