From 3e9e2c646a96a6841e8d7730271322f2297372b7 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:40:14 +1200 Subject: [PATCH] API Use new names for renamed classes (#108) --- src/RegistryImportFeed.php | 2 +- src/RegistryImportFeedEntry.php | 4 ++-- src/RegistryPage.php | 4 ++-- src/RegistryPageController.php | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/RegistryImportFeed.php b/src/RegistryImportFeed.php index 0fb0709..e282bf9 100644 --- a/src/RegistryImportFeed.php +++ b/src/RegistryImportFeed.php @@ -6,7 +6,7 @@ use SilverStripe\Control\RSS\RSSFeed; use SilverStripe\Core\Config\Configurable; use SilverStripe\Core\Injector\Injectable; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\FieldType\DBDatetime; class RegistryImportFeed diff --git a/src/RegistryImportFeedEntry.php b/src/RegistryImportFeedEntry.php index 75cf19b..15c3cc4 100644 --- a/src/RegistryImportFeedEntry.php +++ b/src/RegistryImportFeedEntry.php @@ -2,9 +2,9 @@ namespace SilverStripe\Registry; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ModelData; -class RegistryImportFeedEntry extends ViewableData +class RegistryImportFeedEntry extends ModelData { protected $title; protected $description; diff --git a/src/RegistryPage.php b/src/RegistryPage.php index c99e266..b0f8599 100644 --- a/src/RegistryPage.php +++ b/src/RegistryPage.php @@ -8,12 +8,12 @@ use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\NumericField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\View\SSViewer; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; class RegistryPage extends Page { diff --git a/src/RegistryPageController.php b/src/RegistryPageController.php index 8f89cfc..d086eb3 100644 --- a/src/RegistryPageController.php +++ b/src/RegistryPageController.php @@ -10,13 +10,13 @@ use SilverStripe\Forms\Form; use SilverStripe\Forms\FormAction; use SilverStripe\Forms\HiddenField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\PaginatedList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\PaginatedList; +use SilverStripe\Model\List\SS_List; use SilverStripe\Registry\Exception\RegistryException; -use SilverStripe\View\ArrayData; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ArrayData; +use SilverStripe\Model\ModelData; /** * @extends PageController @@ -235,7 +235,7 @@ public function Columns($id = null) // Increment properties for value $context = $result; foreach ($properties as $property) { - if ($context instanceof ViewableData) { + if ($context instanceof ModelData) { $context = $context->obj($property); } }