tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #130 from robbieaverill/pulls/4.7/exceptions 

ENH Replace E_USER_ERROR errors with exceptions
This commit is contained in:
Guy Marriott 2020-10-04 16:58:15 -07:00 committed by GitHub
parent 275a1bc7f4 9b9e673e4b
commit 8f40ddb5eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/Report.php
View File

@ -147,11 +147,13 @@ class Report extends ViewableData
*/
public function sourceQuery($params)
{
if ($this->hasMethod('sourceRecords')) {
return $this->sourceRecords($params, null, null)->dataQuery();
} else {
user_error("Please override sourceQuery()/sourceRecords() and columns() or, if necessary, override getReportField()", E_USER_ERROR);
if (!$this->hasMethod('sourceRecords')) {
throw new \RuntimeException(
'Please override sourceQuery()/sourceRecords() and columns() or, if necessary, override getReportField()'
);
}
return $this->sourceRecords($params, null, null)->dataQuery();
}
/**

4
code/ReportWrapper.php
View File

@ -75,7 +75,9 @@ abstract class ReportWrapper extends Report
$this->afterQuery();
return $query;
} else {
user_error("Please override sourceQuery()/sourceRecords() and columns() in your base report", E_USER_ERROR);
throw new \RuntimeException(
"Please override sourceQuery()/sourceRecords() and columns() in your base report"
);
}
}