!defined and \Exception

adriangibbons · adriangibbons · commit 53cdc1341f85 · 2015-08-22T17:51:40.000+08:00
diff --git a/src/phpFITFileAnalysis.php b/src/phpFITFileAnalysis.php
@@ -14,9 +14,9 @@
  * https://github.com/adriangibbons/phpFITFileAnalysis
  * http://www.thisisant.com/resources/fit
  */
- 
-define('DEFINITION_MESSAGE', 1);
-define('DATA_MESSAGE', 0);
+
+if (!defined('DEFINITION_MESSAGE')) define('DEFINITION_MESSAGE', 1);
+if (!defined('DATA_MESSAGE')) define('DATA_MESSAGE', 0);
 
 class phpFITFileAnalysis
 {
@@ -608,10 +608,10 @@ class phpFITFileAnalysis
     public function __construct($file_path, $options = null)
     {
         if (empty($file_path)) {
-            throw new Exception('phpFITFileAnalysis->__construct(): file_path is empty!');
+            throw new \Exception('phpFITFileAnalysis->__construct(): file_path is empty!');
         }
         if (!file_exists($file_path)) {
-            throw new Exception('phpFITFileAnalysis->__construct(): file \''.$file_path.'\' does not exist!');
+            throw new \Exception('phpFITFileAnalysis->__construct(): file \''.$file_path.'\' does not exist!');
         }
         $this->php_trader_ext_loaded = extension_loaded('trader');
         
@@ -642,7 +642,7 @@ private function readHeader()
         $this->file_pointer++;
         
         if ($header_size != 12 && $header_size != 14) {
-            throw new Exception('phpFITFileAnalysis->readHeader(): not a valid header size!');
+            throw new \Exception('phpFITFileAnalysis->readHeader(): not a valid header size!');
         }
         
         $header_fields = 'C1protocol_version/' .
@@ -660,11 +660,11 @@ private function readHeader()
         $file_extension = sprintf('%c%c%c%c', $this->file_header['data_type1'], $this->file_header['data_type2'], $this->file_header['data_type3'], $this->file_header['data_type4']);
         
         if ($file_extension != '.FIT' || $this->file_header['data_size'] <= 0) {
-            throw new Exception('phpFITFileAnalysis->readHeader(): not a valid FIT file!');
+            throw new \Exception('phpFITFileAnalysis->readHeader(): not a valid FIT file!');
         }
         
         if (strlen($this->file_contents) - $header_size - 2 !== $this->file_header['data_size']) {
-            throw new Exception('phpFITFileAnalysis->readHeader(): file_header[\'data_size\'] does not seem correct!');
+            throw new \Exception('phpFITFileAnalysis->readHeader(): file_header[\'data_size\'] does not seem correct!');
         }
     }
     
@@ -686,7 +686,7 @@ private function readDataRecords()
              * Table 4-1. Normal Header Bit Field Description
              */
             if (($record_header_byte >> 7) & 1) {  // Check that it's a normal header
-                throw new Exception('phpFITFileAnalysis->readDataRecords(): this class can only handle normal headers!');
+                throw new \Exception('phpFITFileAnalysis->readDataRecords(): this class can only handle normal headers!');
             }
             $message_type = ($record_header_byte >> 6) & 1;  // 1: DEFINITION_MESSAGE; 0: DATA_MESSAGE
             $local_mesg_type = $record_header_byte & 15;  // bindec('1111') == 15
@@ -861,7 +861,7 @@ private function fixData($options)
 
         });  // Make all lower-case.
         if (count(array_intersect(['all', 'cadence', 'distance', 'heart_rate', 'lat_lon', 'speed', 'power'], $options['fixData'])) === 0) {
-            throw new Exception('phpFITFileAnalysis->fixData(): option not valid!');
+            throw new \Exception('phpFITFileAnalysis->fixData(): option not valid!');
         }
         
         $bCadence = $bDistance = $bHeartRate = $bLatitudeLongitude = $bSpeed = $bPower = false;
@@ -1097,10 +1097,10 @@ private function setUnits($options)
                 if ($pace === 'true' || $pace === 'false') {
                     $bPace = $pace;
                 } else {
-                    throw new Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');
+                    throw new \Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');
                 }
             } else {
-                throw new Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');
+                throw new \Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');
             }
         }
         
@@ -1219,7 +1219,7 @@ private function setUnits($options)
                 }
                 break;
             default:
-                throw new Exception('phpFITFileAnalysis->setUnits(): units option not valid!');
+                throw new \Exception('phpFITFileAnalysis->setUnits(): units option not valid!');
                 break;
         }
     }
@@ -1235,7 +1235,7 @@ public function hrZonesMax($hr_maximum, $percentages_array = [0.60, 0.75, 0.85,
         }, $hr_maximum)) {
             return $percentages_array;
         } else {
-            throw new Exception('phpFITFileAnalysis->hrZonesMax(): cannot calculate zones, please check inputs!');
+            throw new \Exception('phpFITFileAnalysis->hrZonesMax(): cannot calculate zones, please check inputs!');
         }
     }
     
@@ -1250,7 +1250,7 @@ public function hrZonesReserve($hr_resting, $hr_maximum, $percentages_array = [0
         }, [$hr_resting, $hr_maximum - $hr_resting])) {
             return $percentages_array;
         } else {
-            throw new Exception('phpFITFileAnalysis->hrZonesReserve(): cannot calculate zones, please check inputs!');
+            throw new \Exception('phpFITFileAnalysis->hrZonesReserve(): cannot calculate zones, please check inputs!');
         }
     }
     
@@ -1265,7 +1265,7 @@ public function powerZones($functional_threshold_power, $percentages_array = [0.
         }, $functional_threshold_power)) {
             return $percentages_array;
         } else {
-            throw new Exception('phpFITFileAnalysis->powerZones(): cannot calculate zones, please check inputs!');
+            throw new \Exception('phpFITFileAnalysis->powerZones(): cannot calculate zones, please check inputs!');
         }
     }
     
@@ -1275,18 +1275,18 @@ public function powerZones($functional_threshold_power, $percentages_array = [0.
     public function partitionData($record_field = '', $thresholds = null, $percentages = true, $labels_for_keys = true)
     {
         if (!isset($this->data_mesgs['record'][$record_field])) {
-            throw new Exception('phpFITFileAnalysis->partitionData(): '.$record_field.' data not present in FIT file!');
+            throw new \Exception('phpFITFileAnalysis->partitionData(): '.$record_field.' data not present in FIT file!');
         }
         if (!is_array($thresholds)) {
-            throw new Exception('phpFITFileAnalysis->partitionData(): thresholds must be an array e.g. [10,20,30,40,50]!');
+            throw new \Exception('phpFITFileAnalysis->partitionData(): thresholds must be an array e.g. [10,20,30,40,50]!');
         }
         
         foreach ($thresholds as $threshold) {
             if (!is_numeric($threshold) || $threshold < 0) {
-                throw new Exception('phpFITFileAnalysis->partitionData(): '.$threshold.' not valid in thresholds!');
+                throw new \Exception('phpFITFileAnalysis->partitionData(): '.$threshold.' not valid in thresholds!');
             }
             if (isset($last_threshold) && $last_threshold >= $threshold) {
-                throw new Exception('phpFITFileAnalysis->partitionData(): error near ..., '.$last_threshold.', '.$threshold.', ... - each element in thresholds array must be greater than previous element!');
+                throw new \Exception('phpFITFileAnalysis->partitionData(): error near ..., '.$last_threshold.', '.$threshold.', ... - each element in thresholds array must be greater than previous element!');
             }
             $last_threshold = $threshold;
         }
@@ -1332,10 +1332,10 @@ public function partitionData($record_field = '', $thresholds = null, $percentag
     public function histogram($bucket_width = 25, $record_field = '')
     {
         if (!isset($this->data_mesgs['record'][$record_field])) {
-            throw new Exception('phpFITFileAnalysis->histogram(): '.$record_field.' data not present in FIT file!');
+            throw new \Exception('phpFITFileAnalysis->histogram(): '.$record_field.' data not present in FIT file!');
         }
         if (!is_numeric($bucket_width) || $bucket_width <= 0) {
-            throw new Exception('phpFITFileAnalysis->histogram(): bucket width is not valid!');
+            throw new \Exception('phpFITFileAnalysis->histogram(): bucket width is not valid!');
         }
         
         foreach ($this->data_mesgs['record'][$record_field] as $value) {
@@ -1425,7 +1425,7 @@ public function hrMetrics($hr_resting, $hr_maximum, $hr_FT, $gender)
     public function powerMetrics($functional_threshold_power)
     {
         if (!isset($this->data_mesgs['record']['power'])) {
-            throw new Exception('phpFITFileAnalysis->powerMetrics(): power data not present in FIT file!');
+            throw new \Exception('phpFITFileAnalysis->powerMetrics(): power data not present in FIT file!');
         }
         
         $power_metrics['Average Power'] = array_sum($this->data_mesgs['record']['power']) / count($this->data_mesgs['record']['power']);
@@ -1462,17 +1462,17 @@ public function powerMetrics($functional_threshold_power)
     public function criticalPower($time_periods)
     {
         if (!isset($this->data_mesgs['record']['power'])) {
-            throw new Exception('phpFITFileAnalysis->criticalPower(): power data not present in FIT file!');
+            throw new \Exception('phpFITFileAnalysis->criticalPower(): power data not present in FIT file!');
         }
         
         if (is_array($time_periods)) {
             $count = count($this->data_mesgs['record']['power']);
             foreach ($time_periods as $time_period) {
                 if (!is_numeric($time_period)) {
-                    throw new Exception('phpFITFileAnalysis->criticalPower(): time periods must only contain numeric data!');
+                    throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods must only contain numeric data!');
                 }
                 if ($time_period < 0) {
-                    throw new Exception('phpFITFileAnalysis->criticalPower(): time periods cannot be negative!');
+                    throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods cannot be negative!');
                 }
                 if ($time_period > $count) {
                     break;
@@ -1497,7 +1497,7 @@ public function criticalPower($time_periods)
             
             return $criticalPower_values;
         } else {
-            throw new Exception('phpFITFileAnalysis->criticalPower(): time periods not valid!');
+            throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods not valid!');
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`* https://github.com/adriangibbons/phpFITFileAnalysis`
`15`	`15`	`* http://www.thisisant.com/resources/fit`
`16`	`16`	`*/`
`17`		`-`
`18`		`-define('DEFINITION_MESSAGE', 1);`
`19`		`-define('DATA_MESSAGE', 0);`
	`17`	`+`
	`18`	`+if (!defined('DEFINITION_MESSAGE')) define('DEFINITION_MESSAGE', 1);`
	`19`	`+if (!defined('DATA_MESSAGE')) define('DATA_MESSAGE', 0);`
`20`	`20`
`21`	`21`	`class phpFITFileAnalysis`
`22`	`22`	`{`
`@@ -608,10 +608,10 @@ class phpFITFileAnalysis`
`608`	`608`	`public function __construct($file_path, $options = null)`
`609`	`609`	`{`
`610`	`610`	`if (empty($file_path)) {`
`611`		`- throw new Exception('phpFITFileAnalysis->__construct(): file_path is empty!');`
	`611`	`+ throw new \Exception('phpFITFileAnalysis->__construct(): file_path is empty!');`
`612`	`612`	`}`
`613`	`613`	`if (!file_exists($file_path)) {`
`614`		`- throw new Exception('phpFITFileAnalysis->__construct(): file \''.$file_path.'\' does not exist!');`
	`614`	`+ throw new \Exception('phpFITFileAnalysis->__construct(): file \''.$file_path.'\' does not exist!');`
`615`	`615`	`}`
`616`	`616`	`$this->php_trader_ext_loaded = extension_loaded('trader');`
`617`	`617`
`@@ -642,7 +642,7 @@ private function readHeader()`
`642`	`642`	`$this->file_pointer++;`
`643`	`643`
`644`	`644`	`if ($header_size != 12 && $header_size != 14) {`
`645`		`- throw new Exception('phpFITFileAnalysis->readHeader(): not a valid header size!');`
	`645`	`+ throw new \Exception('phpFITFileAnalysis->readHeader(): not a valid header size!');`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`$header_fields = 'C1protocol_version/' .`
`@@ -660,11 +660,11 @@ private function readHeader()`
`660`	`660`	`$file_extension = sprintf('%c%c%c%c', $this->file_header['data_type1'], $this->file_header['data_type2'], $this->file_header['data_type3'], $this->file_header['data_type4']);`
`661`	`661`
`662`	`662`	`if ($file_extension != '.FIT' \|\| $this->file_header['data_size'] <= 0) {`
`663`		`- throw new Exception('phpFITFileAnalysis->readHeader(): not a valid FIT file!');`
	`663`	`+ throw new \Exception('phpFITFileAnalysis->readHeader(): not a valid FIT file!');`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`if (strlen($this->file_contents) - $header_size - 2 !== $this->file_header['data_size']) {`
`667`		`- throw new Exception('phpFITFileAnalysis->readHeader(): file_header[\'data_size\'] does not seem correct!');`
	`667`	`+ throw new \Exception('phpFITFileAnalysis->readHeader(): file_header[\'data_size\'] does not seem correct!');`
`668`	`668`	`}`
`669`	`669`	`}`
`670`	`670`
`@@ -686,7 +686,7 @@ private function readDataRecords()`
`686`	`686`	`* Table 4-1. Normal Header Bit Field Description`
`687`	`687`	`*/`
`688`	`688`	`if (($record_header_byte >> 7) & 1) { // Check that it's a normal header`
`689`		`- throw new Exception('phpFITFileAnalysis->readDataRecords(): this class can only handle normal headers!');`
	`689`	`+ throw new \Exception('phpFITFileAnalysis->readDataRecords(): this class can only handle normal headers!');`
`690`	`690`	`}`
`691`	`691`	`$message_type = ($record_header_byte >> 6) & 1; // 1: DEFINITION_MESSAGE; 0: DATA_MESSAGE`
`692`	`692`	`$local_mesg_type = $record_header_byte & 15; // bindec('1111') == 15`
`@@ -861,7 +861,7 @@ private function fixData($options)`
`861`	`861`
`862`	`862`	`}); // Make all lower-case.`
`863`	`863`	`if (count(array_intersect(['all', 'cadence', 'distance', 'heart_rate', 'lat_lon', 'speed', 'power'], $options['fixData'])) === 0) {`
`864`		`- throw new Exception('phpFITFileAnalysis->fixData(): option not valid!');`
	`864`	`+ throw new \Exception('phpFITFileAnalysis->fixData(): option not valid!');`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`$bCadence = $bDistance = $bHeartRate = $bLatitudeLongitude = $bSpeed = $bPower = false;`
`@@ -1097,10 +1097,10 @@ private function setUnits($options)`
`1097`	`1097`	`if ($pace === 'true' \|\| $pace === 'false') {`
`1098`	`1098`	`$bPace = $pace;`
`1099`	`1099`	`} else {`
`1100`		`- throw new Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');`
	`1100`	`+ throw new \Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');`
`1101`	`1101`	`}`
`1102`	`1102`	`} else {`
`1103`		`- throw new Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');`
	`1103`	`+ throw new \Exception('phpFITFileAnalysis->setUnits(): pace option not valid!');`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`
`@@ -1219,7 +1219,7 @@ private function setUnits($options)`
`1219`	`1219`	`}`
`1220`	`1220`	`break;`
`1221`	`1221`	`default:`
`1222`		`- throw new Exception('phpFITFileAnalysis->setUnits(): units option not valid!');`
	`1222`	`+ throw new \Exception('phpFITFileAnalysis->setUnits(): units option not valid!');`
`1223`	`1223`	`break;`
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`@@ -1235,7 +1235,7 @@ public function hrZonesMax($hr_maximum, $percentages_array = [0.60, 0.75, 0.85,`
`1235`	`1235`	`}, $hr_maximum)) {`
`1236`	`1236`	`return $percentages_array;`
`1237`	`1237`	`} else {`
`1238`		`- throw new Exception('phpFITFileAnalysis->hrZonesMax(): cannot calculate zones, please check inputs!');`
	`1238`	`+ throw new \Exception('phpFITFileAnalysis->hrZonesMax(): cannot calculate zones, please check inputs!');`
`1239`	`1239`	`}`
`1240`	`1240`	`}`
`1241`	`1241`
`@@ -1250,7 +1250,7 @@ public function hrZonesReserve($hr_resting, $hr_maximum, $percentages_array = [0`
`1250`	`1250`	`}, [$hr_resting, $hr_maximum - $hr_resting])) {`
`1251`	`1251`	`return $percentages_array;`
`1252`	`1252`	`} else {`
`1253`		`- throw new Exception('phpFITFileAnalysis->hrZonesReserve(): cannot calculate zones, please check inputs!');`
	`1253`	`+ throw new \Exception('phpFITFileAnalysis->hrZonesReserve(): cannot calculate zones, please check inputs!');`
`1254`	`1254`	`}`
`1255`	`1255`	`}`
`1256`	`1256`
`@@ -1265,7 +1265,7 @@ public function powerZones($functional_threshold_power, $percentages_array = [0.`
`1265`	`1265`	`}, $functional_threshold_power)) {`
`1266`	`1266`	`return $percentages_array;`
`1267`	`1267`	`} else {`
`1268`		`- throw new Exception('phpFITFileAnalysis->powerZones(): cannot calculate zones, please check inputs!');`
	`1268`	`+ throw new \Exception('phpFITFileAnalysis->powerZones(): cannot calculate zones, please check inputs!');`
`1269`	`1269`	`}`
`1270`	`1270`	`}`
`1271`	`1271`
`@@ -1275,18 +1275,18 @@ public function powerZones($functional_threshold_power, $percentages_array = [0.`
`1275`	`1275`	`public function partitionData($record_field = '', $thresholds = null, $percentages = true, $labels_for_keys = true)`
`1276`	`1276`	`{`
`1277`	`1277`	`if (!isset($this->data_mesgs['record'][$record_field])) {`
`1278`		`- throw new Exception('phpFITFileAnalysis->partitionData(): '.$record_field.' data not present in FIT file!');`
	`1278`	`+ throw new \Exception('phpFITFileAnalysis->partitionData(): '.$record_field.' data not present in FIT file!');`
`1279`	`1279`	`}`
`1280`	`1280`	`if (!is_array($thresholds)) {`
`1281`		`- throw new Exception('phpFITFileAnalysis->partitionData(): thresholds must be an array e.g. [10,20,30,40,50]!');`
	`1281`	`+ throw new \Exception('phpFITFileAnalysis->partitionData(): thresholds must be an array e.g. [10,20,30,40,50]!');`
`1282`	`1282`	`}`
`1283`	`1283`
`1284`	`1284`	`foreach ($thresholds as $threshold) {`
`1285`	`1285`	`if (!is_numeric($threshold) \|\| $threshold < 0) {`
`1286`		`- throw new Exception('phpFITFileAnalysis->partitionData(): '.$threshold.' not valid in thresholds!');`
	`1286`	`+ throw new \Exception('phpFITFileAnalysis->partitionData(): '.$threshold.' not valid in thresholds!');`
`1287`	`1287`	`}`
`1288`	`1288`	`if (isset($last_threshold) && $last_threshold >= $threshold) {`
`1289`		`- throw new Exception('phpFITFileAnalysis->partitionData(): error near ..., '.$last_threshold.', '.$threshold.', ... - each element in thresholds array must be greater than previous element!');`
	`1289`	`+ throw new \Exception('phpFITFileAnalysis->partitionData(): error near ..., '.$last_threshold.', '.$threshold.', ... - each element in thresholds array must be greater than previous element!');`
`1290`	`1290`	`}`
`1291`	`1291`	`$last_threshold = $threshold;`
`1292`	`1292`	`}`
`@@ -1332,10 +1332,10 @@ public function partitionData($record_field = '', $thresholds = null, $percentag`
`1332`	`1332`	`public function histogram($bucket_width = 25, $record_field = '')`
`1333`	`1333`	`{`
`1334`	`1334`	`if (!isset($this->data_mesgs['record'][$record_field])) {`
`1335`		`- throw new Exception('phpFITFileAnalysis->histogram(): '.$record_field.' data not present in FIT file!');`
	`1335`	`+ throw new \Exception('phpFITFileAnalysis->histogram(): '.$record_field.' data not present in FIT file!');`
`1336`	`1336`	`}`
`1337`	`1337`	`if (!is_numeric($bucket_width) \|\| $bucket_width <= 0) {`
`1338`		`- throw new Exception('phpFITFileAnalysis->histogram(): bucket width is not valid!');`
	`1338`	`+ throw new \Exception('phpFITFileAnalysis->histogram(): bucket width is not valid!');`
`1339`	`1339`	`}`
`1340`	`1340`
`1341`	`1341`	`foreach ($this->data_mesgs['record'][$record_field] as $value) {`
`@@ -1425,7 +1425,7 @@ public function hrMetrics($hr_resting, $hr_maximum, $hr_FT, $gender)`
`1425`	`1425`	`public function powerMetrics($functional_threshold_power)`
`1426`	`1426`	`{`
`1427`	`1427`	`if (!isset($this->data_mesgs['record']['power'])) {`
`1428`		`- throw new Exception('phpFITFileAnalysis->powerMetrics(): power data not present in FIT file!');`
	`1428`	`+ throw new \Exception('phpFITFileAnalysis->powerMetrics(): power data not present in FIT file!');`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`	`1431`	`$power_metrics['Average Power'] = array_sum($this->data_mesgs['record']['power']) / count($this->data_mesgs['record']['power']);`
`@@ -1462,17 +1462,17 @@ public function powerMetrics($functional_threshold_power)`
`1462`	`1462`	`public function criticalPower($time_periods)`
`1463`	`1463`	`{`
`1464`	`1464`	`if (!isset($this->data_mesgs['record']['power'])) {`
`1465`		`- throw new Exception('phpFITFileAnalysis->criticalPower(): power data not present in FIT file!');`
	`1465`	`+ throw new \Exception('phpFITFileAnalysis->criticalPower(): power data not present in FIT file!');`
`1466`	`1466`	`}`
`1467`	`1467`
`1468`	`1468`	`if (is_array($time_periods)) {`
`1469`	`1469`	`$count = count($this->data_mesgs['record']['power']);`
`1470`	`1470`	`foreach ($time_periods as $time_period) {`
`1471`	`1471`	`if (!is_numeric($time_period)) {`
`1472`		`- throw new Exception('phpFITFileAnalysis->criticalPower(): time periods must only contain numeric data!');`
	`1472`	`+ throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods must only contain numeric data!');`
`1473`	`1473`	`}`
`1474`	`1474`	`if ($time_period < 0) {`
`1475`		`- throw new Exception('phpFITFileAnalysis->criticalPower(): time periods cannot be negative!');`
	`1475`	`+ throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods cannot be negative!');`
`1476`	`1476`	`}`
`1477`	`1477`	`if ($time_period > $count) {`
`1478`	`1478`	`break;`
`@@ -1497,7 +1497,7 @@ public function criticalPower($time_periods)`
`1497`	`1497`
`1498`	`1498`	`return $criticalPower_values;`
`1499`	`1499`	`} else {`
`1500`		`- throw new Exception('phpFITFileAnalysis->criticalPower(): time periods not valid!');`
	`1500`	`+ throw new \Exception('phpFITFileAnalysis->criticalPower(): time periods not valid!');`
`1501`	`1501`	`}`
`1502`	`1502`	`}`
`1503`	`1503`