Remove the ResponseBuilder flag and instead use the existing PIWIK_PR…

…INT_ERROR_BACKTRACE
d19dotca · Apr 3, 2014 · e485781 · e485781
1 parent f2e5c90
commit e485781
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 23 deletions.
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
@@ -22,8 +22,6 @@
  */
 class ResponseBuilder
 {
-    const DISPLAY_BACKTRACE_DEBUG = false;
-
     private $request = null;
     private $outputFormat = null;
 
@@ -162,12 +160,10 @@ protected function decorateExceptionWithDebugTrace(Exception $e)
     {
         // If we are in tests, show full backtrace
         if (defined('PIWIK_PATH_TEST_TO_ROOT')) {
-            if (self::DISPLAY_BACKTRACE_DEBUG
-                || \Piwik_ShouldPrintBackTraceWithMessage()
-            ) {
+            if (\Piwik_ShouldPrintBackTraceWithMessage()) {
                 $message = $e->getMessage() . " in \n " . $e->getFile() . ":" . $e->getLine() . " \n " . $e->getTraceAsString();
             } else {
-                $message = $e->getMessage() . "\n \n --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in " . basename(__FILE__);
+                $message = $e->getMessage() . "\n \n --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php";
             }
             return new Exception($message);
         }

diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
@@ -71,8 +71,7 @@
     function Piwik_ShouldPrintBackTraceWithMessage()
     {
         $bool = (defined('PIWIK_PRINT_ERROR_BACKTRACE') && PIWIK_PRINT_ERROR_BACKTRACE)
-            || (defined('PIWIK_TRACKER_DEBUG') && PIWIK_TRACKER_DEBUG)
-            || \Piwik\API\ResponseBuilder::DISPLAY_BACKTRACE_DEBUG;
+            || (defined('PIWIK_TRACKER_DEBUG') && PIWIK_TRACKER_DEBUG);
         return $bool;
     }
 

diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php
@@ -88,8 +88,7 @@ public function testCheckThatConfigurationValuesAreProductionValues()
         require_once PIWIK_INCLUDE_PATH . "/core/TaskScheduler.php";
         $this->assertFalse(DEBUG_FORCE_SCHEDULED_TASKS);
 
-        require_once PIWIK_INCLUDE_PATH . "/core/API/ResponseBuilder.php";
-        $this->assertFalse(\Piwik\API\ResponseBuilder::DISPLAY_BACKTRACE_DEBUG);
+        $this->assertFalse(PIWIK_PRINT_ERROR_BACKTRACE);
     }
 
     private function _checkEqual($key, $valueExpected)

diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -29,7 +29,7 @@ class Core_LogTest extends DatabaseTestCase
     public static $expectedExceptionOutput = array(
         'screen' => 'dummy error message<br />
  <br />
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php',
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php',
         'file' => '[Core_LogTest] LogTest.php(161): dummy error message
 dummy backtrace',
         'database' => '[Core_LogTest] LogTest.php(161): dummy error message

diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="Please specify a value for 'label'.
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...egration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml b/...egration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="NoDataForAction
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...ration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml b/...ration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="NoDataForAction
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...ntegration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml b/...ntegration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="NoDataForAction
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...egration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml b/...egration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="NoDataForAction
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="Row evolutions can not be processed with this combination of \'date\' and \'period\' parameters.
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...commerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml b/...commerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml
@@ -3,5 +3,5 @@
 	<error message="Requested report Goals.get for Website id=1 not found in the list of available reports. 
 
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="Referrers.getAll with multiple sites or dates is not supported (yet).
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="Referrers.getAll with multiple sites or dates is not supported (yet).
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/.../PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml b/.../PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="VisitTime.getByDayOfWeek does not support multiple dates.
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>
diff --git a/...PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml b/...PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
@@ -2,5 +2,5 @@
 <result>
 	<error message="VisitTime.getByDayOfWeek does not support multiple dates.
  
- --&gt; To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
 </result>