reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Calculation/Logical.php

Doc Comments +5 added lines, -7 removed lines

@@ -97,8 +97,7 @@ 
 	 *
 	 * @access	public
 	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical AND of the arguments.
+	 * @return	string|boolean		The logical AND of the arguments.
 	 */
 	public static function LOGICAL_AND() {
 		// Return value
@@ -152,8 +151,7 @@ 
 	 *
 	 * @access	public
 	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical OR of the arguments.
+	 * @return	string|boolean		The logical OR of the arguments.
 	 */
 	public static function LOGICAL_OR() {
 		// Return value
@@ -207,7 +205,7 @@ 
 	 * @access	public
 	 * @category Logical Functions
 	 * @param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
-	 * @return	boolean		The boolean inverse of the argument.
+	 * @return	boolean|string		The boolean inverse of the argument.
 	 */
 	public static function NOT($logical=FALSE) {
 		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
@@ -252,8 +250,8 @@ 
 	 *
 	 * @access	public
 	 * @category Logical Functions
-	 * @param	mixed	$condition		Condition to evaluate
-	 * @param	mixed	$returnIfTrue	Value to return when condition is true
+	 * @param	boolean	$condition		Condition to evaluate
+	 * @param	integer	$returnIfTrue	Value to return when condition is true
 	 * @param	mixed	$returnIfFalse	Optional value to return when condition is false
 	 * @return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
 	 */

Indentation +24 added lines, -24 removed lines

@@ -1,29 +1,29 @@
 <?php
 /**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.7, 2012-05-19
- */
+	 * PHPExcel
+	 *
+	 * Copyright (c) 2006 - 2012 PHPExcel
+	 *
+	 * This library is free software; you can redistribute it and/or
+	 * modify it under the terms of the GNU Lesser General Public
+	 * License as published by the Free Software Foundation; either
+	 * version 2.1 of the License, or (at your option) any later version.
+	 *
+	 * This library is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+	 * Lesser General Public License for more details.
+	 *
+	 * You should have received a copy of the GNU Lesser General Public
+	 * License along with this library; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+	 *
+	 * @category	PHPExcel
+	 * @package		PHPExcel_Calculation
+	 * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+	 * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+	 * @version		1.7.7, 2012-05-19
+	 */
 
 
 /** PHPExcel root directory */

Spacing +12 added lines, -12 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -111,7 +111,7 @@ 
 			// Is it a boolean value?
 			if (is_bool($arg)) {
 				$returnValue = $returnValue && $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
+			} elseif ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$returnValue = $returnValue && ($arg != 0);
 			} elseif (is_string($arg)) {
 				$arg = strtoupper($arg);
@@ -166,7 +166,7 @@ 
 			// Is it a boolean value?
 			if (is_bool($arg)) {
 				$returnValue = $returnValue || $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
+			} elseif ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$returnValue = $returnValue || ($arg != 0);
 			} elseif (is_string($arg)) {
 				$arg = strtoupper($arg);
@@ -209,7 +209,7 @@ 
 	 * @param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
 	 * @return	boolean		The boolean inverse of the argument.
 	 */
-	public static function NOT($logical=FALSE) {
+	public static function NOT($logical = FALSE) {
 		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
 		if (is_string($logical)) {
 			$logical = strtoupper($logical);
@@ -222,7 +222,7 @@ 
 			}
 		}
 
-		return !$logical;
+		return ! $logical;
 	}	//	function NOT()
 
 	/**
@@ -258,9 +258,9 @@ 
 	 * @return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
 	 */
 	public static function STATEMENT_IF($condition = TRUE, $returnIfTrue = 0, $returnIfFalse = FALSE) {
-		$condition		= (is_null($condition))		? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		$returnIfTrue	= (is_null($returnIfTrue))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
+		$condition = (is_null($condition)) ? TRUE : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+		$returnIfTrue = (is_null($returnIfTrue)) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
+		$returnIfFalse = (is_null($returnIfFalse)) ? FALSE : PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
 
 		return ($condition) ? $returnIfTrue : $returnIfFalse;
 	}	//	function STATEMENT_IF()
@@ -279,8 +279,8 @@ 
 	 * @return	mixed	The value of errorpart or testValue determined by error condition
 	 */
 	public static function IFERROR($testValue = '', $errorpart = '') {
-		$testValue	= (is_null($testValue))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
-		$errorpart	= (is_null($errorpart))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
+		$testValue	= (is_null($testValue)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
+		$errorpart	= (is_null($errorpart)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
 
 		return self::STATEMENT_IF(PHPExcel_Calculation_Functions::IS_ERROR($testValue), $errorpart, $testValue);
 	}	//	function IFERROR()

app/Vendor/PHPExcel/PHPExcel/Calculation/LookupRef.php

Doc Comments +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 	 *
 	 * @param	row				Row number to use in the cell reference
 	 * @param	column			Column number to use in the cell reference
-	 * @param	relativity		Flag indicating the type of reference to return
+	 * @param	relativity		integer indicating the type of reference to return
 	 *								1 or omitted	Absolute
 	 *								2				Absolute row; relative column
 	 *								3				Relative row; absolute column
@@ -345,7 +345,7 @@ 
 	 *
 	 * @param	cellAddress		The reference from which you want to base the offset. Reference must refer to a cell or
 	 *								range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
-	 * @param	rows			The number of rows, up or down, that you want the upper-left cell to refer to.
+	 * @param	rows			integer number of rows, up or down, that you want the upper-left cell to refer to.
 	 *								Using 5 as the rows argument specifies that the upper-left cell in the reference is
 	 *								five rows below reference. Rows can be positive (which means below the starting reference)
 	 *								or negative (which means above the starting reference).
@@ -480,7 +480,7 @@ 
 	 *
 	 * @param	lookup_value	The value that you want to match in lookup_array
 	 * @param	lookup_array	The range of cells being searched
-	 * @param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
+	 * @param	match_type		integer number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
 	 * @return	integer			The relative position of the found item
 	 */
 	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
@@ -682,7 +682,7 @@ 
 	* The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
 	* @param	lookup_value	The value that you want to match in lookup_array
 	* @param	lookup_array	The range of cells being searched
-	* @param	index_number	The column number in table_array from which the matching value must be returned. The first column is 1.
+	* @param	index_number	integer column number in table_array from which the matching value must be returned. The first column is 1.
 	* @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
 	* @return	mixed			The value of the found cell
 	*/

Indentation +8 added lines, -8 removed lines

@@ -678,14 +678,14 @@
 
 
 	/**
-	* VLOOKUP
-	* The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
-	* @param	lookup_value	The value that you want to match in lookup_array
-	* @param	lookup_array	The range of cells being searched
-	* @param	index_number	The column number in table_array from which the matching value must be returned. The first column is 1.
-	* @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
-	* @return	mixed			The value of the found cell
-	*/
+	 * VLOOKUP
+	 * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
+	 * @param	lookup_value	The value that you want to match in lookup_array
+	 * @param	lookup_array	The range of cells being searched
+	 * @param	index_number	The column number in table_array from which the matching value must be returned. The first column is 1.
+	 * @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
+	 * @return	mixed			The value of the found cell
+	 */
 	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
 		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
 		$index_number	= PHPExcel_Calculation_Functions::flattenSingleValue($index_number);

Spacing +103 added lines, -103 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -67,23 +67,23 @@ 
 	 * @param	sheetText		Optional Name of worksheet to use
 	 * @return	string
 	 */
-	public static function CELL_ADDRESS($row, $column, $relativity=1, $referenceStyle=True, $sheetText='') {
-		$row		= PHPExcel_Calculation_Functions::flattenSingleValue($row);
-		$column		= PHPExcel_Calculation_Functions::flattenSingleValue($column);
-		$relativity	= PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
-		$sheetText	= PHPExcel_Calculation_Functions::flattenSingleValue($sheetText);
+	public static function CELL_ADDRESS($row, $column, $relativity = 1, $referenceStyle = True, $sheetText = '') {
+		$row = PHPExcel_Calculation_Functions::flattenSingleValue($row);
+		$column = PHPExcel_Calculation_Functions::flattenSingleValue($column);
+		$relativity = PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
+		$sheetText = PHPExcel_Calculation_Functions::flattenSingleValue($sheetText);
 
 		if (($row < 1) || ($column < 1)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
 		if ($sheetText > '') {
-			if (strpos($sheetText,' ') !== False) { $sheetText = "'".$sheetText."'"; }
-			$sheetText .='!';
+			if (strpos($sheetText, ' ') !== False) { $sheetText = "'".$sheetText."'"; }
+			$sheetText .= '!';
 		}
-		if ((!is_bool($referenceStyle)) || $referenceStyle) {
+		if (( ! is_bool($referenceStyle)) || $referenceStyle) {
 			$rowRelative = $columnRelative = '$';
-			$column = PHPExcel_Cell::stringFromColumnIndex($column-1);
+			$column = PHPExcel_Cell::stringFromColumnIndex($column - 1);
 			if (($relativity == 2) || ($relativity == 4)) { $columnRelative = ''; }
 			if (($relativity == 3) || ($relativity == 4)) { $rowRelative = ''; }
 			return $sheetText.$columnRelative.$column.$rowRelative.$row;
@@ -109,29 +109,29 @@ 
 	 * @param	cellAddress		A reference to a range of cells for which you want the column numbers
 	 * @return	integer or array of integer
 	 */
-	public static function COLUMN($cellAddress=Null) {
+	public static function COLUMN($cellAddress = Null) {
 		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
 
 		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $value) {
-				$columnKey = preg_replace('/[^a-z]/i','',$columnKey);
+			foreach ($cellAddress as $columnKey => $value) {
+				$columnKey = preg_replace('/[^a-z]/i', '', $columnKey);
 				return (integer) PHPExcel_Cell::columnIndexFromString($columnKey);
 			}
 		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
+			if (strpos($cellAddress, '!') !== false) {
+				list($sheet, $cellAddress) = explode('!', $cellAddress);
 			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^a-z]/i','',$startAddress);
-				$endAddress = preg_replace('/[^a-z]/i','',$endAddress);
+			if (strpos($cellAddress, ':') !== false) {
+				list($startAddress, $endAddress) = explode(':', $cellAddress);
+				$startAddress = preg_replace('/[^a-z]/i', '', $startAddress);
+				$endAddress = preg_replace('/[^a-z]/i', '', $endAddress);
 				$returnValue = array();
 				do {
 					$returnValue[] = (integer) PHPExcel_Cell::columnIndexFromString($startAddress);
 				} while ($startAddress++ != $endAddress);
 				return $returnValue;
 			} else {
-				$cellAddress = preg_replace('/[^a-z]/i','',$cellAddress);
+				$cellAddress = preg_replace('/[^a-z]/i', '', $cellAddress);
 				return (integer) PHPExcel_Cell::columnIndexFromString($cellAddress);
 			}
 		}
@@ -149,17 +149,17 @@ 
 	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of columns
 	 * @return	integer			The number of columns in cellAddress
 	 */
-	public static function COLUMNS($cellAddress=Null) {
+	public static function COLUMNS($cellAddress = Null) {
 		if (is_null($cellAddress) || $cellAddress === '') {
 			return 1;
-		} elseif (!is_array($cellAddress)) {
+		} elseif ( ! is_array($cellAddress)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
 		$x = array_keys($cellAddress);
 		$x = array_shift($x);
 		$isMatrix = (is_numeric($x));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
+		list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
 
 		if ($isMatrix) {
 			return $rows;
@@ -183,31 +183,31 @@ 
 	 * @param	cellAddress		A reference to a range of cells for which you want the row numbers
 	 * @return	integer or array of integer
 	 */
-	public static function ROW($cellAddress=Null) {
+	public static function ROW($cellAddress = Null) {
 		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
 
 		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $rowValue) {
-				foreach($rowValue as $rowKey => $cellValue) {
-					return (integer) preg_replace('/[^0-9]/i','',$rowKey);
+			foreach ($cellAddress as $columnKey => $rowValue) {
+				foreach ($rowValue as $rowKey => $cellValue) {
+					return (integer) preg_replace('/[^0-9]/i', '', $rowKey);
 				}
 			}
 		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
+			if (strpos($cellAddress, '!') !== false) {
+				list($sheet, $cellAddress) = explode('!', $cellAddress);
 			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^0-9]/','',$startAddress);
-				$endAddress = preg_replace('/[^0-9]/','',$endAddress);
+			if (strpos($cellAddress, ':') !== false) {
+				list($startAddress, $endAddress) = explode(':', $cellAddress);
+				$startAddress = preg_replace('/[^0-9]/', '', $startAddress);
+				$endAddress = preg_replace('/[^0-9]/', '', $endAddress);
 				$returnValue = array();
 				do {
 					$returnValue[][] = (integer) $startAddress;
 				} while ($startAddress++ != $endAddress);
 				return $returnValue;
 			} else {
-				list($cellAddress) = explode(':',$cellAddress);
-				return (integer) preg_replace('/[^0-9]/','',$cellAddress);
+				list($cellAddress) = explode(':', $cellAddress);
+				return (integer) preg_replace('/[^0-9]/', '', $cellAddress);
 			}
 		}
 	}	//	function ROW()
@@ -224,16 +224,16 @@ 
 	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
 	 * @return	integer			The number of rows in cellAddress
 	 */
-	public static function ROWS($cellAddress=Null) {
+	public static function ROWS($cellAddress = Null) {
 		if (is_null($cellAddress) || $cellAddress === '') {
 			return 1;
-		} elseif (!is_array($cellAddress)) {
+		} elseif ( ! is_array($cellAddress)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
 		$i = array_keys($cellAddress);
 		$isMatrix = (is_numeric(array_shift($i)));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
+		list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
 
 		if ($isMatrix) {
 			return $columns;
@@ -259,10 +259,10 @@ 
 		$args = func_get_args();
 		$pCell = array_pop($args);
 
-		$linkURL		= (is_null($linkURL))		? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($linkURL);
-		$displayName	= (is_null($displayName))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($displayName);
+		$linkURL = (is_null($linkURL)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($linkURL);
+		$displayName = (is_null($displayName)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($displayName);
 
-		if ((!is_object($pCell)) || (trim($linkURL) == '')) {
+		if (( ! is_object($pCell)) || (trim($linkURL) == '')) {
 			return PHPExcel_Calculation_Functions::REF();
 		}
 
@@ -293,27 +293,27 @@ 
 	 * @todo	Support for the optional a1 parameter introduced in Excel 2010
 	 *
 	 */
-	public static function INDIRECT($cellAddress=Null, PHPExcel_Cell $pCell = null) {
-		$cellAddress	= PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
+	public static function INDIRECT($cellAddress = Null, PHPExcel_Cell $pCell = null) {
+		$cellAddress = PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
 		if (is_null($cellAddress) || $cellAddress === '') {
 			return PHPExcel_Calculation_Functions::REF();
 		}
 
 		$cellAddress1 = $cellAddress;
 		$cellAddress2 = NULL;
-		if (strpos($cellAddress,':') !== false) {
-			list($cellAddress1,$cellAddress2) = explode(':',$cellAddress);
+		if (strpos($cellAddress, ':') !== false) {
+			list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
 		}
 
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-			((!is_null($cellAddress2)) && (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
+		if (( ! preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
+			(( ! is_null($cellAddress2)) && ( ! preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
 
-			if (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+			if ( ! preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
 				return PHPExcel_Calculation_Functions::REF();
 			}
 
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheetName,$cellAddress) = explode('!',$cellAddress);
+			if (strpos($cellAddress, '!') !== false) {
+				list($sheetName, $cellAddress) = explode('!', $cellAddress);
 				$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
 			} else {
 				$pSheet = $pCell->getParent();
@@ -322,8 +322,8 @@ 
 			return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, False);
 		}
 
-		if (strpos($cellAddress,'!') !== false) {
-			list($sheetName,$cellAddress) = explode('!',$cellAddress);
+		if (strpos($cellAddress, '!') !== false) {
+			list($sheetName, $cellAddress) = explode('!', $cellAddress);
 			$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
 		} else {
 			$pSheet = $pCell->getParent();
@@ -358,32 +358,32 @@ 
 	 * @param	width			The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
 	 * @return	string			A reference to a cell or range of cells
 	 */
-	public static function OFFSET($cellAddress=Null,$rows=0,$columns=0,$height=null,$width=null) {
-		$rows		= PHPExcel_Calculation_Functions::flattenSingleValue($rows);
+	public static function OFFSET($cellAddress = Null, $rows = 0, $columns = 0, $height = null, $width = null) {
+		$rows = PHPExcel_Calculation_Functions::flattenSingleValue($rows);
 		$columns	= PHPExcel_Calculation_Functions::flattenSingleValue($columns);
 		$height		= PHPExcel_Calculation_Functions::flattenSingleValue($height);
-		$width		= PHPExcel_Calculation_Functions::flattenSingleValue($width);
+		$width = PHPExcel_Calculation_Functions::flattenSingleValue($width);
 		if ($cellAddress == Null) {
 			return 0;
 		}
 
 		$args = func_get_args();
 		$pCell = array_pop($args);
-		if (!is_object($pCell)) {
+		if ( ! is_object($pCell)) {
 			return PHPExcel_Calculation_Functions::REF();
 		}
 
 		$sheetName = null;
-		if (strpos($cellAddress,"!")) {
-			list($sheetName,$cellAddress) = explode("!",$cellAddress);
+		if (strpos($cellAddress, "!")) {
+			list($sheetName, $cellAddress) = explode("!", $cellAddress);
 		}
-		if (strpos($cellAddress,":")) {
-			list($startCell,$endCell) = explode(":",$cellAddress);
+		if (strpos($cellAddress, ":")) {
+			list($startCell, $endCell) = explode(":", $cellAddress);
 		} else {
 			$startCell = $endCell = $cellAddress;
 		}
-		list($startCellColumn,$startCellRow) = PHPExcel_Cell::coordinateFromString($startCell);
-		list($endCellColumn,$endCellRow) = PHPExcel_Cell::coordinateFromString($endCell);
+		list($startCellColumn, $startCellRow) = PHPExcel_Cell::coordinateFromString($startCell);
+		list($endCellColumn, $endCellRow) = PHPExcel_Cell::coordinateFromString($endCell);
 
 		$startCellRow += $rows;
 		$startCellColumn = PHPExcel_Cell::columnIndexFromString($startCellColumn) - 1;
@@ -393,14 +393,14 @@ 
 			return PHPExcel_Calculation_Functions::REF();
 		}
 		$endCellColumn = PHPExcel_Cell::columnIndexFromString($endCellColumn) - 1;
-		if (($width != null) && (!is_object($width))) {
+		if (($width != null) && ( ! is_object($width))) {
 			$endCellColumn = $startCellColumn + $width - 1;
 		} else {
 			$endCellColumn += $columns;
 		}
 		$startCellColumn = PHPExcel_Cell::stringFromColumnIndex($startCellColumn);
 
-		if (($height != null) && (!is_object($height))) {
+		if (($height != null) && ( ! is_object($height))) {
 			$endCellRow = $startCellRow + $height - 1;
 		} else {
 			$endCellRow += $rows;
@@ -449,10 +449,10 @@ 
 		$chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
 		$entryCount = count($chooseArgs) - 1;
 
-		if(is_array($chosenEntry)) {
+		if (is_array($chosenEntry)) {
 			$chosenEntry = array_shift($chosenEntry);
 		}
-		if ((is_numeric($chosenEntry)) && (!is_bool($chosenEntry))) {
+		if ((is_numeric($chosenEntry)) && ( ! is_bool($chosenEntry))) {
 			--$chosenEntry;
 		} else {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -483,15 +483,15 @@ 
 	 * @param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
 	 * @return	integer			The relative position of the found item
 	 */
-	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
+	public static function MATCH($lookup_value, $lookup_array, $match_type = 1) {
 		$lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
 		$lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-		$match_type	= (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
+		$match_type = (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
 		//	MATCH is not case sensitive
 		$lookup_value = strtolower($lookup_value);
 
 		//	lookup_value type has to be number, text, or logical values
-		if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) {
+		if (( ! is_numeric($lookup_value)) && ( ! is_string($lookup_value)) && ( ! is_bool($lookup_value))) {
 			return PHPExcel_Calculation_Functions::NA();
 		}
 
@@ -507,10 +507,10 @@ 
 		}
 
 		//	lookup_array should contain only number, text, or logical values, or empty (null) cells
-		foreach($lookup_array as $i => $lookupArrayValue) {
+		foreach ($lookup_array as $i => $lookupArrayValue) {
 			//	check the type of the value
-			if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
-				(!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) {
+			if (( ! is_numeric($lookupArrayValue)) && ( ! is_string($lookupArrayValue)) &&
+				( ! is_bool($lookupArrayValue)) && ( ! is_null($lookupArrayValue))) {
 				return PHPExcel_Calculation_Functions::NA();
 			}
 			//	convert strings to lowercase for case-insensitive testing
@@ -518,7 +518,7 @@ 
 				$lookup_array[$i] = strtolower($lookupArrayValue);
 			}
 			if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
-				$lookup_array = array_slice($lookup_array,0,$i-1);
+				$lookup_array = array_slice($lookup_array, 0, $i - 1);
 			}
 		}
 
@@ -526,7 +526,7 @@ 
 		if ($match_type == 1) {
 			asort($lookup_array);
 			$keySet = array_keys($lookup_array);
-		} elseif($match_type == -1) {
+		} elseif ($match_type == -1) {
 			arsort($lookup_array);
 			$keySet = array_keys($lookup_array);
 		}
@@ -537,7 +537,7 @@ 
 		// loop on the cells
 //		var_dump($lookup_array);
 //		echo '<br />';
-		foreach($lookup_array as $i => $lookupArrayValue) {
+		foreach ($lookup_array as $i => $lookupArrayValue) {
 			if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) {
 				//	exact match
 				return ++$i;
@@ -548,15 +548,15 @@ 
 //				echo 'Keyset = ';
 //				var_dump($keySet);
 //				echo '<br />';
-				$i = array_search($i,$keySet);
+				$i = array_search($i, $keySet);
 //				echo '$i='.$i.'<br />';
 				// if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value
-				if ($i < 1){
+				if ($i < 1) {
 					// 1st cell was allready smaller than the lookup_value
 					break;
 				} else {
 					// the previous cell was the match
-					return $keySet[$i-1]+1;
+					return $keySet[$i - 1] + 1;
 				}
 			} elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
 //				echo '$i = '.$i.' => ';
@@ -565,15 +565,15 @@ 
 //				echo 'Keyset = ';
 //				var_dump($keySet);
 //				echo '<br />';
-				$i = array_search($i,$keySet);
+				$i = array_search($i, $keySet);
 //				echo '$i='.$i.'<br />';
 				// if match_type is 1 <=> find the largest value that is less than or equal to lookup_value
-				if ($i < 1){
+				if ($i < 1) {
 					// 1st cell was allready bigger than the lookup_value
 					break;
 				} else {
 					// the previous cell was the match
-					return $keySet[$i-1]+1;
+					return $keySet[$i - 1] + 1;
 				}
 			}
 		}
@@ -596,13 +596,13 @@ 
 	 * @param	column_num		The column in array from which to return a value. If column_num is omitted, row_num is required.
 	 * @return	mixed			the value of a specified cell or array of cells
 	 */
-	public static function INDEX($arrayValues,$rowNum = 0,$columnNum = 0) {
+	public static function INDEX($arrayValues, $rowNum = 0, $columnNum = 0) {
 
 		if (($rowNum < 0) || ($columnNum < 0)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
-		if (!is_array($arrayValues)) {
+		if ( ! is_array($arrayValues)) {
 			return PHPExcel_Calculation_Functions::REF();
 		}
 
@@ -617,7 +617,7 @@ 
 			}
 			$rowNum = $rowKeys[--$rowNum];
 			$returnArray = array();
-			foreach($arrayValues as $arrayColumn) {
+			foreach ($arrayValues as $arrayColumn) {
 				if (is_array($arrayColumn)) {
 					if (isset($arrayColumn[$rowNum])) {
 						$returnArray[] = $arrayColumn[$rowNum];
@@ -652,12 +652,12 @@ 
 	 */
 	public static function TRANSPOSE($matrixData) {
 		$returnMatrix = array();
-		if (!is_array($matrixData)) { $matrixData = array(array($matrixData)); }
+		if ( ! is_array($matrixData)) { $matrixData = array(array($matrixData)); }
 
 		$column = 0;
-		foreach($matrixData as $matrixRow) {
+		foreach ($matrixData as $matrixRow) {
 			$row = 0;
-			foreach($matrixRow as $matrixCell) {
+			foreach ($matrixRow as $matrixCell) {
 				$returnMatrix[$row][$column] = $matrixCell;
 				++$row;
 			}
@@ -667,7 +667,7 @@ 
 	}	//	function TRANSPOSE()
 
 
-	private static function _vlookupSort($a,$b) {
+	private static function _vlookupSort($a, $b) {
 		$f = array_keys($a);
 		$firstColumn = array_shift($f);
 		if (strtolower($a[$firstColumn]) == strtolower($b[$firstColumn])) {
@@ -686,10 +686,10 @@ 
 	* @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
 	* @return	mixed			The value of the found cell
 	*/
-	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
+	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true) {
 		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
 		$index_number	= PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
-		$not_exact_match	= PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
+		$not_exact_match = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
 
 		// index_number must be greater than or equal to 1
 		if ($index_number < 1) {
@@ -697,12 +697,12 @@ 
 		}
 
 		// index_number must be less than or equal to the number of columns in lookup_array
-		if ((!is_array($lookup_array)) || (empty($lookup_array))) {
+		if (( ! is_array($lookup_array)) || (empty($lookup_array))) {
 			return PHPExcel_Calculation_Functions::REF();
 		} else {
 			$f = array_keys($lookup_array);
 			$firstRow = array_pop($f);
-			if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
+			if (( ! is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
 				return PHPExcel_Calculation_Functions::REF();
 			} else {
 				$columnKeys = array_keys($lookup_array[$firstRow]);
@@ -711,12 +711,12 @@ 
 			}
 		}
 
-		if (!$not_exact_match) {
-			uasort($lookup_array,array('self','_vlookupSort'));
+		if ( ! $not_exact_match) {
+			uasort($lookup_array, array('self', '_vlookupSort'));
 		}
 
 		$rowNumber = $rowValue = False;
-		foreach($lookup_array as $rowKey => $rowData) {
+		foreach ($lookup_array as $rowKey => $rowData) {
 			if (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)) {
 				break;
 			}
@@ -725,7 +725,7 @@ 
 		}
 
 		if ($rowNumber !== false) {
-			if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
+			if (( ! $not_exact_match) && ($rowValue != $lookup_value)) {
 				//	if an exact match is required, we have what we need to return an appropriate response
 				return PHPExcel_Calculation_Functions::NA();
 			} else {
@@ -746,10 +746,10 @@ 
 	 * @param	result_vector	The column from which the matching value must be returned
 	 * @return	mixed			The value of the found cell
 	 */
-	public static function LOOKUP($lookup_value, $lookup_vector, $result_vector=null) {
-		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+	public static function LOOKUP($lookup_value, $lookup_vector, $result_vector = null) {
+		$lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
 
-		if (!is_array($lookup_vector)) {
+		if ( ! is_array($lookup_vector)) {
 			return PHPExcel_Calculation_Functions::NA();
 		}
 		$lookupRows = count($lookup_vector);
@@ -782,7 +782,7 @@ 
 			$lookup_vector = array_shift($lookup_vector);
 		}
 		if ($lookupColumns != 2) {
-			foreach($lookup_vector as &$value) {
+			foreach ($lookup_vector as &$value) {
 				if (is_array($value)) {
 					$k = array_keys($value);
 					$key1 = $key2 = array_shift($k);
@@ -802,7 +802,7 @@ 
 			unset($value);
 		}
 
-		return self::VLOOKUP($lookup_value,$lookup_vector,2);
+		return self::VLOOKUP($lookup_value, $lookup_vector, 2);
  	}	//	function LOOKUP()
 
 }	//	class PHPExcel_Calculation_LookupRef

app/Vendor/PHPExcel/PHPExcel/Calculation/MathTrig.php

Doc Comments +10 added lines, -19 removed lines

@@ -70,6 +70,10 @@ 
 	}	//	function _factors()
 
 
+	/**
+	 * @param integer $num
+	 * @param integer $n
+	 */
 	private static function _romanCut($num, $n) {
 		return ($num - ($num % $n ) ) / $n;
 	}	//	function _romanCut()
@@ -423,8 +427,7 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$value		The positive real number for which you want the logarithm
-	 * @param	float	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
+	 * @param	integer	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
 	 * @return	float
 	 */
 	public static function LOG_BASE($number = NULL, $base=10) {
@@ -681,8 +684,8 @@ 
 	 *
 	 * Computes x raised to the power y.
 	 *
-	 * @param	float		$x
-	 * @param	float		$y
+	 * @param	integer		$x
+	 * @param	integer		$y
 	 * @return	float
 	 */
 	public static function POWER($x = 0, $y = 2) {
@@ -712,7 +715,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function PRODUCT() {
@@ -750,8 +752,7 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
+	 * @return	integer
 	 */
 	public static function QUOTIENT() {
 		// Return value
@@ -881,9 +882,6 @@ 
 	 *
 	 * Returns the sum of a power series
 	 *
-	 * @param	float			$x	Input value to the power series
-	 * @param	float			$n	Initial power to which you want to raise $x
-	 * @param	float			$m	Step by which to increase $n for each term in the series
 	 * @param	array of mixed		Data Series
 	 * @return	float
 	 */
@@ -1028,7 +1026,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function SUM() {
@@ -1058,9 +1055,8 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @param	string		$condition		The criteria that defines which cells will be summed.
-	 * @return	float
+	 * @return	integer
 	 */
 	public static function SUMIF($aArgs,$condition,$sumArgs = array()) {
 		// Return value
@@ -1095,7 +1091,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function SUMPRODUCT() {
@@ -1139,7 +1134,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function SUMSQ() {
@@ -1162,7 +1156,6 @@ 
 	/**
 	 * SUMX2MY2
 	 *
-	 * @param	mixed	$value	Value to check
 	 * @return	float
 	 */
 	public static function SUMX2MY2($matrixData1,$matrixData2) {
@@ -1191,7 +1184,6 @@ 
 	/**
 	 * SUMX2PY2
 	 *
-	 * @param	mixed	$value	Value to check
 	 * @return	float
 	 */
 	public static function SUMX2PY2($matrixData1,$matrixData2) {
@@ -1220,7 +1212,6 @@ 
 	/**
 	 * SUMXMY2
 	 *
-	 * @param	mixed	$value	Value to check
 	 * @return	float
 	 */
 	public static function SUMXMY2($matrixData1,$matrixData2) {
@@ -1251,7 +1242,7 @@ 
 	 *
 	 * Truncates value to the number of fractional digits by number_digits.
 	 *
-	 * @param	float		$value
+	 * @param	integer		$value
 	 * @param	int			$digits
 	 * @return	float		Truncated value
 	 */

app/Vendor/PHPExcel/PHPExcel/Calculation/Statistical.php

Doc Comments +4 added lines, -46 removed lines

@@ -144,7 +144,7 @@ 
 	 *
 	 * @param p require p>0
 	 * @param q require q>0
-	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+	 * @return double if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
 	 * @author Jaco van Kooten
 	 */
 	private static function _logBeta($p, $q) {
@@ -165,6 +165,8 @@ 
 	 * Evaluates of continued fraction part of incomplete beta function.
 	 * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
 	 * @author Jaco van Kooten
+	 * @param double $p
+	 * @param double $q
 	 */
 	private static function _betaFraction($x, $p, $q) {
 		$c = 1.0;
@@ -694,7 +696,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function AVEDEV() {
@@ -742,7 +743,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function AVERAGE() {
@@ -784,7 +784,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function AVERAGEA() {
@@ -832,7 +831,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
@@ -876,7 +874,6 @@ 
 	 * @param	float		$value			Value at which you want to evaluate the distribution
 	 * @param	float		$alpha			Parameter to the distribution
 	 * @param	float		$beta			Parameter to the distribution
-	 * @param	boolean		$cumulative
 	 * @return	float
 	 *
 	 */
@@ -912,7 +909,6 @@ 
 	 * @param	float		$probability	Probability at which you want to evaluate the distribution
 	 * @param	float		$alpha			Parameter to the distribution
 	 * @param	float		$beta			Parameter to the distribution
-	 * @param	boolean		$cumulative
 	 * @return	float
 	 *
 	 */
@@ -1156,7 +1152,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	int
 	 */
 	public static function COUNT() {
@@ -1191,7 +1186,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	int
 	 */
 	public static function COUNTA() {
@@ -1222,7 +1216,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	int
 	 */
 	public static function COUNTBLANK() {
@@ -1253,7 +1246,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @param	string		$condition		The criteria that defines which cells will be counted.
 	 * @return	int
 	 */
@@ -1425,7 +1417,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function DEVSQ() {
@@ -1700,7 +1691,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function GEOMEAN() {
@@ -1759,7 +1749,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function HARMEAN() {
@@ -1911,8 +1900,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the largest) in the array or range of data to return
 	 * @return	float
 	 *
 	 */
@@ -2059,7 +2046,6 @@ 
 	 *
 	 * Returns the inverse of the normal cumulative distribution
 	 *
-	 * @param	float		$value
 	 * @return	float
 	 *
 	 * @todo	Try implementing P J Acklam's refinement algorithm for greater
@@ -2116,7 +2102,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MAX() {
@@ -2152,7 +2137,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MAXA() {
@@ -2193,7 +2177,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
@@ -2233,7 +2216,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MEDIAN() {
@@ -2278,7 +2260,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MIN() {
@@ -2314,7 +2295,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MINA() {
@@ -2355,7 +2335,6 @@ 
 	 *
 	 * @access	public
 	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
@@ -2429,7 +2408,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function MODE() {
@@ -2534,9 +2512,9 @@ 
 	 *
 	 * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
 	 *
-	 * @param	float		$value
 	 * @param	float		$mean		Mean Value
 	 * @param	float		$stdDev		Standard Deviation
+	 * @param double $probability
 	 * @return	float
 	 *
 	 */
@@ -2598,8 +2576,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$entry			Percentile value in the range 0..1, inclusive.
 	 * @return	float
 	 */
 	public static function PERCENTILE() {
@@ -2759,8 +2735,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Quartile value in the range 1..3, inclusive.
 	 * @return	float
 	 */
 	public static function QUARTILE() {
@@ -2918,8 +2892,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the smallest) in the array or range of data to return
 	 * @return	float
 	 */
 	public static function SMALL() {
@@ -2984,7 +2956,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function STDEV() {
@@ -3031,7 +3002,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function STDEVA() {
@@ -3083,7 +3053,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function STDEVP() {
@@ -3130,7 +3099,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function STDEVPA() {
@@ -3358,8 +3326,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$discard		Percentage to discard
 	 * @return	float
 	 */
 	public static function TRIMMEAN() {
@@ -3401,7 +3367,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function VARFunc() {
@@ -3443,7 +3408,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function VARA() {
@@ -3496,7 +3460,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function VARP() {
@@ -3538,7 +3501,6 @@ 
 	 *
 	 * @access	public
 	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function VARPA() {
@@ -3621,10 +3583,6 @@ 
 	 * Returns the Weibull distribution. Use this distribution in reliability
 	 * analysis, such as calculating a device's mean time to failure.
 	 *
-	 * @param	float		$value
-	 * @param	float		$alpha		Alpha Parameter
-	 * @param	float		$beta		Beta Parameter
-	 * @param	boolean		$cumulative
 	 * @return	float
 	 *
 	 */

Spacing +287 added lines, -287 removed lines

@@ -27,16 +27,16 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/trendClass.php';
+require_once PHPEXCEL_ROOT.'PHPExcel/Shared/trend/trendClass.php';
 
 
 /** LOG_GAMMA_X_MAX_VALUE */
@@ -62,19 +62,19 @@ 
 class PHPExcel_Calculation_Statistical {
 
 
-	private static function _checkTrendArrays(&$array1,&$array2) {
-		if (!is_array($array1)) { $array1 = array($array1); }
-		if (!is_array($array2)) { $array2 = array($array2); }
+	private static function _checkTrendArrays(&$array1, &$array2) {
+		if ( ! is_array($array1)) { $array1 = array($array1); }
+		if ( ! is_array($array2)) { $array2 = array($array2); }
 
 		$array1 = PHPExcel_Calculation_Functions::flattenArray($array1);
 		$array2 = PHPExcel_Calculation_Functions::flattenArray($array2);
-		foreach($array1 as $key => $value) {
+		foreach ($array1 as $key => $value) {
 			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
 				unset($array1[$key]);
 				unset($array2[$key]);
 			}
 		}
-		foreach($array2 as $key => $value) {
+		foreach ($array2 as $key => $value) {
 			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
 				unset($array1[$key]);
 				unset($array2[$key]);
@@ -137,7 +137,7 @@ 
 	// Function cache for _logBeta function
 	private static $_logBetaCache_p			= 0.0;
 	private static $_logBetaCache_q			= 0.0;
-	private static $_logBetaCache_result	= 0.0;
+	private static $_logBetaCache_result = 0.0;
 
 	/**
 	 * The natural logarithm of the beta function.
@@ -177,12 +177,12 @@ 
 		}
 		$h = 1.0 / $h;
 		$frac = $h;
-		$m	 = 1;
+		$m = 1;
 		$delta = 0.0;
-		while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION ) {
+		while ($m <= MAX_ITERATIONS && abs($delta - 1.0) > PRECISION) {
 			$m2 = 2 * $m;
 			// even index for d
-			$d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
+			$d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
 			$h = 1.0 + $d * $h;
 			if (abs($h) < XMININ) {
 				$h = XMININ;
@@ -256,8 +256,8 @@ 
 	 */
 
 	// Function cache for logGamma
-	private static $_logGammaCache_result	= 0.0;
-	private static $_logGammaCache_x		= 0.0;
+	private static $_logGammaCache_result = 0.0;
+	private static $_logGammaCache_x = 0.0;
 
 	private static function _logGamma($x) {
 		// Log Gamma related constants
@@ -265,57 +265,57 @@ 
 		static $lg_d2 = 0.4227843350984671393993777;
 		static $lg_d4 = 1.791759469228055000094023;
 
-		static $lg_p1 = array(	4.945235359296727046734888,
+		static $lg_p1 = array(4.945235359296727046734888,
 								201.8112620856775083915565,
 								2290.838373831346393026739,
 								11319.67205903380828685045,
 								28557.24635671635335736389,
 								38484.96228443793359990269,
 								26377.48787624195437963534,
-								7225.813979700288197698961 );
-		static $lg_p2 = array(	4.974607845568932035012064,
+								7225.813979700288197698961);
+		static $lg_p2 = array(4.974607845568932035012064,
 								542.4138599891070494101986,
 								15506.93864978364947665077,
 								184793.2904445632425417223,
 								1088204.76946882876749847,
 								3338152.967987029735917223,
 								5106661.678927352456275255,
-								3074109.054850539556250927 );
-		static $lg_p4 = array(	14745.02166059939948905062,
+								3074109.054850539556250927);
+		static $lg_p4 = array(14745.02166059939948905062,
 								2426813.369486704502836312,
 								121475557.4045093227939592,
 								2663432449.630976949898078,
 								29403789566.34553899906876,
 								170266573776.5398868392998,
 								492612579337.743088758812,
-								560625185622.3951465078242 );
+								560625185622.3951465078242);
 
-		static $lg_q1 = array(	67.48212550303777196073036,
+		static $lg_q1 = array(67.48212550303777196073036,
 								1113.332393857199323513008,
 								7738.757056935398733233834,
 								27639.87074403340708898585,
 								54993.10206226157329794414,
 								61611.22180066002127833352,
 								36351.27591501940507276287,
-								8785.536302431013170870835 );
-		static $lg_q2 = array(	183.0328399370592604055942,
+								8785.536302431013170870835);
+		static $lg_q2 = array(183.0328399370592604055942,
 								7765.049321445005871323047,
 								133190.3827966074194402448,
 								1136705.821321969608938755,
 								5267964.117437946917577538,
 								13467014.54311101692290052,
 								17827365.30353274213975932,
-								9533095.591844353613395747 );
-		static $lg_q4 = array(	2690.530175870899333379843,
+								9533095.591844353613395747);
+		static $lg_q4 = array(2690.530175870899333379843,
 								639388.5654300092398984238,
 								41355999.30241388052042842,
 								1120872109.61614794137657,
 								14886137286.78813811542398,
 								101680358627.2438228077304,
 								341747634550.7377132798597,
-								446315818741.9713286462081 );
+								446315818741.9713286462081);
 
-		static $lg_c  = array(	-0.001910444077728,
+		static $lg_c = array(	-0.001910444077728,
 								8.4171387781295e-4,
 								-5.952379913043012e-4,
 								7.93650793500350248e-4,
@@ -325,7 +325,7 @@ 
 
 	// Rough estimate of the fourth root of logGamma_xBig
 	static $lg_frtbig = 2.25e76;
-	static $pnt68	 = 0.6796875;
+	static $pnt68 = 0.6796875;
 
 
 	if ($x == self::$_logGammaCache_x) {
@@ -422,17 +422,17 @@ 
 	//
 	//	Private implementation of the incomplete Gamma function
 	//
-	private static function _incompleteGamma($a,$x) {
+	private static function _incompleteGamma($a, $x) {
 		static $max = 32;
 		$summer = 0;
-		for ($n=0; $n<=$max; ++$n) {
+		for ($n = 0; $n <= $max; ++$n) {
 			$divisor = $a;
-			for ($i=1; $i<=$n; ++$i) {
+			for ($i = 1; $i <= $n; ++$i) {
 				$divisor *= ($a + $i);
 			}
-			$summer += (pow($x,$n) / $divisor);
+			$summer += (pow($x, $n) / $divisor);
 		}
-		return pow($x,$a) * exp(0-$x) * $summer;
+		return pow($x, $a) * exp(0 - $x) * $summer;
 	}	//	function _incompleteGamma()
 
 
@@ -443,7 +443,7 @@ 
 		if ($data == 0.0) return 0;
 
 		static $p0 = 1.000000000190015;
-		static $p = array ( 1 => 76.18009172947146,
+		static $p = array(1 => 76.18009172947146,
 							2 => -86.50532032941677,
 							3 => 24.01409824083091,
 							4 => -1.231739572450155,
@@ -456,7 +456,7 @@ 
 		$tmp -= ($x + 0.5) * log($tmp);
 
 		$summer = $p0;
-		for ($j=1;$j<=6;++$j) {
+		for ($j = 1; $j <= 6; ++$j) {
 			$summer += ($p[$j] / ++$y);
 		}
 		return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
@@ -485,7 +485,7 @@ 
 		//	Input paramater is $p - probability - where 0 < p < 1.
 
 		//	Coefficients in rational approximations
-		static $a = array(	1 => -3.969683028665376e+01,
+		static $a = array(1 => -3.969683028665376e+01,
 							2 => 2.209460984245205e+02,
 							3 => -2.759285104469687e+02,
 							4 => 1.383577518672690e+02,
@@ -493,14 +493,14 @@ 
 							6 => 2.506628277459239e+00
 						 );
 
-		static $b = array(	1 => -5.447609879822406e+01,
+		static $b = array(1 => -5.447609879822406e+01,
 							2 => 1.615858368580409e+02,
 							3 => -1.556989798598866e+02,
 							4 => 6.680131188771972e+01,
 							5 => -1.328068155288572e+01
 						 );
 
-		static $c = array(	1 => -7.784894002430293e-03,
+		static $c = array(1 => -7.784894002430293e-03,
 							2 => -3.223964580411365e-01,
 							3 => -2.400758277161838e+00,
 							4 => -2.549732539343734e+00,
@@ -508,15 +508,15 @@ 
 							6 => 2.938163982698783e+00
 						 );
 
-		static $d = array(	1 => 7.784695709041462e-03,
+		static $d = array(1 => 7.784695709041462e-03,
 							2 => 3.224671290700398e-01,
 							3 => 2.445134137142996e+00,
 							4 => 3.754408661907416e+00
 						 );
 
 		//	Define lower and upper region break-points.
-		$p_low = 0.02425;			//Use lower region approx. below this
-		$p_high = 1 - $p_low;		//Use upper region approx. above this
+		$p_low = 0.02425; //Use lower region approx. below this
+		$p_high = 1 - $p_low; //Use upper region approx. above this
 
 		if (0 < $p && $p < $p_low) {
 			//	Rational approximation for lower region.
@@ -662,7 +662,7 @@ 
 			} else {
 				$R = 1 - $p;
 			}
-			$R = pow(-log($R),2);
+			$R = pow(-log($R), 2);
 
 			//	computation for p not close to 0, 0.5 or 1.
 			If ($R <= $split2) {
@@ -708,11 +708,11 @@ 
 			$aCount = 0;
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+					(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 					$arg = (integer) $arg;
 				}
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					if (is_null($returnValue)) {
 						$returnValue = abs($arg - $aMean);
 					} else {
@@ -751,11 +751,11 @@ 
 		// Loop through arguments
 		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
 			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+				(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 				$arg = (integer) $arg;
 			}
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				if (is_null($returnValue)) {
 					$returnValue = $arg;
 				} else {
@@ -795,7 +795,7 @@ 
 		// Loop through arguments
 		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
 			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+				( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 			} else {
 				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
 					if (is_bool($arg)) {
@@ -836,7 +836,7 @@ 
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
-	public static function AVERAGEIF($aArgs,$condition,$averageArgs = array()) {
+	public static function AVERAGEIF($aArgs, $condition, $averageArgs = array()) {
 		// Return value
 		$returnValue = 0;
 
@@ -849,7 +849,7 @@ 
 		// Loop through arguments
 		$aCount = 0;
 		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
+			if ( ! is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
 			$testCondition = '='.$arg.$condition;
 			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
 				if ((is_null($returnValue)) || ($arg > $returnValue)) {
@@ -880,7 +880,7 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function BETADIST($value,$alpha,$beta,$rMin=0,$rMax=1) {
+	public static function BETADIST($value, $alpha, $beta, $rMin = 0, $rMax = 1) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
 		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
@@ -898,7 +898,7 @@ 
 			}
 			$value -= $rMin;
 			$value /= ($rMax - $rMin);
-			return self::_incompleteBeta($value,$alpha,$beta);
+			return self::_incompleteBeta($value, $alpha, $beta);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BETADIST()
@@ -916,9 +916,9 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function BETAINV($probability,$alpha,$beta,$rMin=0,$rMax=1) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+	public static function BETAINV($probability, $alpha, $beta, $rMin = 0, $rMax = 1) {
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
 		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
 		$rMin			= PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
 		$rMax			= PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
@@ -950,7 +950,7 @@ 
 			if ($i == MAX_ITERATIONS) {
 				return PHPExcel_Calculation_Functions::NA();
 			}
-			return round($rMin + $guess * ($rMax - $rMin),12);
+			return round($rMin + $guess * ($rMax - $rMin), 12);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BETAINV()
@@ -975,9 +975,9 @@ 
 	 *
 	 */
 	public static function BINOMDIST($value, $trials, $probability, $cumulative) {
-		$value			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($value));
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$value = floor(PHPExcel_Calculation_Functions::flattenSingleValue($value));
+		$trials = floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
 
 		if ((is_numeric($value)) && (is_numeric($trials)) && (is_numeric($probability))) {
 			if (($value < 0) || ($value > $trials)) {
@@ -990,11 +990,11 @@ 
 				if ($cumulative) {
 					$summer = 0;
 					for ($i = 0; $i <= $value; ++$i) {
-						$summer += PHPExcel_Calculation_MathTrig::COMBIN($trials,$i) * pow($probability,$i) * pow(1 - $probability,$trials - $i);
+						$summer += PHPExcel_Calculation_MathTrig::COMBIN($trials, $i) * pow($probability, $i) * pow(1 - $probability, $trials - $i);
 					}
 					return $summer;
 				} else {
-					return PHPExcel_Calculation_MathTrig::COMBIN($trials,$value) * pow($probability,$value) * pow(1 - $probability,$trials - $value) ;
+					return PHPExcel_Calculation_MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value);
 				}
 			}
 		}
@@ -1012,8 +1012,8 @@ 
 	 * @return	float
 	 */
 	public static function CHIDIST($value, $degrees) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$degrees = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
 
 		if ((is_numeric($value)) && (is_numeric($degrees))) {
 			if ($degrees < 1) {
@@ -1025,7 +1025,7 @@ 
 				}
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			return 1 - (self::_incompleteGamma($degrees/2,$value/2) / self::_gamma($degrees/2));
+			return 1 - (self::_incompleteGamma($degrees / 2, $value / 2) / self::_gamma($degrees / 2));
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function CHIDIST()
@@ -1041,8 +1041,8 @@ 
 	 * @return	float
 	 */
 	public static function CHIINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$degrees = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
 
 		if ((is_numeric($probability)) && (is_numeric($degrees))) {
 
@@ -1050,7 +1050,7 @@ 
 			$xHi = 0;
 
 			$x = $xNew = 1;
-			$dx	= 1;
+			$dx = 1;
 			$i = 0;
 
 			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -1081,7 +1081,7 @@ 
 			if ($i == MAX_ITERATIONS) {
 				return PHPExcel_Calculation_Functions::NA();
 			}
-			return round($x,12);
+			return round($x, 12);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function CHIINV()
@@ -1098,10 +1098,10 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function CONFIDENCE($alpha,$stdDev,$size) {
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-		$size	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($size));
+	public static function CONFIDENCE($alpha, $stdDev, $size) {
+		$alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+		$size = floor(PHPExcel_Calculation_Functions::flattenSingleValue($size));
 
 		if ((is_numeric($alpha)) && (is_numeric($stdDev)) && (is_numeric($size))) {
 			if (($alpha <= 0) || ($alpha >= 1)) {
@@ -1125,11 +1125,11 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function CORREL($yValues,$xValues=null) {
-		if ((is_null($xValues)) || (!is_array($yValues)) || (!is_array($xValues))) {
+	public static function CORREL($yValues, $xValues = null) {
+		if ((is_null($xValues)) || ( ! is_array($yValues)) || ( ! is_array($xValues))) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -1141,7 +1141,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getCorrelation();
 	}	//	function CORREL()
 
@@ -1167,11 +1167,11 @@ 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
 		foreach ($aArgs as $k => $arg) {
 			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+				(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 				$arg = (integer) $arg;
 			}
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				++$returnValue;
 			}
 		}
@@ -1257,7 +1257,7 @@ 
 	 * @param	string		$condition		The criteria that defines which cells will be counted.
 	 * @return	int
 	 */
-	public static function COUNTIF($aArgs,$condition) {
+	public static function COUNTIF($aArgs, $condition) {
 		// Return value
 		$returnValue = 0;
 
@@ -1265,7 +1265,7 @@ 
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
 		// Loop through arguments
 		foreach ($aArgs as $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
+			if ( ! is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
 			$testCondition = '='.$arg.$condition;
 			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
 				// Is it a value within our criteria
@@ -1287,8 +1287,8 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function COVAR($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+	public static function COVAR($yValues, $xValues) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -1300,7 +1300,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getCovariance();
 	}	//	function COVAR()
 
@@ -1325,9 +1325,9 @@ 
 	 *
 	 */
 	public static function CRITBINOM($trials, $probability, $alpha) {
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+		$trials = floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
 
 		if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
 			if ($trials < 0) {
@@ -1343,7 +1343,7 @@ 
 				$t = sqrt(log(1 / ($alpha * $alpha)));
 				$trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
 			} else {
-				$t = sqrt(log(1 / pow(1 - $alpha,2)));
+				$t = sqrt(log(1 / pow(1 - $alpha, 2)));
 				$trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
 			}
 			$Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
@@ -1364,7 +1364,7 @@ 
 			$PreviousValue = 1;
 			$Done = False;
 			$k = $m + 1;
-			while ((!$Done) && ($k <= $trials)) {
+			while (( ! $Done) && ($k <= $trials)) {
 				$CurrentValue = $PreviousValue * ($trials - $k + 1) * $probability / ($k * (1 - $probability));
 				$TotalUnscaledProbability += $CurrentValue;
 				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
@@ -1377,7 +1377,7 @@ 
 			$PreviousValue = 1;
 			$Done = False;
 			$k = $m - 1;
-			while ((!$Done) && ($k >= 0)) {
+			while (( ! $Done) && ($k >= 0)) {
 				$CurrentValue = $PreviousValue * $k + 1 * (1 - $probability) / (($trials - $k) * $probability);
 				$TotalUnscaledProbability += $CurrentValue;
 				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
@@ -1440,14 +1440,14 @@ 
 			foreach ($aArgs as $k => $arg) {
 				// Is it a numeric value?
 				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+					(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 					$arg = (integer) $arg;
 				}
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
+						$returnValue = pow(($arg - $aMean), 2);
 					} else {
-						$returnValue += pow(($arg - $aMean),2);
+						$returnValue += pow(($arg - $aMean), 2);
 					}
 					++$aCount;
 				}
@@ -1477,9 +1477,9 @@ 
 	 * @return	float
 	 */
 	public static function EXPONDIST($value, $lambda, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$lambda	= PHPExcel_Calculation_Functions::flattenSingleValue($lambda);
-		$cumulative	= PHPExcel_Calculation_Functions::flattenSingleValue($cumulative);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$lambda = PHPExcel_Calculation_Functions::flattenSingleValue($lambda);
+		$cumulative = PHPExcel_Calculation_Functions::flattenSingleValue($cumulative);
 
 		if ((is_numeric($value)) && (is_numeric($lambda))) {
 			if (($value < 0) || ($lambda < 0)) {
@@ -1487,9 +1487,9 @@ 
 			}
 			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
 				if ($cumulative) {
-					return 1 - exp(0-$value*$lambda);
+					return 1 - exp(0 - $value * $lambda);
 				} else {
-					return $lambda * exp(0-$value*$lambda);
+					return $lambda * exp(0 - $value * $lambda);
 				}
 			}
 		}
@@ -1508,13 +1508,13 @@ 
 	 * @return	float
 	 */
 	public static function FISHER($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
 		if (is_numeric($value)) {
 			if (($value <= -1) || ($value >= 1)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			return 0.5 * log((1+$value)/(1-$value));
+			return 0.5 * log((1 + $value) / (1 - $value));
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function FISHER()
@@ -1531,7 +1531,7 @@ 
 	 * @return	float
 	 */
 	public static function FISHERINV($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
 		if (is_numeric($value)) {
 			return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
@@ -1550,13 +1550,13 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function FORECAST($xValue,$yValues,$xValues) {
-		$xValue	= PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
-		if (!is_numeric($xValue)) {
+	public static function FORECAST($xValue, $yValues, $xValues) {
+		$xValue = PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
+		if ( ! is_numeric($xValue)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -1568,7 +1568,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getValueOfYForX($xValue);
 	}	//	function FORECAST()
 
@@ -1585,8 +1585,8 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function GAMMADIST($value,$a,$b,$cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+	public static function GAMMADIST($value, $a, $b, $cumulative) {
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$a		= PHPExcel_Calculation_Functions::flattenSingleValue($a);
 		$b		= PHPExcel_Calculation_Functions::flattenSingleValue($b);
 
@@ -1596,9 +1596,9 @@ 
 			}
 			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
 				if ($cumulative) {
-					return self::_incompleteGamma($a,$value / $b) / self::_gamma($a);
+					return self::_incompleteGamma($a, $value / $b) / self::_gamma($a);
 				} else {
-					return (1 / (pow($b,$a) * self::_gamma($a))) * pow($value,$a-1) * exp(0-($value / $b));
+					return (1 / (pow($b, $a) * self::_gamma($a))) * pow($value, $a - 1) * exp(0 - ($value / $b));
 				}
 			}
 		}
@@ -1617,10 +1617,10 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function GAMMAINV($probability,$alpha,$beta) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+	public static function GAMMAINV($probability, $alpha, $beta) {
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+		$beta = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
 
 		if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta))) {
 			if (($alpha <= 0) || ($beta <= 0) || ($probability < 0) || ($probability > 1)) {
@@ -1632,7 +1632,7 @@ 
 
 			$x = $xNew = 1;
 			$error = $pdf = 0;
-			$dx	= 1024;
+			$dx = 1024;
 			$i = 0;
 
 			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -1676,7 +1676,7 @@ 
 	 * @return	float
 	 */
 	public static function GAMMALN($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
 		if (is_numeric($value)) {
 			if ($value <= 0) {
@@ -1708,7 +1708,7 @@ 
 
 		$aMean = PHPExcel_Calculation_MathTrig::PRODUCT($aArgs);
 		if (is_numeric($aMean) && ($aMean > 0)) {
-			$aCount = self::COUNT($aArgs) ;
+			$aCount = self::COUNT($aArgs);
 			if (self::MIN($aArgs) > 0) {
 				return pow($aMean, (1 / $aCount));
 			}
@@ -1728,19 +1728,19 @@ 
 	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
 	 * @return	array of float
 	 */
-	public static function GROWTH($yValues,$xValues=array(),$newValues=array(),$const=True) {
+	public static function GROWTH($yValues, $xValues = array(), $newValues = array(), $const = True) {
 		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
 		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
 		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+		$const = (is_null($const)) ? True : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
+		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL, $yValues, $xValues, $const);
 		if (empty($newValues)) {
 			$newValues = $bestFitExponential->getXValues();
 		}
 
 		$returnArray = array();
-		foreach($newValues as $xValue) {
+		foreach ($newValues as $xValue) {
 			$returnArray[0][] = $bestFitExponential->getValueOfYForX($xValue);
 		}
 
@@ -1774,7 +1774,7 @@ 
 		$aCount = 0;
 		foreach ($aArgs as $arg) {
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				if ($arg <= 0) {
 					return PHPExcel_Calculation_Functions::NaN();
 				}
@@ -1810,10 +1810,10 @@ 
 	 *
 	 */
 	public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber) {
-		$sampleSuccesses		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleSuccesses));
-		$sampleNumber			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleNumber));
-		$populationSuccesses	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationSuccesses));
-		$populationNumber		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationNumber));
+		$sampleSuccesses = floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleSuccesses));
+		$sampleNumber = floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleNumber));
+		$populationSuccesses = floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationSuccesses));
+		$populationNumber = floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationNumber));
 
 		if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
 			if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
@@ -1825,9 +1825,9 @@ 
 			if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			return PHPExcel_Calculation_MathTrig::COMBIN($populationSuccesses,$sampleSuccesses) *
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber - $populationSuccesses,$sampleNumber - $sampleSuccesses) /
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber,$sampleNumber);
+			return PHPExcel_Calculation_MathTrig::COMBIN($populationSuccesses, $sampleSuccesses) *
+				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber - $populationSuccesses, $sampleNumber - $sampleSuccesses) /
+				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber, $sampleNumber);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function HYPGEOMDIST()
@@ -1842,8 +1842,8 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function INTERCEPT($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+	public static function INTERCEPT($yValues, $xValues) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -1855,7 +1855,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getIntersect();
 	}	//	function INTERCEPT()
 
@@ -1881,11 +1881,11 @@ 
 			// Loop through arguments
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+					( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 				} else {
 					// Is it a numeric value?
-					if ((is_numeric($arg)) && (!is_string($arg))) {
-						$summer += pow((($arg - $mean) / $stdDev),4) ;
+					if ((is_numeric($arg)) && ( ! is_string($arg))) {
+						$summer += pow((($arg - $mean) / $stdDev), 4);
 						++$count;
 					}
 				}
@@ -1893,7 +1893,7 @@ 
 
 			// Return
 			if ($count > 3) {
-				return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1,2) / (($count-2) * ($count-3)));
+				return $summer * ($count * ($count + 1) / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * pow($count - 1, 2) / (($count - 2) * ($count - 3)));
 			}
 		}
 		return PHPExcel_Calculation_Functions::DIV0();
@@ -1922,11 +1922,11 @@ 
 		// Calculate
 		$entry = floor(array_pop($aArgs));
 
-		if ((is_numeric($entry)) && (!is_string($entry))) {
+		if ((is_numeric($entry)) && ( ! is_string($entry))) {
 			$mArgs = array();
 			foreach ($aArgs as $arg) {
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					$mArgs[] = $arg;
 				}
 			}
@@ -1954,12 +1954,12 @@ 
 	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
 	 * @return	array
 	 */
-	public static function LINEST($yValues,$xValues=null,$const=True,$stats=False) {
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+	public static function LINEST($yValues, $xValues = null, $const = True, $stats = False) {
+		$const	= (is_null($const)) ? True : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+		$stats	= (is_null($stats)) ? False : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
+		if (is_null($xValues)) $xValues = range(1, count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
 
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -1972,15 +1972,15 @@ 
 			return 0;
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues, $const);
 		if ($stats) {
-			return array( array( $bestFitLinear->getSlope(),
+			return array(array($bestFitLinear->getSlope(),
 						 		 $bestFitLinear->getSlopeSE(),
 						 		 $bestFitLinear->getGoodnessOfFit(),
 						 		 $bestFitLinear->getF(),
 						 		 $bestFitLinear->getSSRegression(),
 							   ),
-						  array( $bestFitLinear->getIntersect(),
+						  array($bestFitLinear->getIntersect(),
 								 $bestFitLinear->getIntersectSE(),
 								 $bestFitLinear->getStdevOfResiduals(),
 								 $bestFitLinear->getDFResiduals(),
@@ -1988,7 +1988,7 @@ 
 							   )
 						);
 		} else {
-			return array( $bestFitLinear->getSlope(),
+			return array($bestFitLinear->getSlope(),
 						  $bestFitLinear->getIntersect()
 						);
 		}
@@ -2007,18 +2007,18 @@ 
 	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
 	 * @return	array
 	 */
-	public static function LOGEST($yValues,$xValues=null,$const=True,$stats=False) {
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+	public static function LOGEST($yValues, $xValues = null, $const = True, $stats = False) {
+		$const	= (is_null($const)) ? True : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+		$stats	= (is_null($stats)) ? False : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
+		if (is_null($xValues)) $xValues = range(1, count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
 
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
 		$xValueCount = count($xValues);
 
-		foreach($yValues as $value) {
+		foreach ($yValues as $value) {
 			if ($value <= 0.0) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -2031,15 +2031,15 @@ 
 			return 1;
 		}
 
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
+		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL, $yValues, $xValues, $const);
 		if ($stats) {
-			return array( array( $bestFitExponential->getSlope(),
+			return array(array($bestFitExponential->getSlope(),
 						 		 $bestFitExponential->getSlopeSE(),
 						 		 $bestFitExponential->getGoodnessOfFit(),
 						 		 $bestFitExponential->getF(),
 						 		 $bestFitExponential->getSSRegression(),
 							   ),
-						  array( $bestFitExponential->getIntersect(),
+						  array($bestFitExponential->getIntersect(),
 								 $bestFitExponential->getIntersectSE(),
 								 $bestFitExponential->getStdevOfResiduals(),
 								 $bestFitExponential->getDFResiduals(),
@@ -2047,7 +2047,7 @@ 
 							   )
 						);
 		} else {
-			return array( $bestFitExponential->getSlope(),
+			return array($bestFitExponential->getSlope(),
 						  $bestFitExponential->getIntersect()
 						);
 		}
@@ -2067,9 +2067,9 @@ 
 	 *			(as described at) http://home.online.no/~pjacklam/notes/invnorm/
 	 */
 	public static function LOGINV($probability, $mean, $stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
 
 		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
 			if (($probability < 0) || ($probability > 1) || ($stdDev <= 0)) {
@@ -2091,9 +2091,9 @@ 
 	 * @return	float
 	 */
 	public static function LOGNORMDIST($value, $mean, $stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
 
 		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
 			if (($value <= 0) || ($stdDev <= 0)) {
@@ -2127,7 +2127,7 @@ 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		foreach ($aArgs as $arg) {
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				if ((is_null($returnValue)) || ($arg > $returnValue)) {
 					$returnValue = $arg;
 				}
@@ -2135,7 +2135,7 @@ 
 		}
 
 		// Return
-		if(is_null($returnValue)) {
+		if (is_null($returnValue)) {
 			return 0;
 		}
 		return $returnValue;
@@ -2176,7 +2176,7 @@ 
 		}
 
 		// Return
-		if(is_null($returnValue)) {
+		if (is_null($returnValue)) {
 			return 0;
 		}
 		return $returnValue;
@@ -2197,7 +2197,7 @@ 
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
-	public static function MAXIF($aArgs,$condition,$sumArgs = array()) {
+	public static function MAXIF($aArgs, $condition, $sumArgs = array()) {
 		// Return value
 		$returnValue = null;
 
@@ -2209,7 +2209,7 @@ 
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
 		// Loop through arguments
 		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
+			if ( ! is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
 			$testCondition = '='.$arg.$condition;
 			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
 				if ((is_null($returnValue)) || ($arg > $returnValue)) {
@@ -2245,14 +2245,14 @@ 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		foreach ($aArgs as $arg) {
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$mArgs[] = $arg;
 			}
 		}
 
 		$mValueCount = count($mArgs);
 		if ($mValueCount > 0) {
-			sort($mArgs,SORT_NUMERIC);
+			sort($mArgs, SORT_NUMERIC);
 			$mValueCount = $mValueCount / 2;
 			if ($mValueCount == floor($mValueCount)) {
 				$returnValue = ($mArgs[$mValueCount--] + $mArgs[$mValueCount]) / 2;
@@ -2289,7 +2289,7 @@ 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		foreach ($aArgs as $arg) {
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				if ((is_null($returnValue)) || ($arg < $returnValue)) {
 					$returnValue = $arg;
 				}
@@ -2297,7 +2297,7 @@ 
 		}
 
 		// Return
-		if(is_null($returnValue)) {
+		if (is_null($returnValue)) {
 			return 0;
 		}
 		return $returnValue;
@@ -2338,7 +2338,7 @@ 
 		}
 
 		// Return
-		if(is_null($returnValue)) {
+		if (is_null($returnValue)) {
 			return 0;
 		}
 		return $returnValue;
@@ -2359,7 +2359,7 @@ 
 	 * @param	string		$condition		The criteria that defines which cells will be checked.
 	 * @return	float
 	 */
-	public static function MINIF($aArgs,$condition,$sumArgs = array()) {
+	public static function MINIF($aArgs, $condition, $sumArgs = array()) {
 		// Return value
 		$returnValue = null;
 
@@ -2371,7 +2371,7 @@ 
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
 		// Loop through arguments
 		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
+			if ( ! is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
 			$testCondition = '='.$arg.$condition;
 			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
 				if ((is_null($returnValue)) || ($arg < $returnValue)) {
@@ -2391,22 +2391,22 @@ 
 	//
 	private static function _modeCalc($data) {
 		$frequencyArray = array();
-		foreach($data as $datum) {
+		foreach ($data as $datum) {
 			$found = False;
-			foreach($frequencyArray as $key => $value) {
+			foreach ($frequencyArray as $key => $value) {
 				if ((string) $value['value'] == (string) $datum) {
 					++$frequencyArray[$key]['frequency'];
 					$found = True;
 					break;
 				}
 			}
-			if (!$found) {
+			if ( ! $found) {
 				$frequencyArray[] = array('value'		=> $datum,
-										  'frequency'	=>	1 );
+										  'frequency'	=>	1);
 			}
 		}
 
-		foreach($frequencyArray as $key => $value) {
+		foreach ($frequencyArray as $key => $value) {
 			$frequencyList[$key] = $value['frequency'];
 			$valueList[$key] = $value['value'];
 		}
@@ -2442,12 +2442,12 @@ 
 		$mArgs = array();
 		foreach ($aArgs as $arg) {
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$mArgs[] = $arg;
 			}
 		}
 
-		if (!empty($mArgs)) {
+		if ( ! empty($mArgs)) {
 			return self::_modeCalc($mArgs);
 		}
 
@@ -2472,9 +2472,9 @@ 
 	 *
 	 */
 	public static function NEGBINOMDIST($failures, $successes, $probability) {
-		$failures		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($failures));
-		$successes		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($successes));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$failures = floor(PHPExcel_Calculation_Functions::flattenSingleValue($failures));
+		$successes = floor(PHPExcel_Calculation_Functions::flattenSingleValue($successes));
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
 
 		if ((is_numeric($failures)) && (is_numeric($successes)) && (is_numeric($probability))) {
 			if (($failures < 0) || ($successes < 1)) {
@@ -2488,7 +2488,7 @@ 
 					return PHPExcel_Calculation_Functions::NaN();
 				}
 			}
-			return (PHPExcel_Calculation_MathTrig::COMBIN($failures + $successes - 1,$successes - 1)) * (pow($probability,$successes)) * (pow(1 - $probability,$failures)) ;
+			return (PHPExcel_Calculation_MathTrig::COMBIN($failures + $successes - 1, $successes - 1)) * (pow($probability, $successes)) * (pow(1 - $probability, $failures));
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function NEGBINOMDIST()
@@ -2509,9 +2509,9 @@ 
 	 *
 	 */
 	public static function NORMDIST($value, $mean, $stdDev, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
 
 		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
 			if ($stdDev < 0) {
@@ -2521,7 +2521,7 @@ 
 				if ($cumulative) {
 					return 0.5 * (1 + PHPExcel_Calculation_Engineering::_erfVal(($value - $mean) / ($stdDev * sqrt(2))));
 				} else {
-					return (1 / (SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean,2) / (2 * ($stdDev * $stdDev))));
+					return (1 / (SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean, 2) / (2 * ($stdDev * $stdDev))));
 				}
 			}
 		}
@@ -2540,10 +2540,10 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function NORMINV($probability,$mean,$stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+	public static function NORMINV($probability, $mean, $stdDev) {
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
 
 		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
 			if (($probability < 0) || ($probability > 1)) {
@@ -2569,7 +2569,7 @@ 
 	 * @return	float
 	 */
 	public static function NORMSDIST($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
 		return self::NORMDIST($value, 0, 1, True);
 	}	//	function NORMSDIST()
@@ -2608,14 +2608,14 @@ 
 		// Calculate
 		$entry = array_pop($aArgs);
 
-		if ((is_numeric($entry)) && (!is_string($entry))) {
+		if ((is_numeric($entry)) && ( ! is_string($entry))) {
 			if (($entry < 0) || ($entry > 1)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
 			$mArgs = array();
 			foreach ($aArgs as $arg) {
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					$mArgs[] = $arg;
 				}
 			}
@@ -2623,14 +2623,14 @@ 
 			if ($mValueCount > 0) {
 				sort($mArgs);
 				$count = self::COUNT($mArgs);
-				$index = $entry * ($count-1);
+				$index = $entry * ($count - 1);
 				$iBase = floor($index);
 				if ($index == $iBase) {
 					return $mArgs[$index];
 				} else {
 					$iNext = $iBase + 1;
 					$iProportion = $index - $iBase;
-					return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
+					return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
 				}
 			}
 		}
@@ -2648,17 +2648,17 @@ 
 	 * @param	number				The number of significant digits for the returned percentage value.
 	 * @return	float
 	 */
-	public static function PERCENTRANK($valueSet,$value,$significance=3) {
-		$valueSet	= PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$significance	= (is_null($significance))	? 3 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($significance);
+	public static function PERCENTRANK($valueSet, $value, $significance = 3) {
+		$valueSet = PHPExcel_Calculation_Functions::flattenArray($valueSet);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$significance = (is_null($significance)) ? 3 : (integer) PHPExcel_Calculation_Functions::flattenSingleValue($significance);
 
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
+		foreach ($valueSet as $key => $valueEntry) {
+			if ( ! is_numeric($valueEntry)) {
 				unset($valueSet[$key]);
 			}
 		}
-		sort($valueSet,SORT_NUMERIC);
+		sort($valueSet, SORT_NUMERIC);
 		$valueCount = count($valueSet);
 		if ($valueCount == 0) {
 			return PHPExcel_Calculation_Functions::NaN();
@@ -2669,7 +2669,7 @@ 
 			return PHPExcel_Calculation_Functions::NA();
 		}
 
-		$pos = array_search($value,$valueSet);
+		$pos = array_search($value, $valueSet);
 		if ($pos === False) {
 			$pos = 0;
 			$testValue = $valueSet[0];
@@ -2680,7 +2680,7 @@ 
 			$pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
 		}
 
-		return round($pos / $valueAdjustor,$significance);
+		return round($pos / $valueAdjustor, $significance);
 	}	//	function PERCENTRANK()
 
 
@@ -2697,9 +2697,9 @@ 
 	 * @param	int		$numInSet	Number of objects in each permutation
 	 * @return	int		Number of permutations
 	 */
-	public static function PERMUT($numObjs,$numInSet) {
-		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
-		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
+	public static function PERMUT($numObjs, $numInSet) {
+		$numObjs = PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
+		$numInSet = PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
 
 		if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
 			$numInSet = floor($numInSet);
@@ -2726,8 +2726,8 @@ 
 	 *
 	 */
 	public static function POISSON($value, $mean, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
 
 		if ((is_numeric($value)) && (is_numeric($mean))) {
 			if (($value <= 0) || ($mean <= 0)) {
@@ -2737,11 +2737,11 @@ 
 				if ($cumulative) {
 					$summer = 0;
 					for ($i = 0; $i <= floor($value); ++$i) {
-						$summer += pow($mean,$i) / PHPExcel_Calculation_MathTrig::FACT($i);
+						$summer += pow($mean, $i) / PHPExcel_Calculation_MathTrig::FACT($i);
 					}
-					return exp(0-$mean) * $summer;
+					return exp(0 - $mean) * $summer;
 				} else {
-					return (exp(0-$mean) * pow($mean,$value)) / PHPExcel_Calculation_MathTrig::FACT($value);
+					return (exp(0 - $mean) * pow($mean, $value)) / PHPExcel_Calculation_MathTrig::FACT($value);
 				}
 			}
 		}
@@ -2769,12 +2769,12 @@ 
 		// Calculate
 		$entry = floor(array_pop($aArgs));
 
-		if ((is_numeric($entry)) && (!is_string($entry))) {
+		if ((is_numeric($entry)) && ( ! is_string($entry))) {
 			$entry /= 4;
 			if (($entry < 0) || ($entry > 1)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			return self::PERCENTILE($aArgs,$entry);
+			return self::PERCENTILE($aArgs, $entry);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function QUARTILE()
@@ -2790,23 +2790,23 @@ 
 	 * @param	mixed				Order to sort the values in the value set
 	 * @return	float
 	 */
-	public static function RANK($value,$valueSet,$order=0) {
+	public static function RANK($value, $valueSet, $order = 0) {
 		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$valueSet = PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$order	= (is_null($order))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($order);
+		$order	= (is_null($order)) ? 0 : (integer) PHPExcel_Calculation_Functions::flattenSingleValue($order);
 
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
+		foreach ($valueSet as $key => $valueEntry) {
+			if ( ! is_numeric($valueEntry)) {
 				unset($valueSet[$key]);
 			}
 		}
 
 		if ($order == 0) {
-			rsort($valueSet,SORT_NUMERIC);
+			rsort($valueSet, SORT_NUMERIC);
 		} else {
-			sort($valueSet,SORT_NUMERIC);
+			sort($valueSet, SORT_NUMERIC);
 		}
-		$pos = array_search($value,$valueSet);
+		$pos = array_search($value, $valueSet);
 		if ($pos === False) {
 			return PHPExcel_Calculation_Functions::NA();
 		}
@@ -2824,8 +2824,8 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function RSQ($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+	public static function RSQ($yValues, $xValues) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -2837,7 +2837,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getGoodnessOfFit();
 	}	//	function RSQ()
 
@@ -2862,11 +2862,11 @@ 
 		// Loop through arguments
 		foreach ($aArgs as $k => $arg) {
 			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+				( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 			} else {
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$summer += pow((($arg - $mean) / $stdDev),3) ;
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
+					$summer += pow((($arg - $mean) / $stdDev), 3);
 					++$count;
 				}
 			}
@@ -2874,7 +2874,7 @@ 
 
 		// Return
 		if ($count > 2) {
-			return $summer * ($count / (($count-1) * ($count-2)));
+			return $summer * ($count / (($count - 1) * ($count - 2)));
 		}
 		return PHPExcel_Calculation_Functions::DIV0();
 	}	//	function SKEW()
@@ -2889,8 +2889,8 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function SLOPE($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+	public static function SLOPE($yValues, $xValues) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -2902,7 +2902,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getSlope();
 	}	//	function SLOPE()
 
@@ -2928,11 +2928,11 @@ 
 		// Calculate
 		$entry = array_pop($aArgs);
 
-		if ((is_numeric($entry)) && (!is_string($entry))) {
+		if ((is_numeric($entry)) && ( ! is_string($entry))) {
 			$mArgs = array();
 			foreach ($aArgs as $arg) {
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					$mArgs[] = $arg;
 				}
 			}
@@ -2958,16 +2958,16 @@ 
 	 * @param	float	$stdDev		Standard Deviation
 	 * @return	float	Standardized value
 	 */
-	public static function STANDARDIZE($value,$mean,$stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+	public static function STANDARDIZE($value, $mean, $stdDev) {
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$mean = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+		$stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
 
 		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
 			if ($stdDev <= 0) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			return ($value - $mean) / $stdDev ;
+			return ($value - $mean) / $stdDev;
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function STANDARDIZE()
@@ -2994,19 +2994,19 @@ 
 		$returnValue = null;
 
 		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
+		if ( ! is_null($aMean)) {
 			$aCount = -1;
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+					(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 					$arg = (integer) $arg;
 				}
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
+						$returnValue = pow(($arg - $aMean), 2);
 					} else {
-						$returnValue += pow(($arg - $aMean),2);
+						$returnValue += pow(($arg - $aMean), 2);
 					}
 					++$aCount;
 				}
@@ -3041,11 +3041,11 @@ 
 		$returnValue = null;
 
 		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
+		if ( ! is_null($aMean)) {
 			$aCount = -1;
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+					( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 				} else {
 					// Is it a numeric value?
 					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3055,9 +3055,9 @@ 
 							$arg = 0;
 						}
 						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
+							$returnValue = pow(($arg - $aMean), 2);
 						} else {
-							$returnValue += pow(($arg - $aMean),2);
+							$returnValue += pow(($arg - $aMean), 2);
 						}
 						++$aCount;
 					}
@@ -3093,19 +3093,19 @@ 
 		$returnValue = null;
 
 		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
+		if ( ! is_null($aMean)) {
 			$aCount = 0;
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+					(( ! PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
 					$arg = (integer) $arg;
 				}
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
+						$returnValue = pow(($arg - $aMean), 2);
 					} else {
-						$returnValue += pow(($arg - $aMean),2);
+						$returnValue += pow(($arg - $aMean), 2);
 					}
 					++$aCount;
 				}
@@ -3140,11 +3140,11 @@ 
 		$returnValue = null;
 
 		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
+		if ( ! is_null($aMean)) {
 			$aCount = 0;
 			foreach ($aArgs as $k => $arg) {
 				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+					( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 				} else {
 					// Is it a numeric value?
 					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3154,9 +3154,9 @@ 
 							$arg = 0;
 						}
 						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
+							$returnValue = pow(($arg - $aMean), 2);
 						} else {
-							$returnValue += pow(($arg - $aMean),2);
+							$returnValue += pow(($arg - $aMean), 2);
 						}
 						++$aCount;
 					}
@@ -3181,8 +3181,8 @@ 
 	 * @param	array of mixed		Data Series X
 	 * @return	float
 	 */
-	public static function STEYX($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
+	public static function STEYX($yValues, $xValues) {
+		if ( ! self::_checkTrendArrays($yValues, $xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$yValueCount = count($yValues);
@@ -3194,7 +3194,7 @@ 
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
 		return $bestFitLinear->getStdevOfResiduals();
 	}	//	function STEYX()
 
@@ -3211,7 +3211,7 @@ 
 	 */
 	public static function TDIST($value, $degrees, $tails) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+		$degrees = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
 		$tails		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($tails));
 
 		if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
@@ -3228,7 +3228,7 @@ 
 			//	Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
 			//	Horwood Ltd.; W. Sussex, England).
 			$tterm = $degrees;
-			$ttheta = atan2($value,sqrt($tterm));
+			$ttheta = atan2($value, sqrt($tterm));
 			$tc = cos($ttheta);
 			$ts = sin($ttheta);
 			$tsum = 0;
@@ -3270,15 +3270,15 @@ 
 	 * @return	float
 	 */
 	public static function TINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+		$probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+		$degrees = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
 
 		if ((is_numeric($probability)) && (is_numeric($degrees))) {
 			$xLo = 100;
 			$xHi = 0;
 
 			$x = $xNew = 1;
-			$dx	= 1;
+			$dx = 1;
 			$i = 0;
 
 			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -3309,7 +3309,7 @@ 
 			if ($i == MAX_ITERATIONS) {
 				return PHPExcel_Calculation_Functions::NA();
 			}
-			return round($x,12);
+			return round($x, 12);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function TINV()
@@ -3326,19 +3326,19 @@ 
 	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
 	 * @return	array of float
 	 */
-	public static function TREND($yValues,$xValues=array(),$newValues=array(),$const=True) {
+	public static function TREND($yValues, $xValues = array(), $newValues = array(), $const = True) {
 		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
 		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
 		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+		$const = (is_null($const)) ? True : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
+		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues, $const);
 		if (empty($newValues)) {
 			$newValues = $bestFitLinear->getXValues();
 		}
 
 		$returnArray = array();
-		foreach($newValues as $xValue) {
+		foreach ($newValues as $xValue) {
 			$returnArray[0][] = $bestFitLinear->getValueOfYForX($xValue);
 		}
 
@@ -3368,20 +3368,20 @@ 
 		// Calculate
 		$percent = array_pop($aArgs);
 
-		if ((is_numeric($percent)) && (!is_string($percent))) {
+		if ((is_numeric($percent)) && ( ! is_string($percent))) {
 			if (($percent < 0) || ($percent > 1)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
 			$mArgs = array();
 			foreach ($aArgs as $arg) {
 				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
+				if ((is_numeric($arg)) && ( ! is_string($arg))) {
 					$mArgs[] = $arg;
 				}
 			}
 			$discard = floor(self::COUNT($mArgs) * $percent / 2);
 			sort($mArgs);
-			for ($i=0; $i < $discard; ++$i) {
+			for ($i = 0; $i < $discard; ++$i) {
 				array_pop($mArgs);
 				array_shift($mArgs);
 			}
@@ -3416,7 +3416,7 @@ 
 		foreach ($aArgs as $arg) {
 			if (is_bool($arg)) { $arg = (integer) $arg; }
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$summerA += ($arg * $arg);
 				$summerB += $arg;
 				++$aCount;
@@ -3460,7 +3460,7 @@ 
 				(PHPExcel_Calculation_Functions::isValue($k))) {
 				return PHPExcel_Calculation_Functions::VALUE();
 			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+				( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 			} else {
 				// Is it a numeric value?
 				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3511,7 +3511,7 @@ 
 		foreach ($aArgs as $arg) {
 			if (is_bool($arg)) { $arg = (integer) $arg; }
 			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
+			if ((is_numeric($arg)) && ( ! is_string($arg))) {
 				$summerA += ($arg * $arg);
 				$summerB += $arg;
 				++$aCount;
@@ -3555,7 +3555,7 @@ 
 				(PHPExcel_Calculation_Functions::isValue($k))) {
 				return PHPExcel_Calculation_Functions::VALUE();
 			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+				( ! PHPExcel_Calculation_Functions::isMatrixValue($k))) {
 			} else {
 				// Is it a numeric value?
 				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3597,7 +3597,7 @@ 
 	public static function WEIBULL($value, $alpha, $beta, $cumulative) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+		$beta = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
 
 		if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta))) {
 			if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
@@ -3605,9 +3605,9 @@ 
 			}
 			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
 				if ($cumulative) {
-					return 1 - exp(0 - pow($value / $beta,$alpha));
+					return 1 - exp(0 - pow($value / $beta, $alpha));
 				} else {
-					return ($alpha / pow($beta,$alpha)) * pow($value,$alpha - 1) * exp(0 - pow($value / $beta,$alpha));
+					return ($alpha / pow($beta, $alpha)) * pow($value, $alpha - 1) * exp(0 - pow($value / $beta, $alpha));
 				}
 			}
 		}
@@ -3628,9 +3628,9 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function ZTEST($dataSet, $m0, $sigma=null) {
-		$dataSet	= PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
-		$m0			= PHPExcel_Calculation_Functions::flattenSingleValue($m0);
+	public static function ZTEST($dataSet, $m0, $sigma = null) {
+		$dataSet = PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
+		$m0 = PHPExcel_Calculation_Functions::flattenSingleValue($m0);
 		$sigma		= PHPExcel_Calculation_Functions::flattenSingleValue($sigma);
 
 		if (is_null($sigma)) {
@@ -3638,7 +3638,7 @@ 
 		}
 		$n = count($dataSet);
 
-		return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0)/($sigma/SQRT($n)));
+		return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0) / ($sigma / SQRT($n)));
 	}	//	function ZTEST()
 
 }	//	class PHPExcel_Calculation_Statistical

Braces +12 added lines, -5 removed lines

@@ -396,8 +396,9 @@ 
 			if ($y <= $lg_frtbig) {
 				$res = $lg_c[6];
 				$ysq = $y * $y;
-				for ($i = 0; $i < 6; ++$i)
-					$res = $res / $ysq + $lg_c[$i];
+				for ($i = 0; $i < 6; ++$i) {
+									$res = $res / $ysq + $lg_c[$i];
+				}
 				}
 				$res /= $y;
 				$corr = log($y);
@@ -440,7 +441,9 @@ 
 	//	Private implementation of the Gamma function
 	//
 	private static function _gamma($data) {
-		if ($data == 0.0) return 0;
+		if ($data == 0.0) {
+			return 0;
+		}
 
 		static $p0 = 1.000000000190015;
 		static $p = array ( 1 => 76.18009172947146,
@@ -1957,7 +1960,9 @@ 
 	public static function LINEST($yValues,$xValues=null,$const=True,$stats=False) {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+		if (is_null($xValues)) {
+			$xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+		}
 
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -2010,7 +2015,9 @@ 
 	public static function LOGEST($yValues,$xValues=null,$const=True,$stats=False) {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+		if (is_null($xValues)) {
+			$xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+		}
 
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
 			return PHPExcel_Calculation_Functions::VALUE();

app/Vendor/PHPExcel/PHPExcel/Calculation/TextData.php

Doc Comments +7 added lines, -12 removed lines

@@ -69,7 +69,7 @@ 
 	 * CHARACTER
 	 *
 	 * @param	string	$character	Value
-	 * @return	int
+	 * @return	string
 	 */
 	public static function CHARACTER($character) {
 		$character	= PHPExcel_Calculation_Functions::flattenSingleValue($character);
@@ -89,7 +89,6 @@ 
 	/**
 	 * TRIMNONPRINTABLE
 	 *
-	 * @param	mixed	$value	Value to check
 	 * @return	string
 	 */
 	public static function TRIMNONPRINTABLE($stringValue = '') {
@@ -113,7 +112,6 @@ 
 	/**
 	 * TRIMSPACES
 	 *
-	 * @param	mixed	$value	Value to check
 	 * @return	string
 	 */
 	public static function TRIMSPACES($stringValue = '') {
@@ -133,7 +131,7 @@ 
 	/**
 	 * ASCIICODE
 	 *
-	 * @param	string	$character	Value
+	 * @param	string	$characters	Value
 	 * @return	int
 	 */
 	public static function ASCIICODE($characters) {
@@ -192,7 +190,7 @@ 
 	 * This function converts a number to text using currency format, with the decimals rounded to the specified place.
 	 * The format used is $#,##0.00_);($#,##0.00)..
 	 *
-	 * @param	float	$value			The value to format
+	 * @param	integer	$value			The value to format
 	 * @param	int		$decimals		The number of digits to display to the right of the decimal point.
 	 *									If decimals is negative, number is rounded to the left of the decimal point.
 	 *									If you omit decimals, it is assumed to be 2
@@ -291,7 +289,7 @@ 
 	 * FIXEDFORMAT
 	 *
 	 * @param	mixed	$value	Value to check
-	 * @return	boolean
+	 * @return	string
 	 */
 	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -401,8 +399,7 @@ 
 	 * STRINGLENGTH
 	 *
 	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
+	 * @return	integer
 	 */
 	public static function STRINGLENGTH($value = '') {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -491,7 +488,6 @@ 
 	/**
 	 * REPLACE
 	 *
-	 * @param	string	$value	Value
 	 * @param	int		$start	Start character
 	 * @param	int		$chars	Number of characters
 	 * @return	string
@@ -559,8 +555,7 @@ 
 	/**
 	 * RETURNSTRING
 	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
+	 * @return	string|null
 	 */
 	public static function RETURNSTRING($testValue = '') {
 		$testValue	= PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
@@ -576,7 +571,7 @@ 
 	 * TEXTFORMAT
 	 *
 	 * @param	mixed	$value	Value to check
-	 * @return	boolean
+	 * @return	string
 	 */
 	public static function TEXTFORMAT($value,$format) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);

Spacing +60 added lines, -60 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -48,18 +48,18 @@ 
 	private static $_invalidChars = Null;
 
 	private static function _uniord($c) {
-		if (ord($c{0}) >=0 && ord($c{0}) <= 127)
+		if (ord($c{0}) >= 0 && ord($c{0}) <= 127)
 			return ord($c{0});
 		if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
-			return (ord($c{0})-192)*64 + (ord($c{1})-128);
+			return (ord($c{0}) - 192) * 64 + (ord($c{1}) - 128);
 		if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
-			return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
+			return (ord($c{0}) - 224) * 4096 + (ord($c{1}) - 128) * 64 + (ord($c{2}) - 128);
 		if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
-			return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
+			return (ord($c{0}) - 240) * 262144 + (ord($c{1}) - 128) * 4096 + (ord($c{2}) - 128) * 64 + (ord($c{3}) - 128);
 		if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
-			return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
+			return (ord($c{0}) - 248) * 16777216 + (ord($c{1}) - 128) * 262144 + (ord($c{2}) - 128) * 4096 + (ord($c{3}) - 128) * 64 + (ord($c{4}) - 128);
 		if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
-			return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
+			return (ord($c{0}) - 252) * 1073741824 + (ord($c{1}) - 128) * 16777216 + (ord($c{2}) - 128) * 262144 + (ord($c{3}) - 128) * 4096 + (ord($c{4}) - 128) * 64 + (ord($c{5}) - 128);
 		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error
 			return PHPExcel_Calculation_Functions::VALUE();
 		return 0;
@@ -72,9 +72,9 @@ 
 	 * @return	int
 	 */
 	public static function CHARACTER($character) {
-		$character	= PHPExcel_Calculation_Functions::flattenSingleValue($character);
+		$character = PHPExcel_Calculation_Functions::flattenSingleValue($character);
 
-		if ((!is_numeric($character)) || ($character < 0)) {
+		if (( ! is_numeric($character)) || ($character < 0)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 
@@ -93,18 +93,18 @@ 
 	 * @return	string
 	 */
 	public static function TRIMNONPRINTABLE($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
+		$stringValue = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
 
 		if (is_bool($stringValue)) {
 			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (self::$_invalidChars == Null) {
-			self::$_invalidChars = range(chr(0),chr(31));
+			self::$_invalidChars = range(chr(0), chr(31));
 		}
 
 		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return str_replace(self::$_invalidChars,'',trim($stringValue,"\x00..\x1F"));
+			return str_replace(self::$_invalidChars, '', trim($stringValue, "\x00..\x1F"));
 		}
 		return NULL;
 	}	//	function TRIMNONPRINTABLE()
@@ -117,14 +117,14 @@ 
 	 * @return	string
 	 */
 	public static function TRIMSPACES($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
+		$stringValue = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
 
 		if (is_bool($stringValue)) {
 			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return trim(preg_replace('/ +/',' ',trim($stringValue,' ')));
+			return trim(preg_replace('/ +/', ' ', trim($stringValue, ' ')));
 		}
 		return NULL;
 	}	//	function TRIMSPACES()
@@ -139,7 +139,7 @@ 
 	public static function ASCIICODE($characters) {
 		if (($characters === NULL) || ($characters === ''))
 			return PHPExcel_Calculation_Functions::VALUE();
-		$characters	= PHPExcel_Calculation_Functions::flattenSingleValue($characters);
+		$characters = PHPExcel_Calculation_Functions::flattenSingleValue($characters);
 		if (is_bool($characters)) {
 			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
 				$characters = (int) $characters;
@@ -199,24 +199,24 @@ 
 	 * @return	string
 	 */
 	public static function DOLLAR($value = 0, $decimals = 2) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$decimals = is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
 
 		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
+		if ( ! is_numeric($value) || ! is_numeric($decimals)) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
 		$decimals = floor($decimals);
 
 		if ($decimals > 0) {
-			return money_format('%.'.$decimals.'n',$value);
+			return money_format('%.'.$decimals.'n', $value);
 		} else {
-			$round = pow(10,abs($decimals));
-			if ($value < 0) { $round = 0-$round; }
-			$value = PHPExcel_Calculation_MathTrig::MROUND($value,$round);
+			$round = pow(10, abs($decimals));
+			if ($value < 0) { $round = 0 - $round; }
+			$value = PHPExcel_Calculation_MathTrig::MROUND($value, $round);
 			//	The implementation of money_format used if the standard PHP function is not available can't handle decimal places of 0,
 			//		so we display to 1 dp and chop off that character and the decimal separator using substr
-			return substr(money_format('%.1n',$value),0,-2);
+			return substr(money_format('%.1n', $value), 0, -2);
 		}
 	}	//	function DOLLAR()
 
@@ -229,19 +229,19 @@ 
 	 * @param	int		$offset		Offset within $haystack
 	 * @return	string
 	 */
-	public static function SEARCHSENSITIVE($needle,$haystack,$offset=1) {
+	public static function SEARCHSENSITIVE($needle, $haystack, $offset = 1) {
 		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
+		$haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
 		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
 
-		if (!is_bool($needle)) {
+		if ( ! is_bool($needle)) {
 			if (is_bool($haystack)) {
 				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 			}
 
 			if (($offset > 0) && (strlen($haystack) > $offset)) {
 				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($haystack, $needle, --$offset,'UTF-8');
+					$pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
 				} else {
 					$pos = strpos($haystack, $needle, --$offset);
 				}
@@ -262,19 +262,19 @@ 
 	 * @param	int		$offset		Offset within $haystack
 	 * @return	string
 	 */
-	public static function SEARCHINSENSITIVE($needle,$haystack,$offset=1) {
+	public static function SEARCHINSENSITIVE($needle, $haystack, $offset = 1) {
 		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
+		$haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
 		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
 
-		if (!is_bool($needle)) {
+		if ( ! is_bool($needle)) {
 			if (is_bool($haystack)) {
 				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 			}
 
 			if (($offset > 0) && (strlen($haystack) > $offset)) {
 				if (function_exists('mb_stripos')) {
-					$pos = mb_stripos($haystack, $needle, --$offset,'UTF-8');
+					$pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
 				} else {
 					$pos = stripos($haystack, $needle, --$offset);
 				}
@@ -294,20 +294,20 @@ 
 	 * @return	boolean
 	 */
 	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-		$no_commas	= PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$decimals = PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
+		$no_commas = PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
 
 		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
+		if ( ! is_numeric($value) || ! is_numeric($decimals)) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
 		$decimals = floor($decimals);
 
-		$valueResult = round($value,$decimals);
+		$valueResult = round($value, $decimals);
 		if ($decimals < 0) { $decimals = 0; }
-		if (!$no_commas) {
-			$valueResult = number_format($valueResult,$decimals);
+		if ( ! $no_commas) {
+			$valueResult = number_format($valueResult, $decimals);
 		}
 
 		return (string) $valueResult;
@@ -428,7 +428,7 @@ 
 	 * @return	string
 	 */
 	public static function LOWERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+		$mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
 			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
@@ -451,7 +451,7 @@ 
 	 * @return	string
 	 */
 	public static function UPPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+		$mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
 			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
@@ -474,7 +474,7 @@ 
 	 * @return	string
 	 */
 	public static function PROPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+		$mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
 			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
@@ -502,8 +502,8 @@ 
 		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
 		$newText	= PHPExcel_Calculation_Functions::flattenSingleValue($newText);
 
-		$left = self::LEFT($oldText,$start-1);
-		$right = self::RIGHT($oldText,self::STRINGLENGTH($oldText)-($start+$chars)+1);
+		$left = self::LEFT($oldText, $start - 1);
+		$right = self::RIGHT($oldText, self::STRINGLENGTH($oldText) - ($start + $chars) + 1);
 
 		return $left.$newText.$right;
 	}	//	function REPLACE()
@@ -519,24 +519,24 @@ 
 	 * @return	string
 	 */
 	public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0) {
-		$text		= PHPExcel_Calculation_Functions::flattenSingleValue($text);
+		$text = PHPExcel_Calculation_Functions::flattenSingleValue($text);
 		$fromText	= PHPExcel_Calculation_Functions::flattenSingleValue($fromText);
-		$toText		= PHPExcel_Calculation_Functions::flattenSingleValue($toText);
+		$toText = PHPExcel_Calculation_Functions::flattenSingleValue($toText);
 		$instance	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($instance));
 
 		if ($instance == 0) {
-			if(function_exists('mb_str_replace')) {
-				return mb_str_replace($fromText,$toText,$text);
+			if (function_exists('mb_str_replace')) {
+				return mb_str_replace($fromText, $toText, $text);
 			} else {
-				return str_replace($fromText,$toText,$text);
+				return str_replace($fromText, $toText, $text);
 			}
 		} else {
 			$pos = -1;
-			while($instance > 0) {
+			while ($instance > 0) {
 				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
+					$pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
 				} else {
-					$pos = strpos($text, $fromText, $pos+1);
+					$pos = strpos($text, $fromText, $pos + 1);
 				}
 				if ($pos === false) {
 					break;
@@ -545,9 +545,9 @@ 
 			}
 			if ($pos !== false) {
 				if (function_exists('mb_strlen')) {
-					return self::REPLACE($text,++$pos,mb_strlen($fromText, 'UTF-8'),$toText);
+					return self::REPLACE($text, ++$pos, mb_strlen($fromText, 'UTF-8'), $toText);
 				} else {
-					return self::REPLACE($text,++$pos,strlen($fromText),$toText);
+					return self::REPLACE($text, ++$pos, strlen($fromText), $toText);
 				}
 			}
 		}
@@ -563,7 +563,7 @@ 
 	 * @return	boolean
 	 */
 	public static function RETURNSTRING($testValue = '') {
-		$testValue	= PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
+		$testValue = PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
 
 		if (is_string($testValue)) {
 			return $testValue;
@@ -578,15 +578,15 @@ 
 	 * @param	mixed	$value	Value to check
 	 * @return	boolean
 	 */
-	public static function TEXTFORMAT($value,$format) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+	public static function TEXTFORMAT($value, $format) {
+		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$format	= PHPExcel_Calculation_Functions::flattenSingleValue($format);
 
-		if ((is_string($value)) && (!is_numeric($value)) && PHPExcel_Shared_Date::isDateTimeFormatCode($format)) {
+		if ((is_string($value)) && ( ! is_numeric($value)) && PHPExcel_Shared_Date::isDateTimeFormatCode($format)) {
 			$value = PHPExcel_Calculation_DateTime::DATEVALUE($value);
 		}
 
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString($value,$format);
+		return (string) PHPExcel_Style_NumberFormat::toFormattedString($value, $format);
 	}	//	function TEXTFORMAT()
 
 }	//	class PHPExcel_Calculation_TextData

Braces +24 added lines, -15 removed lines

@@ -48,20 +48,28 @@ 
 	private static $_invalidChars = Null;
 
 	private static function _uniord($c) {
-		if (ord($c{0}) >=0 && ord($c{0}) <= 127)
-			return ord($c{0});
-		if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
-			return (ord($c{0})-192)*64 + (ord($c{1})-128);
-		if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
-			return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
-		if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
-			return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
-		if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
-			return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
-		if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
-			return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
-		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error
+		if (ord($c{0}) >=0 && ord($c{0}) <= 127) {
+					return ord($c{0});
+		}
+		if (ord($c{0}) >= 192 && ord($c{0}) <= 223) {
+					return (ord($c{0})-192)*64 + (ord($c{1})-128);
+		}
+		if (ord($c{0}) >= 224 && ord($c{0}) <= 239) {
+					return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
+		}
+		if (ord($c{0}) >= 240 && ord($c{0}) <= 247) {
+					return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
+		}
+		if (ord($c{0}) >= 248 && ord($c{0}) <= 251) {
+					return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
+		}
+		if (ord($c{0}) >= 252 && ord($c{0}) <= 253) {
+					return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
+		}
+		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) {
+			//error
 			return PHPExcel_Calculation_Functions::VALUE();
+		}
 		return 0;
 	}	//	function _uniord()
 
@@ -137,8 +145,9 @@ 
 	 * @return	int
 	 */
 	public static function ASCIICODE($characters) {
-		if (($characters === NULL) || ($characters === ''))
-			return PHPExcel_Calculation_Functions::VALUE();
+		if (($characters === NULL) || ($characters === '')) {
+					return PHPExcel_Calculation_Functions::VALUE();
+		}
 		$characters	= PHPExcel_Calculation_Functions::flattenSingleValue($characters);
 		if (is_bool($characters)) {
 			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {

app/Vendor/PHPExcel/PHPExcel/Cell.php

Doc Comments +6 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 	/**
 	 * Send notification to the cache controller
 	 *
-	 * @return void
+	 * @return PHPExcel_Cell
 	 **/
 	public function notifyCacheController() {
 		$this->_parent->getCellCacheController()->updateCacheData($this);
@@ -113,6 +113,9 @@ 
 		$this->_parent = null;
 	}
 
+	/**
+	 * @param PHPExcel_Worksheet|null $parent
+	 */
 	public function attach($parent) {
 		$this->_parent = $parent;
 	}
@@ -498,7 +501,7 @@ 
 	 * Coordinate from string
 	 *
 	 * @param	string	$pCoordinateString
-	 * @return	array	Array containing column and row (indexes 0 and 1)
+	 * @return	string[]	Array containing column and row (indexes 0 and 1)
 	 * @throws	Exception
 	 */
 	public static function coordinateFromString($pCoordinateString = 'A1')
@@ -652,7 +655,7 @@ 
 	 * Calculate range boundaries
 	 *
 	 * @param	string	$pRange		Cell range (e.g. A1:A1)
-	 * @return	array	Range boundaries (staring Column, starting Row, Final Column, Final Row)
+	 * @return	integer	Range boundaries (staring Column, starting Row, Final Column, Final Row)
 	 */
 	public static function getRangeBoundaries($pRange = 'A1:A1')
 	{

Indentation +2 added lines, -2 removed lines

@@ -203,8 +203,8 @@
 	public function getFormattedValue()
 	{
 		return (string) PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
-						         $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
-			            );
+								 $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
+						);
 	}
 
 	/**

Spacing +50 added lines, -50 removed lines

@@ -146,7 +146,7 @@ 
 				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
 			$this->_dataType = $pDataType;
 		} else {
-			if (!self::getValueBinder()->bindValue($this, $pValue)) {
+			if ( ! self::getValueBinder()->bindValue($this, $pValue)) {
 				throw new Exception("Value could not be bound to cell.");
 			}
 		}
@@ -182,7 +182,7 @@ 
 	 */
 	public function getCoordinate()
 	{
-		return $this->_column . $this->_row;
+		return $this->_column.$this->_row;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 */
 	public function getFormattedValue()
 	{
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
+		return (string) PHPExcel_Style_NumberFormat::toFormattedString($this->getCalculatedValue(),
 						         $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
 			            );
 	}
@@ -217,7 +217,7 @@ 
 	 */
 	public function setValue($pValue = null)
 	{
-		if (!self::getValueBinder()->bindValue($this, $pValue)) {
+		if ( ! self::getValueBinder()->bindValue($this, $pValue)) {
 			throw new Exception("Value could not be bound to cell.");
 		}
 		return $this;
@@ -244,15 +244,15 @@ 
 				break;
 
 			case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-				$this->_value = (float)$pValue;
+				$this->_value = (float) $pValue;
 				break;
 
 			case PHPExcel_Cell_DataType::TYPE_FORMULA:
-				$this->_value = (string)$pValue;
+				$this->_value = (string) $pValue;
 				break;
 
 			case PHPExcel_Cell_DataType::TYPE_BOOL:
-				$this->_value = (bool)$pValue;
+				$this->_value = (bool) $pValue;
 				break;
 
 			case PHPExcel_Cell_DataType::TYPE_ERROR:
@@ -260,7 +260,7 @@ 
 				break;
 
 			default:
-				throw new Exception('Invalid datatype: ' . $pDataType);
+				throw new Exception('Invalid datatype: '.$pDataType);
 				break;
 		}
 
@@ -275,15 +275,15 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function getCalculatedValue($resetLog=true)
+	public function getCalculatedValue($resetLog = true)
 	{
 //		echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().'<br />';
 		if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
 			try {
 //				echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />';
-				$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog);
+				$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this, $resetLog);
 //				echo $this->getCoordinate().' calculation result is '.$result.'<br />';
-			} catch ( Exception $ex ) {
+			} catch (Exception $ex) {
 				if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
 //					echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
 					return $this->_calculatedValue; // Fallback for calculations referencing external files.
@@ -367,7 +367,7 @@ 
 	 */
 	public function hasDataValidation()
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot check for data validation when cell is not bound to a worksheet');
 		}
 
@@ -381,7 +381,7 @@ 
 	 */
 	public function getDataValidation()
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot get data validation for cell that is not bound to a worksheet');
 		}
 
@@ -397,7 +397,7 @@ 
 	 */
 	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null)
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot set data validation for cell that is not bound to a worksheet');
 		}
 
@@ -413,7 +413,7 @@ 
 	 */
 	public function hasHyperlink()
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
 		}
 
@@ -428,7 +428,7 @@ 
 	 */
 	public function getHyperlink()
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
 		}
 
@@ -444,7 +444,7 @@ 
 	 */
 	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null)
 	{
-		if (!isset($this->_parent)) {
+		if ( ! isset($this->_parent)) {
 			throw new Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
 		}
 
@@ -482,11 +482,11 @@ 
 	 */
 	public function isInRange($pRange = 'A1:A1')
 	{
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
+		list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
 
 		// Translate properties
-		$myColumn	= PHPExcel_Cell::columnIndexFromString($this->getColumn());
-		$myRow		= $this->getRow();
+		$myColumn = PHPExcel_Cell::columnIndexFromString($this->getColumn());
+		$myRow = $this->getRow();
 
 		// Verify if cell is in range
 		return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
@@ -504,8 +504,8 @@ 
 	public static function coordinateFromString($pCoordinateString = 'A1')
 	{
 		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
-			return array($matches[1],$matches[2]);
-		} elseif ((strpos($pCoordinateString,':') !== false) || (strpos($pCoordinateString,',') !== false)) {
+			return array($matches[1], $matches[2]);
+		} elseif ((strpos($pCoordinateString, ':') !== false) || (strpos($pCoordinateString, ',') !== false)) {
 			throw new Exception('Cell coordinate string can not be a range of cells.');
 		} elseif ($pCoordinateString == '') {
 			throw new Exception('Cell coordinate can not be zero-length string.');
@@ -523,7 +523,7 @@ 
 	 */
 	public static function absoluteReference($pCoordinateString = 'A1')
 	{
-		if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) {
+		if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
 			// Create absolute coordinate
 			if (ctype_digit($pCoordinateString)) {
 				return '$'.$pCoordinateString;
@@ -545,20 +545,20 @@ 
 	 */
 	public static function absoluteCoordinate($pCoordinateString = 'A1')
 	{
-		if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) {
+		if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
 			// Create absolute coordinate
 			$worksheet = '';
-			$cellAddress = explode('!',$pCoordinateString);
+			$cellAddress = explode('!', $pCoordinateString);
 			if (count($cellAddress) == 2) {
-				list($worksheet,$pCoordinateString) = $cellAddress;
+				list($worksheet, $pCoordinateString) = $cellAddress;
 			}
 
 			list($column, $row) = PHPExcel_Cell::coordinateFromString($pCoordinateString);
-			if ($column[0] == '$')	$column = substr($column,1);
-			if ($row[0] == '$')		$row = substr($row,1);
+			if ($column[0] == '$')	$column = substr($column, 1);
+			if ($row[0] == '$')		$row = substr($row, 1);
 			if ($worksheet > '')
 				$worksheet .= '!';
-			return $worksheet . '$' . $column . '$' . $row;
+			return $worksheet.'$'.$column.'$'.$row;
 		} else {
 			throw new Exception("Coordinate string should not be a cell range.");
 		}
@@ -590,7 +590,7 @@ 
 	public static function buildRange($pRange)
 	{
 		// Verify range
-		if (!is_array($pRange) || empty($pRange) || !is_array($pRange[0])) {
+		if ( ! is_array($pRange) || empty($pRange) || ! is_array($pRange[0])) {
 			throw new Exception('Range does not contain any information.');
 		}
 
@@ -625,11 +625,11 @@ 
 
 		// Calculate range outer borders
 		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
+		$rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
 
 		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]);
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]);
+		$rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]);
+		$rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]);
 
 		return array($rangeStart, $rangeEnd);
 	}
@@ -643,9 +643,9 @@ 
 	public static function rangeDimension($pRange = 'A1:A1')
 	{
 		// Calculate range outer borders
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
+		list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
 
-		return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
+		return array(($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1));
 	}
 
 	/**
@@ -666,7 +666,7 @@ 
 			list($rangeA, $rangeB) = explode(':', $pRange);
 		}
 
-		return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
+		return array(self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
 	}
 
 	/**
@@ -699,18 +699,18 @@ 
 		//	We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString
 		//		for improved performance
 		if (isset($pString{0})) {
-			if (!isset($pString{1})) {
+			if ( ! isset($pString{1})) {
 				$_indexCache[$pString] = $_columnLookup[$pString];
 				return $_indexCache[$pString];
-			} elseif(!isset($pString{2})) {
+			} elseif ( ! isset($pString{2})) {
 				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
 				return $_indexCache[$pString];
-			} elseif(!isset($pString{3})) {
+			} elseif ( ! isset($pString{3})) {
 				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
 				return $_indexCache[$pString];
 			}
 		}
-		throw new Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty") . ".");
+		throw new Exception("Column string index can not be ".((isset($pString{0})) ? "longer than 3 characters" : "empty").".");
 	}
 
 	/**
@@ -726,16 +726,16 @@ 
 		//		though it's additional memory overhead
 		static $_indexCache = array();
 
-		if (!isset($_indexCache[$pColumnIndex])) {
+		if ( ! isset($_indexCache[$pColumnIndex])) {
 			// Determine column string
 			if ($pColumnIndex < 26) {
 				$_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
 			} elseif ($pColumnIndex < 702) {
-				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
+				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)).
 											  chr(65 + $pColumnIndex % 26);
 			} else {
-				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
-											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
+				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)).
+											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)).
 											  chr(65 + $pColumnIndex % 26);
 			}
 		}
@@ -756,24 +756,24 @@ 
 		$cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
 		foreach ($cellBlocks as $cellBlock) {
 			// Single cell?
-			if (strpos($cellBlock,':') === false && strpos($cellBlock,',') === false) {
+			if (strpos($cellBlock, ':') === false && strpos($cellBlock, ',') === false) {
 				$returnValue[] = $cellBlock;
 				continue;
 			}
 
 			// Range...
 			$ranges = PHPExcel_Cell::splitRange($cellBlock);
-			foreach($ranges as $range) {
+			foreach ($ranges as $range) {
 				// Single cell?
-				if (!isset($range[1])) {
+				if ( ! isset($range[1])) {
 					$returnValue[] = $range[0];
 					continue;
 				}
 
 				// Range...
-				list($rangeStart, $rangeEnd)	= $range;
-				list($startCol, $startRow)	= sscanf($rangeStart,'%[A-Z]%d');
-				list($endCol, $endRow)		= sscanf($rangeEnd,'%[A-Z]%d');
+				list($rangeStart, $rangeEnd) = $range;
+				list($startCol, $startRow) = sscanf($rangeStart, '%[A-Z]%d');
+				list($endCol, $endRow) = sscanf($rangeEnd, '%[A-Z]%d');
 				$endCol++;
 
 				// Current data

Braces +18 added lines, -10 removed lines

@@ -142,8 +142,9 @@ 
 
 		// Set datatype?
 		if ($pDataType !== null) {
-			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
+							$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+			}
 			$this->_dataType = $pDataType;
 		} else {
 			if (!self::getValueBinder()->bindValue($this, $pValue)) {
@@ -352,8 +353,9 @@ 
 	 */
 	public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
 	{
-		if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-			$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+		if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
+					$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+		}
 
 		$this->_dataType = $pDataType;
 
@@ -554,10 +556,15 @@ 
 			}
 
 			list($column, $row) = PHPExcel_Cell::coordinateFromString($pCoordinateString);
-			if ($column[0] == '$')	$column = substr($column,1);
-			if ($row[0] == '$')		$row = substr($row,1);
-			if ($worksheet > '')
-				$worksheet .= '!';
+			if ($column[0] == '$') {
+				$column = substr($column,1);
+			}
+			if ($row[0] == '$') {
+				$row = substr($row,1);
+			}
+			if ($worksheet > '') {
+							$worksheet .= '!';
+			}
 			return $worksheet . '$' . $column . '$' . $row;
 		} else {
 			throw new Exception("Coordinate string should not be a cell range.");
@@ -683,8 +690,9 @@ 
 		//		though it's additional memory overhead
 		static $_indexCache = array();
 
-		if (isset($_indexCache[$pString]))
-			return $_indexCache[$pString];
+		if (isset($_indexCache[$pString])) {
+					return $_indexCache[$pString];
+		}
 
 		//	It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
 		//		and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant

app/Vendor/PHPExcel/PHPExcel/Chart/DataSeries.php

Doc Comments +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
 	/**
 	 * Get Plot Grouping Type
 	 *
-	 * @return string
+	 * @return boolean
 	 */
 	public function getPlotGrouping() {
 		return $this->_plotGrouping;
@@ -194,7 +194,7 @@ 
 	/**
 	 * Get Plot Direction
 	 *
-	 * @return string
+	 * @return boolean
 	 */
 	public function getPlotDirection() {
 		return $this->_plotDirection;
@@ -320,7 +320,7 @@ 
 	/**
 	 * Get Smooth Line
 	 *
-	 * @return boolean
+	 * @return string
 	 */
 	public function getSmoothLine() {
 		return $this->_smoothLine;

Indentation +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
 	}
 
 	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotValues as $plotValues) {
+		foreach($this->_plotValues as $plotValues) {
 			$plotValues->refresh($worksheet);
 		}
 	}

Spacing +15 added lines, -15 removed lines

@@ -37,25 +37,25 @@ 
 {
 
 	const TYPE_BARCHART			= 'barChart';
-	const TYPE_BARCHART_3D		= 'bar3DChart';
+	const TYPE_BARCHART_3D = 'bar3DChart';
 	const TYPE_LINECHART		= 'lineChart';
 	const TYPE_LINECHART_3D		= 'line3DChart';
 	const TYPE_AREACHART		= 'areaChart';
 	const TYPE_AREACHART_3D		= 'area3DChart';
 	const TYPE_PIECHART			= 'pieChart';
-	const TYPE_PIECHART_3D		= 'pie3DChart';
-	const TYPE_DOUGHTNUTCHART	= 'doughnutChart';
-	const TYPE_DONUTCHART		= self::TYPE_DOUGHTNUTCHART;	//	Synonym
+	const TYPE_PIECHART_3D = 'pie3DChart';
+	const TYPE_DOUGHTNUTCHART = 'doughnutChart';
+	const TYPE_DONUTCHART = self::TYPE_DOUGHTNUTCHART; //	Synonym
 	const TYPE_SCATTERCHART		= 'scatterChart';
 	const TYPE_SURFACECHART		= 'surfaceChart';
-	const TYPE_SURFACECHART_3D	= 'surface3DChart';
+	const TYPE_SURFACECHART_3D = 'surface3DChart';
 	const TYPE_RADARCHART		= 'radarChart';
-	const TYPE_BUBBLECHART		= 'bubbleChart';
+	const TYPE_BUBBLECHART = 'bubbleChart';
 	const TYPE_STOCKCHART		= 'stockChart';
 
 	const GROUPING_CLUSTERED			= 'clustered';
-	const GROUPING_STACKED				= 'stacked';
-	const GROUPING_PERCENT_STACKED		= 'percentStacked';
+	const GROUPING_STACKED = 'stacked';
+	const GROUPING_PERCENT_STACKED = 'percentStacked';
 	const GROUPING_STANDARD				= 'standard';
 
 	const DIRECTION_BAR			= 'bar';
@@ -234,9 +234,9 @@ 
 	 */
 	public function getPlotLabelByIndex($index) {
 		$keys = array_keys($this->_plotLabel);
-		if (in_array($index,$keys)) {
+		if (in_array($index, $keys)) {
 			return $this->_plotLabel[$index];
-		} elseif(isset($keys[$index])) {
+		} elseif (isset($keys[$index])) {
 			return $this->_plotLabel[$keys[$index]];
 		}
 		return false;
@@ -258,9 +258,9 @@ 
 	 */
 	public function getPlotCategoryByIndex($index) {
 		$keys = array_keys($this->_plotCategory);
-		if (in_array($index,$keys)) {
+		if (in_array($index, $keys)) {
 			return $this->_plotCategory[$index];
-		} elseif(isset($keys[$index])) {
+		} elseif (isset($keys[$index])) {
 			return $this->_plotCategory[$keys[$index]];
 		}
 		return false;
@@ -300,9 +300,9 @@ 
 	 */
 	public function getPlotValuesByIndex($index) {
 		$keys = array_keys($this->_plotValues);
-		if (in_array($index,$keys)) {
+		if (in_array($index, $keys)) {
 			return $this->_plotValues[$index];
-		} elseif(isset($keys[$index])) {
+		} elseif (isset($keys[$index])) {
 			return $this->_plotValues[$keys[$index]];
 		}
 		return false;
@@ -336,7 +336,7 @@ 
 	}
 
 	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotValues as $plotValues) {
+	    foreach ($this->_plotValues as $plotValues) {
 			$plotValues->refresh($worksheet);
 		}
 	}

app/Vendor/PHPExcel/PHPExcel/Chart/DataSeriesValues.php

Doc Comments +4 added lines, -2 removed lines

@@ -80,6 +80,8 @@ 
 
 	/**
 	 * Create a new PHPExcel_Chart_DataSeriesValues object
+	 * @param string $dataType
+	 * @param string $dataSource
 	 */
 	public function __construct($dataType = null, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
 	{
@@ -191,7 +193,7 @@ 
 	/**
 	 * Identify if the Data Series is a multi-level or a simple series
 	 *
-	 * @return	boolean
+	 * @return	boolean|null
 	 */
 	public function isMultiLevelSeries() {
 		if (count($this->_dataValues) > 0) {
@@ -203,7 +205,7 @@ 
 	/**
 	 * Return the level count of a multi-level Data Series
 	 *
-	 * @return	boolean
+	 * @return	integer
 	 */
 	public function multiLevelCount() {
 		$levelCount = 0;

Indentation +5 added lines, -5 removed lines

@@ -258,12 +258,12 @@
 	}
 
 	public function refresh(PHPExcel_Worksheet $worksheet) {
-        if ($this->_dataSource !== NULL) {
-        	$calcEngine = PHPExcel_Calculation::getInstance();
+		if ($this->_dataSource !== NULL) {
+			$calcEngine = PHPExcel_Calculation::getInstance();
 			$this->_dataValues = PHPExcel_Calculation::_unwrapResult(
-			    $calcEngine->_calculateFormulaValue(
-			        $this->_dataSource
-			    )
+				$calcEngine->_calculateFormulaValue(
+					$this->_dataSource
+				)
 			);
 		}
 	}

Spacing +2 added lines, -2 removed lines

@@ -207,8 +207,8 @@
 	 */
 	public function multiLevelCount() {
 		$levelCount = 0;
-		foreach($this->_dataValues as $dataValueSet) {
-			$levelCount = max($levelCount,count($dataValueSet));
+		foreach ($this->_dataValues as $dataValueSet) {
+			$levelCount = max($levelCount, count($dataValueSet));
 		}
 		return $levelCount;
 	}

app/Vendor/PHPExcel/PHPExcel/Chart/Layout.php

Doc Comments +4 added lines, -4 removed lines

@@ -156,7 +156,7 @@ 
 	/**
 	 * Get X-Position
 	 *
-	 * @return number
+	 * @return double
 	 */
 	public function getXPosition() {
 		return $this->_xPos;
@@ -174,7 +174,7 @@ 
 	/**
 	 * Get Y-Position
 	 *
-	 * @return number
+	 * @return double
 	 */
 	public function getYPosition() {
 		return $this->_yPos;
@@ -192,7 +192,7 @@ 
 	/**
 	 * Get Width
 	 *
-	 * @return number
+	 * @return double
 	 */
 	public function getWidth() {
 		return $this->_width;
@@ -210,7 +210,7 @@ 
 	/**
 	 * Get Height
 	 *
-	 * @return number
+	 * @return double
 	 */
 	public function getHeight() {
 		return $this->_height;

Spacing +14 added lines, -14 removed lines

@@ -47,56 +47,56 @@
 	 *
 	 * @var string
 	 */
-	private $_xMode		= null;
+	private $_xMode = null;
 
 	/**
 	 * Y Mode
 	 *
 	 * @var string
 	 */
-	private $_yMode		= null;
+	private $_yMode = null;
 
 	/**
 	 * X-Position
 	 *
 	 * @var float
 	 */
-	private $_xPos		= null;
+	private $_xPos = null;
 
 	/**
 	 * Y-Position
 	 *
 	 * @var float
 	 */
-	private $_yPos		= null;
+	private $_yPos = null;
 
 	/**
 	 * width
 	 *
 	 * @var float
 	 */
-	private $_width		= null;
+	private $_width = null;
 
 	/**
 	 * height
 	 *
 	 * @var float
 	 */
-	private $_height	= null;
+	private $_height = null;
 
 
 	/**
 	 * Create a new PHPExcel_Chart_Layout
 	 */
-	public function __construct($layout=array())
+	public function __construct($layout = array())
 	{
-		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
-		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
-		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
-		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
-		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
-		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
-		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
+		if (isset($layout['layoutTarget'])) { $this->_layoutTarget = $layout['layoutTarget']; }
+		if (isset($layout['xMode'])) { $this->_xMode			= $layout['xMode']; }
+		if (isset($layout['yMode'])) { $this->_yMode			= $layout['yMode']; }
+		if (isset($layout['x'])) { $this->_xPos			= (float) $layout['x']; }
+		if (isset($layout['y'])) { $this->_yPos			= (float) $layout['y']; }
+		if (isset($layout['w'])) { $this->_width			= (float) $layout['w']; }
+		if (isset($layout['h'])) { $this->_height		= (float) $layout['h']; }
 	}
 
 	/**