tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Checking for class_exists() before SapphireTest::is_running_tests() to avoid including the whole testing framework, and triggering PHPUnit to run a performance-intensive directory traversal for coverage file blacklists

Browse Source
This commit is contained in:
Ingo Schommer 2010-11-30 04:33:58 +00:00
parent 9b17399cd4
commit 591ad48eb9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/submissions/SubmittedFormReportField.php
View File

@ -135,7 +135,7 @@ class SubmittedFormReportField extends FormField {
user_error("No submissions to export.", E_USER_ERROR); user_error("No submissions to export.", E_USER_ERROR);
} }
if(SapphireTest::is_running_test()) { if(class_exists('SapphireTest', false) && SapphireTest::is_running_test()) {
return $csvData; return $csvData;
} }
else { else {
@ -153,6 +153,8 @@ class SubmittedFormReportField extends FormField {
* @return Redirect|Boolean * @return Redirect|Boolean
*/ */
public function deletesubmissions($id = false) { public function deletesubmissions($id = false) {
$isRunningTests = (class_exists('SapphireTest', false) && SapphireTest::is_running_test());
if($id && is_int($id)) { if($id && is_int($id)) {
$SQL_ID = $id; $SQL_ID = $id;
} }
@ -170,10 +172,10 @@ class SubmittedFormReportField extends FormField {
foreach($submissions as $submission) { foreach($submissions as $submission) {
$submission->delete(); $submission->delete();
} }
return (Director::is_ajax() || SapphireTest::is_running_test()) ? true : Director::redirectBack(); return (Director::is_ajax() || $isRunningTests) ? true : Director::redirectBack();
} }
} }
return (Director::is_ajax() || SapphireTest::is_running_test()) ? false : Director::redirectBack(); return (Director::is_ajax() || $isRunningTests) ? false : Director::redirectBack();
} }
/** /**
@ -182,6 +184,8 @@ class SubmittedFormReportField extends FormField {
* @return Redirect|Boolean * @return Redirect|Boolean
*/ */
public function deletesubmission($id = false) { public function deletesubmission($id = false) {
$isRunningTests = (class_exists('SapphireTest', false) && SapphireTest::is_running_test());
if($id && is_int($id)) { if($id && is_int($id)) {
$SQL_ID = $id; $SQL_ID = $id;
} }
@ -196,9 +200,9 @@ class SubmittedFormReportField extends FormField {
if($submission) { if($submission) {
$submission->delete(); $submission->delete();
return (Director::is_ajax() || SapphireTest::is_running_test()) ? true : Director::redirectBack(); return (Director::is_ajax() || $isRunningTests) ? true : Director::redirectBack();
} }
} }
return (Director::is_ajax() || SapphireTest::is_running_test()) ? false : Director::redirectBack(); return (Director::is_ajax() || $isRunningTests) ? false : Director::redirectBack();
} }
} }