From 61ecdb74e75948df332ba642e4601b8cd66dd3c5 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:35:07 +1200 Subject: [PATCH] API Use new names for renamed classes (#195) --- code/Report.php | 12 ++++++------ code/ReportAdmin.php | 6 +++--- code/SideReportView.php | 4 ++-- tests/ReportAdminTest/FakeReport.php | 2 +- tests/ReportAdminTest/FakeReport2.php | 2 +- tests/ReportTest/FakeReport.php | 2 +- tests/ReportTest/FakeReport2.php | 2 +- tests/ReportTest/FakeReport3.php | 2 +- tests/ReportTest/FakeTestAbstract.php | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/Report.php b/code/Report.php index bce53349..7e5b4283 100644 --- a/code/Report.php +++ b/code/Report.php @@ -21,17 +21,17 @@ use SilverStripe\Forms\GridField\GridFieldPaginator; use SilverStripe\Forms\GridField\GridFieldPrintButton; use SilverStripe\Forms\GridField\GridFieldSortableHeader; use SilverStripe\Forms\LiteralField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\CMSPreviewable; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataQuery; -use SilverStripe\ORM\Limitable; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\Limitable; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ArrayData; +use SilverStripe\Model\ModelData; /** * Base "abstract" class creating reports on your data. @@ -64,7 +64,7 @@ use SilverStripe\View\ViewableData; * @method SS_List|DataList sourceRecords($params = [], $sort = null, $limit = null) * List of records to show for this report */ -class Report extends ViewableData +class Report extends ModelData { /** * This is the title of the report, diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index 397037ed..9649af20 100644 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -12,12 +12,12 @@ use SilverStripe\Forms\GridField\GridFieldDataColumns; use SilverStripe\Forms\GridField\GridFieldFooter; use SilverStripe\Forms\GridField\GridFieldSortableHeader; use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig; -use SilverStripe\ORM\ArrayList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\ArrayList; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Member; use SilverStripe\Security\PermissionProvider; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; /** diff --git a/code/SideReportView.php b/code/SideReportView.php index 5a79526c..5ad8ff06 100644 --- a/code/SideReportView.php +++ b/code/SideReportView.php @@ -4,12 +4,12 @@ namespace SilverStripe\Reports; use SilverStripe\Core\Convert; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ModelData; /** * Renderer for showing SideReports in CMSMain */ -class SideReportView extends ViewableData +class SideReportView extends ModelData { protected $controller; protected $report; diff --git a/tests/ReportAdminTest/FakeReport.php b/tests/ReportAdminTest/FakeReport.php index 72242343..7797a1a3 100644 --- a/tests/ReportAdminTest/FakeReport.php +++ b/tests/ReportAdminTest/FakeReport.php @@ -3,7 +3,7 @@ namespace SilverStripe\Reports\Tests\ReportAdminTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Reports\Report; use SilverStripe\Security\Member; diff --git a/tests/ReportAdminTest/FakeReport2.php b/tests/ReportAdminTest/FakeReport2.php index a4ee7406..33b813a8 100644 --- a/tests/ReportAdminTest/FakeReport2.php +++ b/tests/ReportAdminTest/FakeReport2.php @@ -6,7 +6,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Dev\TestOnly; use SilverStripe\Reports\Report; use SilverStripe\Reports\ReportAdmin; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; class FakeReport2 extends Report implements TestOnly { diff --git a/tests/ReportTest/FakeReport.php b/tests/ReportTest/FakeReport.php index 76774c01..139874eb 100644 --- a/tests/ReportTest/FakeReport.php +++ b/tests/ReportTest/FakeReport.php @@ -3,7 +3,7 @@ namespace SilverStripe\Reports\Tests\ReportTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Reports\Report; class FakeReport extends Report implements TestOnly diff --git a/tests/ReportTest/FakeReport2.php b/tests/ReportTest/FakeReport2.php index 145e1579..3daeedd3 100644 --- a/tests/ReportTest/FakeReport2.php +++ b/tests/ReportTest/FakeReport2.php @@ -3,7 +3,7 @@ namespace SilverStripe\Reports\Tests\ReportTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Reports\Report; class FakeReport2 extends Report implements TestOnly diff --git a/tests/ReportTest/FakeReport3.php b/tests/ReportTest/FakeReport3.php index d84218c3..fc9365d9 100644 --- a/tests/ReportTest/FakeReport3.php +++ b/tests/ReportTest/FakeReport3.php @@ -3,7 +3,7 @@ namespace SilverStripe\Reports\Tests\ReportTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Reports\Report; class FakeReport3 extends Report implements TestOnly diff --git a/tests/ReportTest/FakeTestAbstract.php b/tests/ReportTest/FakeTestAbstract.php index 00a3f4a7..9592137a 100644 --- a/tests/ReportTest/FakeTestAbstract.php +++ b/tests/ReportTest/FakeTestAbstract.php @@ -3,7 +3,7 @@ namespace SilverStripe\Reports\Tests\ReportTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Reports\Report; abstract class FakeReportAbstract extends Report implements TestOnly