From 804ff7c247b69bf590a4f2e6c38acc5aa1e84e8f Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 10 Nov 2016 13:01:37 +0000 Subject: [PATCH] FIX Fixing test errors --- code/Report.php | 5 +++-- tests/ReportTest.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/Report.php b/code/Report.php index 298ffef8..8538f286 100644 --- a/code/Report.php +++ b/code/Report.php @@ -328,7 +328,7 @@ class Report extends ViewableData * Generally, you should override {@link columns()} and {@link records()} to make your report, * but if they aren't sufficiently flexible, then you can override this method. * - * @return FormField subclass + * @return \SilverStripe\Forms\FormField subclass */ public function getReportField() { @@ -373,8 +373,9 @@ class Report extends ViewableData if ($item instanceof CMSPreviewable) { /** @var CMSPreviewable $item */ return sprintf( - '%s', + '%s', Convert::raw2att($item->CMSEditLink()), + Convert::raw2att($value), Convert::raw2xml($value) ); } diff --git a/tests/ReportTest.php b/tests/ReportTest.php index 59126ae9..831ebca6 100644 --- a/tests/ReportTest.php +++ b/tests/ReportTest.php @@ -8,6 +8,7 @@ use SilverStripe\Control\Session; use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\TestOnly; use SilverStripe\Admin\CMSPreviewable ; +use SilverStripe\Forms\GridField\GridFieldDataColumns; /** @@ -98,14 +99,14 @@ class ReportTest extends SapphireTest /** @var GridField $gridField */ $gridField = $report->getReportField(); /** @var GridFieldDataColumns $columns */ - $columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns'); + $columns = $gridField->getConfig()->getComponentByType(GridFieldDataColumns::class); $page = new ReportTest_FakeObject(); $page->Title = 'My Object'; $page->ID = 959547; $titleContent = $columns->getColumnContent($gridField, $page, 'Title'); - $this->assertEquals('My Object', $titleContent); + $this->assertEquals('My Object', $titleContent); } }