Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API Use new names for renamed classes #195

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/Report.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
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.
Expand Down Expand Up @@ -64,7 +64,7 @@
* @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,
Expand Down
6 changes: 3 additions & 3 deletions code/ReportAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
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;

/**
Expand Down
4 changes: 2 additions & 2 deletions code/SideReportView.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion tests/ReportAdminTest/FakeReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/ReportAdminTest/FakeReport2.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/ReportTest/FakeReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ReportTest/FakeReport2.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ReportTest/FakeReport3.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ReportTest/FakeTestAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading