From 591ad48eb90e72c7a14d9a59fd64c4918c13a0b9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 30 Nov 2010 04:33:58 +0000 Subject: [PATCH] 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 --- code/submissions/SubmittedFormReportField.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/submissions/SubmittedFormReportField.php b/code/submissions/SubmittedFormReportField.php index 82b421a..9c86a42 100755 --- a/code/submissions/SubmittedFormReportField.php +++ b/code/submissions/SubmittedFormReportField.php @@ -135,7 +135,7 @@ class SubmittedFormReportField extends FormField { 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; } else { @@ -153,6 +153,8 @@ class SubmittedFormReportField extends FormField { * @return Redirect|Boolean */ public function deletesubmissions($id = false) { + $isRunningTests = (class_exists('SapphireTest', false) && SapphireTest::is_running_test()); + if($id && is_int($id)) { $SQL_ID = $id; } @@ -170,10 +172,10 @@ class SubmittedFormReportField extends FormField { foreach($submissions as $submission) { $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 */ public function deletesubmission($id = false) { + $isRunningTests = (class_exists('SapphireTest', false) && SapphireTest::is_running_test()); + if($id && is_int($id)) { $SQL_ID = $id; } @@ -196,9 +200,9 @@ class SubmittedFormReportField extends FormField { if($submission) { $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(); } }