reginaldojunior / winners

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/Renderer/jpgraph.php

Doc Comments +59 added lines

@@ -71,6 +71,9 @@ 
 	private static $_plotMark	= 0;
 
 
+	/**
+	 * @param string $markerID
+	 */
 	private function _formatPointMarker($seriesPlot,$markerID) {
 		$plotMarkKeys = array_keys(self::$_markSet);
 		if (is_null($markerID)) {
@@ -132,6 +135,9 @@ 
 	}	//	function _formatDataSetLabels()
 
 
+	/**
+	 * @param integer $seriesCount
+	 */
 	private function _percentageSumCalculation($groupID,$seriesCount) {
 		//	Adjust our values to a percentage value across all series in the group
 		for($i = 0; $i < $seriesCount; ++$i) {
@@ -162,6 +168,9 @@ 
 	}	//	function _percentageAdjustValues()
 
 
+	/**
+	 * @param PHPExcel_Chart_Title $captionElement
+	 */
 	private function _getCaption($captionElement) {
 		//	Read any caption
 		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
@@ -263,6 +272,9 @@ 
 	}	//	function _renderRadarPlotArea()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 
@@ -325,6 +337,9 @@ 
 	}	//	function _renderPlotLine()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotBar($groupID, $dimensions = '2d') {
 		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
 		//	Rotate for bar rather than column chart
@@ -409,6 +424,10 @@ 
 	}	//	function _renderPlotBar()
 
 
+	/**
+	 * @param integer $groupID
+	 * @param boolean $bubble
+	 */
 	private function _renderPlotScatter($groupID,$bubble) {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -454,6 +473,9 @@ 
 	}	//	function _renderPlotScatter()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotRadar($groupID) {
 		$radarStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -492,6 +514,9 @@ 
 	}	//	function _renderPlotRadar()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotContour($groupID) {
 		$contourStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -512,6 +537,9 @@ 
 	}	//	function _renderPlotContour()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotStock($groupID) {
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$plotOrder = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
@@ -533,6 +561,9 @@ 
 	}	//	function _renderPlotStock()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderAreaChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_line.php');
 
@@ -544,6 +575,9 @@ 
 	}	//	function _renderAreaChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderLineChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_line.php');
 
@@ -555,6 +589,9 @@ 
 	}	//	function _renderLineChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderBarChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_bar.php');
 
@@ -566,6 +603,9 @@ 
 	}	//	function _renderBarChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderScatterChart($groupCount) {
 		require_once('jpgraph_scatter.php');
 		require_once('jpgraph_regstat.php');
@@ -579,6 +619,9 @@ 
 	}	//	function _renderScatterChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderBubbleChart($groupCount) {
 		require_once('jpgraph_scatter.php');
 
@@ -590,6 +633,9 @@ 
 	}	//	function _renderBubbleChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderPieChart($groupCount, $dimensions = '2d', $doughnut = False, $multiplePlots = False) {
 		require_once('jpgraph_pie.php');
 		if ($dimensions == '3d') {
@@ -663,6 +709,9 @@ 
 	}	//	function _renderPieChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderRadarChart($groupCount) {
 		require_once('jpgraph_radar.php');
 
@@ -674,6 +723,9 @@ 
 	}	//	function _renderRadarChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderStockChart($groupCount) {
 		require_once('jpgraph_stock.php');
 
@@ -685,6 +737,10 @@ 
 	}	//	function _renderStockChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 * @param string|null $dimensions
+	 */
 	private function _renderContourChart($groupCount,$dimensions) {
 		require_once('jpgraph_contour.php');
 
@@ -696,6 +752,9 @@ 
 	}	//	function _renderContourChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
 		require_once('jpgraph_line.php');
 		require_once('jpgraph_bar.php');

Spacing +111 added lines, -111 removed lines

@@ -39,18 +39,18 @@ 
  */
 class PHPExcel_Chart_Renderer_jpgraph
 {
-	private static $_width	= 640;
+	private static $_width = 640;
 
-	private static $_height	= 480;
+	private static $_height = 480;
 
-	private static $_colourSet = array( 'mediumpurple1',	'palegreen3',	'gold1',		'cadetblue1',
-										'darkmagenta',		'coral',		'dodgerblue3',	'eggplant',
-										'mediumblue',		'magenta',		'sandybrown',	'cyan',
-										'firebrick1',		'forestgreen',	'deeppink4',	'darkolivegreen',
+	private static $_colourSet = array('mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+										'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+										'mediumblue', 'magenta', 'sandybrown', 'cyan',
+										'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
 										'goldenrod2'
 									  );
 
-	private static $_markSet = array(	'diamond'	=> MARK_DIAMOND,
+	private static $_markSet = array('diamond'	=> MARK_DIAMOND,
 										'square'	=> MARK_SQUARE,
 										'triangle'	=> MARK_UTRIANGLE,
 										'x'			=> MARK_X,
@@ -66,12 +66,12 @@ 
 
 	private $_graph	= null;
 
-	private static $_plotColour	= 0;
+	private static $_plotColour = 0;
 
-	private static $_plotMark	= 0;
+	private static $_plotMark = 0;
 
 
-	private function _formatPointMarker($seriesPlot,$markerID) {
+	private function _formatPointMarker($seriesPlot, $markerID) {
 		$plotMarkKeys = array_keys(self::$_markSet);
 		if (is_null($markerID)) {
 			//	Use default plot marker (next marker in the series)
@@ -98,15 +98,15 @@ 
 	}	//	function _formatPointMarker()
 
 
-	private function _formatDataSetLabels($groupID,$datasetLabels,$rotation = '') {
+	private function _formatDataSetLabels($groupID, $datasetLabels, $rotation = '') {
 		$datasetLabelFormatCode = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-		if (!is_null($datasetLabelFormatCode)) {
+		if ( ! is_null($datasetLabelFormatCode)) {
 			//	Retrieve any label formatting code
 			$datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
 		}
 
 		$testCurrentIndex = 0;
-		foreach($datasetLabels as $i => $datasetLabel) {
+		foreach ($datasetLabels as $i => $datasetLabel) {
 			//	Fill in any missing values in the $datasetLabels array
 			while ($i != $testCurrentIndex) {
 				$datasetLabels[$testCurrentIndex] = '';
@@ -115,14 +115,14 @@ 
 			if (is_array($datasetLabel)) {
 				if ($rotation == 'bar') {
 					$datasetLabel = array_reverse($datasetLabel);
-					$datasetLabels[$i] = implode(" ",$datasetLabel);
+					$datasetLabels[$i] = implode(" ", $datasetLabel);
 				} else {
-					$datasetLabels[$i] = implode("\n",$datasetLabel);
+					$datasetLabels[$i] = implode("\n", $datasetLabel);
 				}
 			} else {
 				//	Format labels according to any formatting code
-				if (!is_null($datasetLabelFormatCode)) {
-					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel,$datasetLabelFormatCode);
+				if ( ! is_null($datasetLabelFormatCode)) {
+					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
 				}
 			}
 			++$testCurrentIndex;
@@ -132,14 +132,14 @@ 
 	}	//	function _formatDataSetLabels()
 
 
-	private function _percentageSumCalculation($groupID,$seriesCount) {
+	private function _percentageSumCalculation($groupID, $seriesCount) {
 		//	Adjust our values to a percentage value across all series in the group
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			if ($i == 0) {
 				$sumValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			} else {
 				$nextValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-				foreach($nextValues as $k => $value) {
+				foreach ($nextValues as $k => $value) {
 					if (isset($sumValues[$k])) {
 						$sumValues[$k] += $value;
 					} else {
@@ -153,8 +153,8 @@ 
 	}	//	function _percentageSumCalculation()
 
 
-	private function _percentageAdjustValues($dataValues,$sumValues) {
-		foreach($dataValues as $k => $dataValue) {
+	private function _percentageAdjustValues($dataValues, $sumValues) {
+		foreach ($dataValues as $k => $dataValue) {
 			$dataValues[$k] = $dataValue / $sumValues[$k] * 100;
 		}
 
@@ -164,13 +164,13 @@ 
 
 	private function _getCaption($captionElement) {
 		//	Read any caption
-		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
+		$caption = ( ! is_null($captionElement)) ? $captionElement->getCaption() : NULL;
 		//	Test if we have a title caption to display
-		if (!is_null($caption)) {
+		if ( ! is_null($caption)) {
 			//	If we do, it could be a plain string or an array
 			if (is_array($caption)) {
 				//	Implode an array to a plain string
-				$caption = implode('',$caption);
+				$caption = implode('', $caption);
 			}
 		}
 		return $caption;
@@ -179,7 +179,7 @@ 
 
 	private function _renderTitle() {
 		$title = $this->_getCaption($this->_chart->getTitle());
-		if (!is_null($title)) {
+		if ( ! is_null($title)) {
 			$this->_graph->title->Set($title);
 		}
 	}	//	function _renderTitle()
@@ -187,32 +187,32 @@ 
 
 	private function _renderLegend() {
 		$legend = $this->_chart->getLegend();
-		if (!is_null($legend)) {
+		if ( ! is_null($legend)) {
 			$legendPosition = $legend->getPosition();
 			$legendOverlay = $legend->getOverlay();
 			switch ($legendPosition) {
 				case 'r'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'right','center');	//	right
+					$this->_graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //	right
 					break;
 				case 'l'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'left','center');	//	left
+					$this->_graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //	left
 					break;
 				case 't'	:
-					$this->_graph->legend->SetPos(0.5,0.01,'center','top');	//	top
+					$this->_graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //	top
 					break;
 				case 'b'	:
-					$this->_graph->legend->SetPos(0.5,0.99,'center','bottom');	//	bottom
+					$this->_graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //	bottom
 					break;
 				default		:
-					$this->_graph->legend->SetPos(0.01,0.01,'right','top');	//	top-right
+					$this->_graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //	top-right
 					break;
 			}
 		}
 	}	//	function _renderLegend()
 
 
-	private function _renderCartesianPlotArea($type='textlin') {
-		$this->_graph = new Graph(self::$_width,self::$_height);
+	private function _renderCartesianPlotArea($type = 'textlin') {
+		$this->_graph = new Graph(self::$_width, self::$_height);
 		$this->_graph->SetScale($type);
 
 		$this->_renderTitle();
@@ -222,10 +222,10 @@ 
 		$reverse = ($rotation == 'bar') ? true : false;
 
 		$xAxisLabel = $this->_chart->getXAxisLabel();
-		if (!is_null($xAxisLabel)) {
+		if ( ! is_null($xAxisLabel)) {
 			$title = $this->_getCaption($xAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->xaxis->SetTitle($title,'center');
+			if ( ! is_null($title)) {
+				$this->_graph->xaxis->SetTitle($title, 'center');
 				$this->_graph->xaxis->title->SetMargin(35);
 				if ($reverse) {
 					$this->_graph->xaxis->title->SetAngle(90);
@@ -235,10 +235,10 @@ 
 		}
 
 		$yAxisLabel = $this->_chart->getYAxisLabel();
-		if (!is_null($yAxisLabel)) {
+		if ( ! is_null($yAxisLabel)) {
 			$title = $this->_getCaption($yAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->yaxis->SetTitle($title,'center');
+			if ( ! is_null($title)) {
+				$this->_graph->yaxis->SetTitle($title, 'center');
 				if ($reverse) {
 					$this->_graph->yaxis->title->SetAngle(0);
 					$this->_graph->yaxis->title->SetMargin(-55);
@@ -249,14 +249,14 @@ 
 
 
 	private function _renderPiePlotArea($doughnut = False) {
-		$this->_graph = new PieGraph(self::$_width,self::$_height);
+		$this->_graph = new PieGraph(self::$_width, self::$_height);
 
 		$this->_renderTitle();
 	}	//	function _renderPiePlotArea()
 
 
 	private function _renderRadarPlotArea() {
-		$this->_graph = new RadarGraph(self::$_width,self::$_height);
+		$this->_graph = new RadarGraph(self::$_width, self::$_height);
 		$this->_graph->SetScale('lin');
 
 		$this->_renderTitle();
@@ -268,29 +268,29 @@ 
 
 		$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
 		if (count($datasetLabels) > 0) {
-			$datasetLabels = $this->_formatDataSetLabels($groupID,$datasetLabels);
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels);
 			$this->_graph->xaxis->SetTickLabels($datasetLabels);
 		}
 
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$seriesPlots = array();
 		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+			$sumValues = $this->_percentageSumCalculation($groupID, $seriesCount);
 		}
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
 
 			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+				$dataValues = $this->_percentageAdjustValues($dataValues, $sumValues);
 			}
 
 			//	Fill in any missing values in the $dataValues array
 			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
+			foreach ($dataValues as $k => $dataValue) {
+				while ($k != $testCurrentIndex) {
 					$dataValues[$testCurrentIndex] = null;
 					++$testCurrentIndex;
 				}
@@ -308,7 +308,7 @@ 
 				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
 			} else {
 				//	Set the appropriate plot marker
-				$this->_formatPointMarker($seriesPlot,$marker);
+				$this->_formatPointMarker($seriesPlot, $marker);
 			}
 			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
 			$seriesPlot->SetLegend($dataLabel);
@@ -335,12 +335,12 @@ 
 
 		$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
 		if (count($datasetLabels) > 0) {
-			$datasetLabels = $this->_formatDataSetLabels($groupID,$datasetLabels,$rotation);
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $rotation);
 			//	Rotate for bar rather than column chart
 			if ($rotation == 'bar') {
 				$datasetLabels = array_reverse($datasetLabels);
 				$this->_graph->yaxis->SetPos('max');
-				$this->_graph->yaxis->SetLabelAlign('center','top');
+				$this->_graph->yaxis->SetLabelAlign('center', 'top');
 				$this->_graph->yaxis->SetLabelSide(SIDE_RIGHT);
 			}
 			$this->_graph->xaxis->SetTickLabels($datasetLabels);
@@ -350,20 +350,20 @@ 
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$seriesPlots = array();
 		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+			$sumValues = $this->_percentageSumCalculation($groupID, $seriesCount);
 		}
 
 		//	Loop through each data series in turn
-		for($j = 0; $j < $seriesCount; ++$j) {
+		for ($j = 0; $j < $seriesCount; ++$j) {
 			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
 			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+				$dataValues = $this->_percentageAdjustValues($dataValues, $sumValues);
 			}
 
 			//	Fill in any missing values in the $dataValues array
 			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
+			foreach ($dataValues as $k => $dataValue) {
+				while ($k != $testCurrentIndex) {
 					$dataValues[$testCurrentIndex] = null;
 					++$testCurrentIndex;
 				}
@@ -380,7 +380,7 @@ 
 			if ($dimensions == '3d') {
 				$seriesPlot->SetShadow();
 			}
-			if (!$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
+			if ( ! $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
 				$dataLabel = '';
 			} else {
 				$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
@@ -390,7 +390,7 @@ 
 			$seriesPlots[] = $seriesPlot;
 		}
 		//	Reverse the plot order for bar rather than column chart
-		if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
+		if (($rotation == 'bar') && ( ! ($grouping == 'percentStacked'))) {
 			$seriesPlots = array_reverse($seriesPlots);
 		}
 
@@ -409,7 +409,7 @@ 
 	}	//	function _renderPlotBar()
 
 
-	private function _renderPlotScatter($groupID,$bubble) {
+	private function _renderPlotScatter($groupID, $bubble) {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -417,34 +417,34 @@ 
 		$seriesPlots = array();
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesY as $k => $dataValueY) {
+			foreach ($dataValuesY as $k => $dataValueY) {
 				$dataValuesY[$k] = $k;
 			}
 
-			$seriesPlot = new ScatterPlot($dataValuesX,$dataValuesY);
+			$seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
 			if ($scatterStyle == 'lineMarker') {
 				$seriesPlot->SetLinkPoints();
 				$seriesPlot->link->SetColor(self::$_colourSet[self::$_plotColour]);
 			} elseif ($scatterStyle == 'smoothMarker') {
-				$spline = new Spline($dataValuesY,$dataValuesX);
-				list($splineDataY,$splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
-				$lplot = new LinePlot($splineDataX,$splineDataY);
+				$spline = new Spline($dataValuesY, $dataValuesX);
+				list($splineDataY, $splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
+				$lplot = new LinePlot($splineDataX, $splineDataY);
 				$lplot->SetColor(self::$_colourSet[self::$_plotColour]);
 
 				$this->_graph->Add($lplot);
 			}
 
 			if ($bubble) {
-				$this->_formatPointMarker($seriesPlot,'dot');
+				$this->_formatPointMarker($seriesPlot, 'dot');
 				$seriesPlot->mark->SetColor('black');
 				$seriesPlot->mark->SetSize($bubbleSize);
 			} else {
 				$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-				$this->_formatPointMarker($seriesPlot,$marker);
+				$this->_formatPointMarker($seriesPlot, $marker);
 			}
 			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
 			$seriesPlot->SetLegend($dataLabel);
@@ -461,14 +461,14 @@ 
 		$seriesPlots = array();
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
 
 			$dataValues = array();
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValues[$k] = implode(' ',array_reverse($dataValueY));
+			foreach ($dataValuesY as $k => $dataValueY) {
+				$dataValues[$k] = implode(' ', array_reverse($dataValueY));
 			}
 			$tmp = array_shift($dataValues);
 			$dataValues[] = $tmp;
@@ -484,7 +484,7 @@ 
 			if ($radarStyle == 'filled') {
 				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour]);
 			}
-			$this->_formatPointMarker($seriesPlot,$marker);
+			$this->_formatPointMarker($seriesPlot, $marker);
 			$seriesPlot->SetLegend($dataLabel);
 
 			$this->_graph->Add($seriesPlot);
@@ -500,7 +500,7 @@ 
 
 		$dataValues = array();
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
@@ -519,11 +519,11 @@ 
 
 		$dataValues = array();
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesX as $j => $dataValueX)
+			foreach ($dataValuesX as $j => $dataValueX)
 			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
 		}
 
@@ -538,8 +538,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,True,False,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i, True, False, $dimensions);
 		}
 	}	//	function _renderAreaChart()
 
@@ -549,8 +549,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,False,False,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i, False, False, $dimensions);
 		}
 	}	//	function _renderLineChart()
 
@@ -560,8 +560,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotBar($i,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotBar($i, $dimensions);
 		}
 	}	//	function _renderBarChart()
 
@@ -573,8 +573,8 @@ 
 
 		$this->_renderCartesianPlotArea('linlin');
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,false);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i, false);
 		}
 	}	//	function _renderScatterChart()
 
@@ -584,8 +584,8 @@ 
 
 		$this->_renderCartesianPlotArea('linlin');
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,true);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i, true);
 		}
 	}	//	function _renderBubbleChart()
 
@@ -599,13 +599,13 @@ 
 		$this->_renderPiePlotArea($doughnut);
 
 		$iLimit = ($multiplePlots) ? $groupCount : 1;
-		for($i = 0; $i < $iLimit; ++$i) {
+		for ($i = 0; $i < $iLimit; ++$i) {
 			$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotGrouping();
 			$exploded = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotStyle();
 			if ($i == 0) {
 				$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotCategoryByIndex(0)->getDataValues();
 				if (count($datasetLabels) > 0) {
-					$datasetLabels = $this->_formatDataSetLabels($i,$datasetLabels);
+					$datasetLabels = $this->_formatDataSetLabels($i, $datasetLabels);
 				}
 			}
 
@@ -614,13 +614,13 @@ 
 			//	For pie charts, we only display the first series: doughnut charts generally display all series
 			$jLimit = ($multiplePlots) ? $seriesCount : 1;
 			//	Loop through each data series in turn
-			for($j = 0; $j < $jLimit; ++$j) {
+			for ($j = 0; $j < $jLimit; ++$j) {
 				$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotValuesByIndex($j)->getDataValues();
 
 				//	Fill in any missing values in the $dataValues array
 				$testCurrentIndex = 0;
-				foreach($dataValues as $k => $dataValue) {
-					while($k != $testCurrentIndex) {
+				foreach ($dataValues as $k => $dataValue) {
+					while ($k != $testCurrentIndex) {
 						$dataValues[$testCurrentIndex] = null;
 						++$testCurrentIndex;
 					}
@@ -638,7 +638,7 @@ 
 				}
 
 				if ($multiplePlots) {
-					$seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+					$seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
 				}
 
 				if ($doughnut) {
@@ -646,7 +646,7 @@ 
 				}
 
 				$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-				$seriesPlot->SetLabels(array_fill(0,count($datasetLabels),''));
+				$seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
 				if ($dimensions != '3d') {
 					$seriesPlot->SetGuideLines(false);
 				}
@@ -668,7 +668,7 @@ 
 
 		$this->_renderRadarPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotRadar($i);
 		}
 	}	//	function _renderRadarChart()
@@ -679,24 +679,24 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotStock($i);
 		}
 	}	//	function _renderStockChart()
 
 
-	private function _renderContourChart($groupCount,$dimensions) {
+	private function _renderContourChart($groupCount, $dimensions) {
 		require_once('jpgraph_contour.php');
 
 		$this->_renderCartesianPlotArea('intint');
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotContour($i);
 		}
 	}	//	function _renderContourChart()
 
 
-	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
+	private function _renderCombinationChart($groupCount, $dimensions, $outputDestination) {
 		require_once('jpgraph_line.php');
 		require_once('jpgraph_bar.php');
 		require_once('jpgraph_scatter.php');
@@ -705,30 +705,30 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$dimensions = null;
 			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
 			switch ($chartType) {
 				case 'area3DChart' :
 					$dimensions = '3d';
 				case 'areaChart' :
-					$this->_renderPlotLine($i,True,True,$dimensions);
+					$this->_renderPlotLine($i, True, True, $dimensions);
 					break;
 				case 'bar3DChart' :
 					$dimensions = '3d';
 				case 'barChart' :
-					$this->_renderPlotBar($i,$dimensions);
+					$this->_renderPlotBar($i, $dimensions);
 					break;
 				case 'line3DChart' :
 					$dimensions = '3d';
 				case 'lineChart' :
-					$this->_renderPlotLine($i,False,True,$dimensions);
+					$this->_renderPlotLine($i, False, True, $dimensions);
 					break;
 				case 'scatterChart' :
-					$this->_renderPlotScatter($i,false);
+					$this->_renderPlotScatter($i, false);
 					break;
 				case 'bubbleChart' :
-					$this->_renderPlotScatter($i,true);
+					$this->_renderPlotScatter($i, true);
 					break;
 				default	:
 					$this->_graph = null;
@@ -751,7 +751,7 @@ 
 			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
 		} else {
 			$chartTypes = array();
-			for($i = 0; $i < $groupCount; ++$i) {
+			for ($i = 0; $i < $groupCount; ++$i) {
 				$chartTypes[] = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
 			}
 			$chartTypes = array_unique($chartTypes);
@@ -761,7 +761,7 @@ 
 				echo 'Chart is not yet implemented<br />';
 				return false;
 			} else {
-				return $this->_renderCombinationChart($groupCount,$dimensions,$outputDestination);
+				return $this->_renderCombinationChart($groupCount, $dimensions, $outputDestination);
 			}
 		}
 
@@ -769,27 +769,27 @@ 
 			case 'area3DChart' :
 				$dimensions = '3d';
 			case 'areaChart' :
-				$this->_renderAreaChart($groupCount,$dimensions);
+				$this->_renderAreaChart($groupCount, $dimensions);
 				break;
 			case 'bar3DChart' :
 				$dimensions = '3d';
 			case 'barChart' :
-				$this->_renderBarChart($groupCount,$dimensions);
+				$this->_renderBarChart($groupCount, $dimensions);
 				break;
 			case 'line3DChart' :
 				$dimensions = '3d';
 			case 'lineChart' :
-				$this->_renderLineChart($groupCount,$dimensions);
+				$this->_renderLineChart($groupCount, $dimensions);
 				break;
 			case 'pie3DChart' :
 				$dimensions = '3d';
 			case 'pieChart' :
-				$this->_renderPieChart($groupCount,$dimensions,False,False);
+				$this->_renderPieChart($groupCount, $dimensions, False, False);
 				break;
 			case 'doughnut3DChart' :
 				$dimensions = '3d';
 			case 'doughnutChart' :
-				$this->_renderPieChart($groupCount,$dimensions,True,True);
+				$this->_renderPieChart($groupCount, $dimensions, True, True);
 				break;
 			case 'scatterChart' :
 				$this->_renderScatterChart($groupCount);
@@ -803,10 +803,10 @@ 
 			case 'surface3DChart' :
 				$dimensions = '3d';
 			case 'surfaceChart' :
-				$this->_renderContourChart($groupCount,$dimensions);
+				$this->_renderContourChart($groupCount, $dimensions);
 				break;
 			case 'stockChart' :
-				$this->_renderStockChart($groupCount,$dimensions);
+				$this->_renderStockChart($groupCount, $dimensions);
 				break;
 			default	:
 				echo $chartType.' is not yet implemented<br />';

Braces +3 added lines, -2 removed lines

@@ -523,8 +523,9 @@
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesX as $j => $dataValueX)
-			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
+			foreach($dataValuesX as $j => $dataValueX) {
+						$dataValues[$j][$plotOrder[$i]] = $dataValueX;
+			}
 		}
 
 		$seriesPlot = new StockPlot($dataValues);

app/Vendor/PHPExcel/PHPExcel/IOFactory.php

Doc Comments +3 added lines, -3 removed lines

@@ -184,7 +184,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	PHPExcel
 	 * @throws	Exception
 	 */
@@ -198,7 +198,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	string
 	 * @throws	Exception
 	 */
@@ -215,7 +215,7 @@ 
 	 *
 	 * @static
 	 * @access	public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	PHPExcel_Reader_IReader
 	 * @throws	Exception
 	 */

Indentation +9 added lines, -9 removed lines

@@ -73,18 +73,18 @@
 		'CSV',
 	);
 
-    /**
-     *	Private constructor for PHPExcel_IOFactory
-     */
-    private function __construct() { }
+	/**
+	 *	Private constructor for PHPExcel_IOFactory
+	 */
+	private function __construct() { }
 
-    /**
-     * Get search locations
-     *
+	/**
+	 * Get search locations
+	 *
 	 * @static
 	 * @access	public
-     * @return	array
-     */
+	 * @return	array
+	 */
 	public static function getSearchLocations() {
 		return self::$_searchLocations;
 	}	//	function getSearchLocations()

Spacing +7 added lines, -7 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');
 }
 
 /**
@@ -52,8 +52,8 @@ 
 	 * @static
 	 */
 	private static $_searchLocations = array(
-		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
-		array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
+		array('type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}'),
+		array('type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}')
 	);
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
 	 */
 	public static function addSearchLocation($type = '', $location = '', $classname = '') {
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+		self::$_searchLocations[] = array('type' => $type, 'path' => $location, 'class' => $classname);
 	}	//	function addSearchLocation()
 
 	/**
@@ -205,7 +205,7 @@ 
 	public static function identify($pFilename) {
 		$reader = self::createReaderForFile($pFilename);
 		$className = get_class($reader);
-		$classType = explode('_',$className);
+		$classType = explode('_', $className);
 		unset($reader);
 		return array_pop($classType);
 	}	//	function identify()

app/Vendor/PHPExcel/PHPExcel/Reader/CSV.php

Doc Comments +2 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @access	public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return boolean
 	 * @throws Exception
 	 */
@@ -479,7 +479,6 @@ 
 	 * Set Contiguous
 	 *
 	 * @access	public
-	 * @param string $pValue Input encoding
 	 */
 	public function setContiguous($contiguous = false)
 	{
@@ -496,7 +495,7 @@ 
 	 * Get Contiguous
 	 *
 	 * @access	public
-	 * @return boolean
+	 * @return integer
 	 */
 	public function getContiguous() {
 		return $this->_contiguous;

Spacing +28 added lines, -28 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');
 }
 
 /**
@@ -50,7 +50,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_inputEncoding	= 'UTF-8';
+	private $_inputEncoding = 'UTF-8';
 
 	/**
 	 * Delimiter
@@ -58,7 +58,7 @@ 
 	 * @access	private
 	 * @var string
 	 */
-	private $_delimiter		= ',';
+	private $_delimiter = ',';
 
 	/**
 	 * Enclosure
@@ -66,7 +66,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_enclosure		= '"';
+	private $_enclosure = '"';
 
 	/**
 	 * Line ending
@@ -74,7 +74,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_lineEnding	= PHP_EOL;
+	private $_lineEnding = PHP_EOL;
 
 	/**
 	 * Sheet index to read
@@ -82,7 +82,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_sheetIndex	= 0;
+	private $_sheetIndex = 0;
 
 	/**
 	 * Load rows contiguously
@@ -90,7 +90,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_contiguous	= false;
+	private $_contiguous = false;
 
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_contiguousRow	= -1;
+	private $_contiguousRow = -1;
 
 	/**
 	 * PHPExcel_Reader_IReadFilter instance
@@ -114,7 +114,7 @@ 
 	 * Create a new PHPExcel_Reader_CSV
 	 */
 	public function __construct() {
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}	//	function __construct()
 
 
@@ -129,8 +129,8 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		return true;
@@ -195,14 +195,14 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Open file
 		$fileHandle = fopen($pFilename, 'r');
 		if ($fileHandle === false) {
-			throw new Exception("Could not open file " . $pFilename . " for reading.");
+			throw new Exception("Could not open file ".$pFilename." for reading.");
 		}
 
 		// Skip BOM, if any
@@ -231,7 +231,7 @@ 
 				break;
 		}
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
+		$escapeEnclosures = array("\\".$this->_enclosure, $this->_enclosure.$this->_enclosure);
 
 		$worksheetInfo = array();
 		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
@@ -286,15 +286,15 @@ 
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Create new PHPExcel
 		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
 			$objPHPExcel->createSheet();
 		}
-		$sheet = $objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+		$sheet = $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
 
 		$lineEnding = ini_get('auto_detect_line_endings');
 		ini_set('auto_detect_line_endings', true);
@@ -331,20 +331,20 @@ 
 				break;
 		}
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
-								   $this->_enclosure . $this->_enclosure
+		$escapeEnclosures = array("\\".$this->_enclosure,
+								   $this->_enclosure.$this->_enclosure
 								 );
 
 		// Set our starting row based on whether we're in contiguous mode or not
 		$currentRow = 1;
 		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
+			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow() : $this->_contiguousRow;
 		}
 
 		// Loop through each line of the file in turn
 		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
 			$columnLetter = 'A';
-			foreach($rowData as $rowDatum) {
+			foreach ($rowData as $rowDatum) {
 				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
 					// Unescape enclosures
 					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
@@ -355,7 +355,7 @@ 
 					}
 
 					// Set cell value
-					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+					$sheet->getCell($columnLetter.$currentRow)->setValue($rowDatum);
 				}
 				++$columnLetter;
 			}
@@ -483,9 +483,9 @@ 
 	 */
 	public function setContiguous($contiguous = false)
 	{
-		$this->_contiguous = (bool)$contiguous;
-		if (!$contiguous) {
-			$this->_contiguousRow	= -1;
+		$this->_contiguous = (bool) $contiguous;
+		if ( ! $contiguous) {
+			$this->_contiguousRow = -1;
 		}
 
 		return $this;

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2003XML.php

Doc Comments +7 added lines, -1 removed lines

@@ -172,7 +172,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -342,6 +342,9 @@ 
 	}
 
 
+	/**
+	 * @param string $styleAttributeValue
+	 */
 	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
 		foreach($styleList as $style) {
@@ -887,6 +890,9 @@ 
 	}
 
 
+	/**
+	 * @param string $charset
+	 */
 	private static function _convertStringEncoding($string,$charset) {
 		if ($charset != 'UTF-8') {
 			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);

Spacing +98 added lines, -98 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');
 }
 
 /**
@@ -84,7 +84,7 @@ 
 	 * Create a new PHPExcel_Reader_Excel2003XML
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}
 
 
@@ -195,8 +195,8 @@ 
 			);
 
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Read sample data (first 2 KB will do)
@@ -205,7 +205,7 @@ 
 		fclose($fh);
 
 		$valid = true;
-		foreach($signature as $match) {
+		foreach ($signature as $match) {
 			// every part of the signature must be present
 			if (strpos($data, $match) === false) {
 				$valid = false;
@@ -214,7 +214,7 @@ 
 		}
 
 		//	Retrieve charset encoding
-		if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
+		if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
 			$this->_charSet = strtoupper($matches[1]);
 		}
 //		echo 'Character Set is ',$this->_charSet,'<br />';
@@ -232,11 +232,11 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		if ( ! $this->canRead($pFilename)) {
+			throw new Exception($pFilename." is an Invalid Spreadsheet file.");
 		}
 
 		$worksheetNames = array();
@@ -245,9 +245,9 @@ 
 		$namespaces = $xml->getNamespaces(true);
 
 		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'], $this->_charSet);
 		}
 
 		return $worksheetNames;
@@ -263,8 +263,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetInfo = array();
@@ -274,7 +274,7 @@ 
 
 		$worksheetID = 1;
 		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
 			$tmpInfo = array();
@@ -293,11 +293,11 @@ 
 			if (isset($worksheet->Table->Row)) {
 				$rowIndex = 0;
 
-				foreach($worksheet->Table->Row as $rowData) {
+				foreach ($worksheet->Table->Row as $rowData) {
 					$columnIndex = 0;
 					$rowHasData = false;
 
-					foreach($rowData->Cell as $cell) {
+					foreach ($rowData->Cell as $cell) {
 						if (isset($cell->Data)) {
 							$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
 							$rowHasData = true;
@@ -342,9 +342,9 @@ 
 	}
 
 
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+	private static function identifyFixedStyleValue($styleList, &$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
+		foreach ($styleList as $style) {
 			if ($styleAttributeValue == strtolower($style)) {
 				$styleAttributeValue = $style;
 				return true;
@@ -396,23 +396,23 @@ 
 	 */
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
+		$fromFormats = array('\-', '\ ');
+		$toFormats = array('-', ' ');
 
-		$underlineStyles = array (
+		$underlineStyles = array(
 				PHPExcel_Style_Font::UNDERLINE_NONE,
 				PHPExcel_Style_Font::UNDERLINE_DOUBLE,
 				PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
 				PHPExcel_Style_Font::UNDERLINE_SINGLE,
 				PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
 			);
-		$verticalAlignmentStyles = array (
+		$verticalAlignmentStyles = array(
 				PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
 				PHPExcel_Style_Alignment::VERTICAL_TOP,
 				PHPExcel_Style_Alignment::VERTICAL_CENTER,
 				PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
 			);
-		$horizontalAlignmentStyles = array (
+		$horizontalAlignmentStyles = array(
 				PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
 				PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
 				PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
@@ -426,12 +426,12 @@ 
 
 
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		if ( ! $this->canRead($pFilename)) {
+			throw new Exception($pFilename." is an Invalid Spreadsheet file.");
 		}
 
 		$xml = simplexml_load_file($pFilename);
@@ -439,52 +439,52 @@ 
 
 		$docProps = $objPHPExcel->getProperties();
 		if (isset($xml->DocumentProperties[0])) {
-			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+			foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
 				switch ($propertyName) {
 					case 'Title' :
-							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setTitle(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Subject' :
-							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setSubject(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Author' :
-							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCreator(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Created' :
 							$creationDate = strtotime($propertyValue);
 							$docProps->setCreated($creationDate);
 							break;
 					case 'LastAuthor' :
-							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'LastSaved' :
 							$lastSaveDate = strtotime($propertyValue);
 							$docProps->setModified($lastSaveDate);
 							break;
 					case 'Company' :
-							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCompany(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Category' :
-							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCategory(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Manager' :
-							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setManager(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Keywords' :
-							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setKeywords(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Description' :
-							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setDescription(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 				}
 			}
 		}
 		if (isset($xml->CustomDocumentProperties)) {
-			foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+			foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
 				$propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
+				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', 'PHPExcel_Reader_Excel2003XML::_hex2str', $propertyName);
 				$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
-				switch((string) $propertyAttributes) {
+				switch ((string) $propertyAttributes) {
 					case 'string' :
 						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
 						$propertyValue = trim($propertyValue);
@@ -506,11 +506,11 @@ 
 						$propertyValue = strtotime(trim($propertyValue));
 						break;
 				}
-				$docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
+				$docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
 			}
 		}
 
-		foreach($xml->Styles[0] as $style) {
+		foreach ($xml->Styles[0] as $style) {
 			$style_ss = $style->attributes($namespaces['ss']);
 			$styleID = (string) $style_ss['ID'];
 //			echo 'Style ID = '.$styleID.'<br />';
@@ -524,17 +524,17 @@ 
 //				echo $styleType.'<br />';
 				switch ($styleType) {
 					case 'Alignment' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								$styleAttributeValue = (string) $styleAttributeValue;
 								switch ($styleAttributeKey) {
 									case 'Vertical' :
-											if (self::identifyFixedStyleValue($verticalAlignmentStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
 											}
 											break;
 									case 'Horizontal' :
-											if (self::identifyFixedStyleValue($horizontalAlignmentStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($horizontalAlignmentStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
 											}
 											break;
@@ -545,10 +545,10 @@ 
 							}
 							break;
 					case 'Borders' :
-							foreach($styleData->Border as $borderStyle) {
+							foreach ($styleData->Border as $borderStyle) {
 								$borderAttributes = $borderStyle->attributes($namespaces['ss']);
 								$thisBorder = array();
-								foreach($borderAttributes as $borderStyleKey => $borderStyleValue) {
+								foreach ($borderAttributes as $borderStyleKey => $borderStyleValue) {
 //									echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
 									switch ($borderStyleKey) {
 										case 'LineStyle' :
@@ -562,12 +562,12 @@ 
 												$borderPosition = strtolower($borderStyleValue);
 												break;
 										case 'Color' :
-												$borderColour = substr($borderStyleValue,1);
+												$borderColour = substr($borderStyleValue, 1);
 												$thisBorder['color']['rgb'] = $borderColour;
 												break;
 									}
 								}
-								if (!empty($thisBorder)) {
+								if ( ! empty($thisBorder)) {
 									if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
 										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
 									}
@@ -575,7 +575,7 @@ 
 							}
 							break;
 					case 'Font' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								$styleAttributeValue = (string) $styleAttributeValue;
 								switch ($styleAttributeKey) {
@@ -586,7 +586,7 @@ 
 											$this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
 											break;
 									case 'Color' :
-											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
+											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue, 1);
 											break;
 									case 'Bold' :
 											$this->_styles[$styleID]['font']['bold'] = true;
@@ -595,7 +595,7 @@ 
 											$this->_styles[$styleID]['font']['italic'] = true;
 											break;
 									case 'Underline' :
-											if (self::identifyFixedStyleValue($underlineStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
 											}
 											break;
@@ -603,19 +603,19 @@ 
 							}
 							break;
 					case 'Interior' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								switch ($styleAttributeKey) {
 									case 'Color' :
-											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
+											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
 											break;
 								}
 							}
 							break;
 					case 'NumberFormat' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = str_replace($fromFormats,$toFormats,$styleAttributeValue);
+								$styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
 								switch ($styleAttributeValue) {
 									case 'Short Date' :
 											$styleAttributeValue = 'dd/mm/yyyy';
@@ -627,7 +627,7 @@ 
 							}
 							break;
 					case 'Protection' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 							}
 							break;
@@ -641,11 +641,11 @@ 
 		$worksheetID = 0;
 		$xml_ss = $xml->children($namespaces['ss']);
 
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
 			if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-				(!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
+				( ! in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
 				continue;
 			}
 
@@ -655,19 +655,19 @@ 
 			$objPHPExcel->createSheet();
 			$objPHPExcel->setActiveSheetIndex($worksheetID);
 			if (isset($worksheet_ss['Name'])) {
-				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'], $this->_charSet);
 				//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
 				//		formula cells... during the load, all formulae should be correct, and we're simply bringing
 				//		the worksheet name in line with the formula, not the reverse
-				$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+				$objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
 			}
 
 			$columnID = 'A';
 			if (isset($worksheet->Table->Column)) {
-				foreach($worksheet->Table->Column as $columnData) {
+				foreach ($worksheet->Table->Column as $columnData) {
 					$columnData_ss = $columnData->attributes($namespaces['ss']);
 					if (isset($columnData_ss['Index'])) {
-						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index'] - 1);
 					}
 					if (isset($columnData_ss['Width'])) {
 						$columnWidth = $columnData_ss['Width'];
@@ -680,7 +680,7 @@ 
 
 			$rowID = 1;
 			if (isset($worksheet->Table->Row)) {
-				foreach($worksheet->Table->Row as $rowData) {
+				foreach ($worksheet->Table->Row as $rowData) {
 					$rowHasData = false;
 					$row_ss = $rowData->attributes($namespaces['ss']);
 					if (isset($row_ss['Index'])) {
@@ -689,16 +689,16 @@ 
 //					echo '<b>Row '.$rowID.'</b><br />';
 
 					$columnID = 'A';
-					foreach($rowData->Cell as $cell) {
+					foreach ($rowData->Cell as $cell) {
 
 						$cell_ss = $cell->attributes($namespaces['ss']);
 						if (isset($cell_ss['Index'])) {
-							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
+							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index'] - 1);
 						}
 						$cellRange = $columnID.$rowID;
 
 						if ($this->getReadFilter() !== NULL) {
-							if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+							if ( ! $this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
 								continue;
 							}
 						}
@@ -706,7 +706,7 @@ 
 						if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
 							$columnTo = $columnID;
 							if (isset($cell_ss['MergeAcross'])) {
-								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] - 1);
 							}
 							$rowTo = $rowID;
 							if (isset($cell_ss['MergeDown'])) {
@@ -744,7 +744,7 @@ 
 									const TYPE_ERROR		= 'e';
 									*/
 									case 'String' :
-											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
+											$cellValue = self::_convertStringEncoding($cellValue, $this->_charSet);
 											$type = PHPExcel_Cell_DataType::TYPE_STRING;
 											break;
 									case 'Number' :
@@ -772,58 +772,58 @@ 
 //								echo 'FORMULA<br />';
 								$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
 								$columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
-								if (substr($cellDataFormula,0,3) == 'of:') {
-									$cellDataFormula = substr($cellDataFormula,3);
+								if (substr($cellDataFormula, 0, 3) == 'of:') {
+									$cellDataFormula = substr($cellDataFormula, 3);
 //									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
+									$temp = explode('"', $cellDataFormula);
 									$key = false;
-									foreach($temp as &$value) {
+									foreach ($temp as &$value) {
 										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											$value = str_replace(array('[.','.',']'),'',$value);
+										if ($key = ! $key) {
+											$value = str_replace(array('[.', '.', ']'), '', $value);
 										}
 									}
 								} else {
 									//	Convert R1C1 style references to A1 style references (but only when not quoted)
 //									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
+									$temp = explode('"', $cellDataFormula);
 									$key = false;
-									foreach($temp as &$value) {
+									foreach ($temp as &$value) {
 										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+										if ($key = ! $key) {
+											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
 											//		through the formula from left to right. Reversing means that we work right to left.through
 											//		the formula
 											$cellReferences = array_reverse($cellReferences);
 											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
 											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
+											foreach ($cellReferences as $cellReference) {
 												$rowReference = $cellReference[2][0];
 												//	Empty R reference is the current row
 												if ($rowReference == '') $rowReference = $rowID;
 												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference, '[]');
 												$columnReference = $cellReference[4][0];
 												//	Empty C reference is the current column
 												if ($columnReference == '') $columnReference = $columnNumber;
 												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
+												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference, '[]');
+												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference - 1).$rowReference;
+													$value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
 											}
 										}
 									}
 								}
 								unset($value);
 								//	Then rebuild the formula string
-								$cellDataFormula = implode('"',$temp);
+								$cellDataFormula = implode('"', $temp);
 //								echo 'After: ',$cellDataFormula,'<br />';
 							}
 
 //							echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
 //
-							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue),$type);
+							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
 							if ($hasCalculatedValue) {
 //								echo 'Formula result is '.$cellValue.'<br />';
 								$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
@@ -836,7 +836,7 @@ 
 							$commentAttributes = $cell->Comment->attributes($namespaces['ss']);
 							$author = 'unknown';
 							if (isset($commentAttributes->Author)) {
-								$author = (string)$commentAttributes->Author;
+								$author = (string) $commentAttributes->Author;
 //								echo 'Author: ',$author,'<br />';
 							}
 							$node = $cell->Comment->Data->asXML();
@@ -844,19 +844,19 @@ 
 //							echo $annotation,'<br />';
 							$annotation = strip_tags($node);
 //							echo 'Annotation: ',$annotation,'<br />';
-							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
-															->setText($this->_parseRichText($annotation) );
+							$objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)
+															->setAuthor(self::_convertStringEncoding($author, $this->_charSet))
+															->setText($this->_parseRichText($annotation));
 						}
 
 						if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
 							$style = (string) $cell_ss['StyleID'];
 //							echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
+							if ((isset($this->_styles[$style])) && ( ! empty($this->_styles[$style]))) {
 //								echo 'Cell '.$columnID.$rowID.'<br />';
 //								print_r($this->_styles[$style]);
 //								echo '<br />';
-								if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
+								if ( ! $objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
 									$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
 								}
 								$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
@@ -887,9 +887,9 @@ 
 	}
 
 
-	private static function _convertStringEncoding($string,$charset) {
+	private static function _convertStringEncoding($string, $charset) {
 		if ($charset != 'UTF-8') {
-			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
+			return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset);
 		}
 		return $string;
 	}
@@ -898,7 +898,7 @@ 
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
-		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
+		$value->createText(self::_convertStringEncoding($is, $this->_charSet));
 
 		return $value;
 	}

Braces +12 added lines, -4 removed lines

@@ -801,14 +801,22 @@
 											foreach($cellReferences as $cellReference) {
 												$rowReference = $cellReference[2][0];
 												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $rowID;
+												if ($rowReference == '') {
+													$rowReference = $rowID;
+												}
 												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+												if ($rowReference{0} == '[') {
+													$rowReference = $rowID + trim($rowReference,'[]');
+												}
 												$columnReference = $cellReference[4][0];
 												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $columnNumber;
+												if ($columnReference == '') {
+													$columnReference = $columnNumber;
+												}
 												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
+												if ($columnReference{0} == '[') {
+													$columnReference = $columnNumber + trim($columnReference,'[]');
+												}
 												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
 													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
 											}

Indentation +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
 	}
 
 
-    /**
+	/**
 	 * Loads PHPExcel from file
 	 *
 	 * @param 	string 		$pFilename

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2007.php

Doc Comments +15 added lines, -1 removed lines

@@ -224,7 +224,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -366,6 +366,11 @@ 
 	}	//	function _castToString()
 
 
+	/**
+	 * @param string $r
+	 * @param string $cellDataType
+	 * @param string $castBaseType
+	 */
 	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
 //		echo '<font color="darkgreen">Formula</font><br />';
 //		echo '$c->f is '.$c->f.'<br />';
@@ -415,6 +420,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
 	{
 		// Root-relative paths
@@ -1755,6 +1763,9 @@ 
 	}
 
 
+	/**
+	 * @param PHPExcel_Style $docStyle
+	 */
 	private static function _readStyle($docStyle, $style) {
 		// format code
 		if (isset($style->numFmt)) {
@@ -1966,6 +1977,9 @@ 
 	}
 
 
+	/**
+	 * @param string $style
+	 */
 	private static function toCSSArray($style) {
 		$style = str_replace(array("\r","\n"), "", $style);
 

Indentation +64 added lines, -64 removed lines

@@ -766,12 +766,12 @@ 
 							}
 
 							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
+								if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
+									$docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
 								}
 
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
+								if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
+									$docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
@@ -787,22 +787,22 @@ 
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
-								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
-								    } else {
-								        $xSplit = 0;
-								        $ySplit = 0;
-
-								        if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
-								            $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
-								        }
-
-								    	if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
-								            $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
-								        }
-
-								        $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
-								    }
+									if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
+										$docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
+									} else {
+										$xSplit = 0;
+										$ySplit = 0;
+
+										if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
+											$xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
+										}
+
+										if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
+											$ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
+										}
+
+										$docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
+									}
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
@@ -1193,8 +1193,8 @@ 
 
 							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
 								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
-								    // Uppercase coordinate
-							    	$range = strtoupper($dataValidation["sqref"]);
+									// Uppercase coordinate
+									$range = strtoupper($dataValidation["sqref"]);
 									$rangeSet = explode(' ',$range);
 									foreach($rangeSet as $range) {
 										$stRange = $docSheet->shrinkRangeToFit($range);
@@ -1267,10 +1267,10 @@ 
 								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
 									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
+										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
 											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
 										}
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
 											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
 										}
 									}
@@ -1298,7 +1298,7 @@ 
 								}
 
 								// Loop through VML comments
-							    foreach ($vmlComments as $relName => $relPath) {
+								foreach ($vmlComments as $relName => $relPath) {
 									// Load VML comments file
 									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
 									$vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
@@ -1309,42 +1309,42 @@ 
 										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
-	    									$column       = null;
-	    									$row          = null;
-
-	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
-
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
-	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
-
-	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
-	        									}
-	    									}
-
-	    									if (($column !== NULL) && ($row !== NULL)) {
-	    									    // Set comment properties
-	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
-
-	    									    // Parse style
-	    									    $styleArray = explode(';', str_replace(' ', '', $style));
-	    									    foreach ($styleArray as $stylePair) {
-	    									        $stylePair = explode(':', $stylePair);
-
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
-
-	    									    }
-	    									}
+											$style        = (string)$shape['style'];
+											$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
+											$column       = null;
+											$row          = null;
+
+											$clientData   = $shape->xpath('.//x:ClientData');
+											if (is_array($clientData) && !empty($clientData)) {
+												$clientData   = $clientData[0];
+
+												if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
+													$temp = $clientData->xpath('.//x:Row');
+													if (is_array($temp)) $row = $temp[0];
+
+													$temp = $clientData->xpath('.//x:Column');
+													if (is_array($temp)) $column = $temp[0];
+												}
+											}
+
+											if (($column !== NULL) && ($row !== NULL)) {
+												// Set comment properties
+												$comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
+												$comment->getFillColor()->setRGB( $fillColor );
+
+												// Parse style
+												$styleArray = explode(';', str_replace(' ', '', $style));
+												foreach ($styleArray as $stylePair) {
+													$stylePair = explode(':', $stylePair);
+
+													if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
+													if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
+													if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
+													if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
+													if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+
+												}
+											}
 										}
 									}
 								}
@@ -1919,12 +1919,12 @@ 
 					}
 
 					if ( (isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
-					     || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
+						 || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
 						$objText->getFont()->setBold(true);
 					}
 
 					if ( (isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
-					     || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
+						 || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
 						$objText->getFont()->setItalic(true);
 					}
 
@@ -1945,7 +1945,7 @@ 
 					}
 
 					if ( (isset($run->rPr->strike["val"])  && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
-					     || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
+						 || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
 						$objText->getFont()->setStrikethrough(true);
 					}
 				}

Spacing +242 added lines, -242 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');
 }
 
 /**
@@ -231,12 +231,12 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Check if zip class exists
-		if (!class_exists('ZipArchive')) {
+		if ( ! class_exists('ZipArchive')) {
 			throw new Exception("ZipArchive library is not enabled");
 		}
 
@@ -274,8 +274,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetInfo = array();
@@ -287,7 +287,7 @@ 
 		foreach ($rels->Relationship as $rel) {
 			if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
 				$dir = dirname($rel["Target"]);
-				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/".basename($rel["Target"]).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 				$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
 
 				$worksheets = array();
@@ -297,7 +297,7 @@ 
 					}
 				}
 
-				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 				if ($xmlWorkbook->sheets) {
 					$dir = dirname($rel["Target"]);
 					foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
@@ -309,7 +309,7 @@ 
 						$tmpInfo['totalColumns'] = 0;
 
 						$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 						if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
 							foreach ($xmlSheet->sheetData->row as $row) {
 								foreach ($row->c as $c) {
@@ -348,7 +348,7 @@ 
 		} elseif ($value == '1') {
 			return true;
 		} else {
-			return (bool)$c->v;
+			return (bool) $c->v;
 		}
 		return $value;
 	}	//	function _castToBool()
@@ -356,38 +356,38 @@ 
 
 	private static function _castToError($c) {
 //		echo 'Initial Cast to Error<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : null; ;
 	}	//	function _castToError()
 
 
 	private static function _castToString($c) {
 //		echo 'Initial Cast to String<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : null; ;
 	}	//	function _castToString()
 
 
-	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
+	private function _castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType) {
 //		echo '<font color="darkgreen">Formula</font><br />';
 //		echo '$c->f is '.$c->f.'<br />';
-		$cellDataType 		= 'f';
-		$value 				= "={$c->f}";
-		$calculatedValue 	= self::$castBaseType($c);
+		$cellDataType = 'f';
+		$value = "={$c->f}";
+		$calculatedValue = self::$castBaseType($c);
 
 		// Shared formula?
-		if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
+		if (isset($c->f['t']) && strtolower((string) $c->f['t']) == 'shared') {
 //			echo '<font color="darkgreen">SHARED FORMULA</font><br />';
-			$instance = (string)$c->f['si'];
+			$instance = (string) $c->f['si'];
 
 //			echo 'Instance ID = '.$instance.'<br />';
 //
 //			echo 'Shared Formula Array:<pre>';
 //			print_r($sharedFormulas);
 //			echo '</pre>';
-			if (!isset($sharedFormulas[(string)$c->f['si']])) {
+			if ( ! isset($sharedFormulas[(string) $c->f['si']])) {
 //				echo '<font color="darkgreen">SETTING NEW SHARED FORMULA</font><br />';
 //				echo 'Master is '.$r.'<br />';
 //				echo 'Formula is '.$value.'<br />';
-				$sharedFormulas[$instance] = array(	'master' => $r,
+				$sharedFormulas[$instance] = array('master' => $r,
 													'formula' => $value
 												  );
 //				echo 'New Shared Formula Array:<pre>';
@@ -404,7 +404,7 @@ 
 				$difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
 				$difference[1] = $current[1] - $master[1];
 
-				$value = $this->_referenceHelper->updateFormulaReferences(	$sharedFormulas[$instance]['formula'],
+				$value = $this->_referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'],
 																			'A1',
 																			$difference[0],
 																			$difference[1]
@@ -444,8 +444,8 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetNames = array();
@@ -457,7 +457,7 @@ 
 		foreach ($rels->Relationship as $rel) {
 			switch ($rel["Type"]) {
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 					if ($xmlWorkbook->sheets) {
 						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
@@ -483,14 +483,14 @@ 
 	public function load($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Initialisations
 		$excel = new PHPExcel;
 		$excel->removeSheetByIndex(0);
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$excel->removeCellStyleXfByIndex(0); // remove the default style
 			$excel->removeCellXfByIndex(0); // remove the default style
 		}
@@ -502,22 +502,22 @@ 
 		foreach ($wbRels->Relationship as $rel) {
 			switch ($rel["Type"]) {
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
-					$themeOrderArray = array('lt1','dk1','lt2','dk2');
+					$themeOrderArray = array('lt1', 'dk1', 'lt2', 'dk2');
 					$themeOrderAdditional = count($themeOrderArray);
 
 					$xmlTheme = simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"));
 					if (is_object($xmlTheme)) {
 						$xmlThemeName = $xmlTheme->attributes();
 						$xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-						$themeName = (string)$xmlThemeName['name'];
+						$themeName = (string) $xmlThemeName['name'];
 
 						$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-						$colourSchemeName = (string)$colourScheme['name'];
+						$colourSchemeName = (string) $colourScheme['name'];
 						$colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
 
 						$themeColours = array();
 						foreach ($colourScheme as $k => $xmlColour) {
-							$themePos = array_search($k,$themeOrderArray);
+							$themePos = array_search($k, $themeOrderArray);
 							if ($themePos === false) {
 								$themePos = $themeOrderAdditional++;
 							}
@@ -529,7 +529,7 @@ 
 								$themeColours[$themePos] = $xmlColourData['val'];
 							}
 						}
-						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName,$colourSchemeName,$themeColours);
+						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName, $colourSchemeName, $themeColours);
 					}
 					break;
 			}
@@ -579,9 +579,9 @@ 
 								$cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
 								$attributeType = $cellDataOfficeChildren->getName();
 								$attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
-								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue,$attributeType);
+								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue, $attributeType);
 								$attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
-								$docProps->setCustomProperty($propertyName,$attributeValue,$attributeType);
+								$docProps->setCustomProperty($propertyName, $attributeValue, $attributeType);
 							}
 						}
 					}
@@ -589,16 +589,16 @@ 
 
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
 					$dir = dirname($rel["Target"]);
-					$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+					$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/".basename($rel["Target"]).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 					$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
 
 					$sharedStrings = array();
 					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
-					$xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 					if (isset($xmlStrings) && isset($xmlStrings->si)) {
 						foreach ($xmlStrings->si as $val) {
 							if (isset($val->t)) {
-								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $val->t );
+								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $val->t);
 							} elseif (isset($val->r)) {
 								$sharedStrings[] = $this->_parseRichText($val);
 							}
@@ -612,7 +612,7 @@ 
 						}
 					}
 
-					$styles 	= array();
+					$styles = array();
 					$cellStyles = array();
 					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
 					$xmlStyles = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
@@ -623,7 +623,7 @@ 
 					if (isset($numFmts) && ($numFmts !== NULL)) {
 						$numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 					}
-					if (!$this->_readDataOnly && $xmlStyles) {
+					if ( ! $this->_readDataOnly && $xmlStyles) {
 						foreach ($xmlStyles->cellXfs->xf as $xf) {
 							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
 
@@ -636,8 +636,8 @@ 
 									}
 								}
 
-								if ((int)$xf["numFmtId"] < 164) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+								if ((int) $xf["numFmtId"] < 164) {
+									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
 								}
 							}
 							//$numFmt = str_replace('mm', 'i', $numFmt);
@@ -665,8 +665,8 @@ 
 								$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
 								if (isset($tmpNumFmt["formatCode"])) {
 									$numFmt = (string) $tmpNumFmt["formatCode"];
-								} else if ((int)$xf["numFmtId"] < 165) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+								} else if ((int) $xf["numFmtId"] < 165) {
+									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
 								}
 							}
 
@@ -688,7 +688,7 @@ 
 					}
 
 					$dxfs = array();
-					if (!$this->_readDataOnly && $xmlStyles) {
+					if ( ! $this->_readDataOnly && $xmlStyles) {
 						if ($xmlStyles->dxfs) {
 							foreach ($xmlStyles->dxfs->dxf as $dxf) {
 								$style = new PHPExcel_Style;
@@ -713,13 +713,13 @@ 
 						}
 					}
 
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 					// Set base date
 					if ($xmlWorkbook->workbookPr) {
 						PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
 						if (isset($xmlWorkbook->workbookPr['date1904'])) {
-							$date1904 = (string)$xmlWorkbook->workbookPr['date1904'];
+							$date1904 = (string) $xmlWorkbook->workbookPr['date1904'];
 							if ($date1904 == "true" || $date1904 == "1") {
 								PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
 							}
@@ -739,7 +739,7 @@ 
 							++$oldSheetId;
 
 							// Check if sheet should be skipped
-							if (isset($this->_loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
+							if (isset($this->_loadSheetsOnly) && ! in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
 								++$countSkippedSheets;
 								$mapSheetId[$oldSheetId] = null;
 								continue;
@@ -755,40 +755,40 @@ 
 							//		references in formula cells... during the load, all formulae should be correct,
 							//		and we're simply bringing the worksheet name in line with the formula, not the
 							//		reverse
-							$docSheet->setTitle((string) $eleSheet["name"],false);
+							$docSheet->setTitle((string) $eleSheet["name"], false);
 							$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 							$sharedFormulas = array();
 
 							if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
-								$docSheet->setSheetState( (string) $eleSheet["state"] );
+								$docSheet->setSheetState((string) $eleSheet["state"]);
 							}
 
 							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
 							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
+								    $docSheet->getSheetView()->setZoomScale(intval($xmlSheet->sheetViews->sheetView['zoomScale']));
 								}
 
 							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
+								    $docSheet->getSheetView()->setZoomScaleNormal(intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']));
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
-									$docSheet->setShowGridLines((string)$xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
+									$docSheet->setShowGridLines((string) $xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
-									$docSheet->setShowRowColHeaders((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders'] ? true : false);
+									$docSheet->setShowRowColHeaders((string) $xmlSheet->sheetViews->sheetView['showRowColHeaders'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
-									$docSheet->setRightToLeft((string)$xmlSheet->sheetViews->sheetView['rightToLeft'] ? true : false);
+									$docSheet->setRightToLeft((string) $xmlSheet->sheetViews->sheetView['rightToLeft'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
 								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
+								        $docSheet->freezePane((string) $xmlSheet->sheetViews->sheetView->pane['topLeftCell']);
 								    } else {
 								        $xSplit = 0;
 								        $ySplit = 0;
@@ -807,7 +807,7 @@ 
 
 								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
 									if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
-										$sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
+										$sqref = (string) $xmlSheet->sheetViews->sheetView->selection['sqref'];
 										$sqref = explode(' ', $sqref);
 										$sqref = $sqref[0];
 										$docSheet->setSelectedCells($sqref);
@@ -818,7 +818,7 @@ 
 
 							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
 								if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
-									$docSheet->getTabColor()->setARGB( (string)$xmlSheet->sheetPr->tabColor['rgb'] );
+									$docSheet->getTabColor()->setARGB((string) $xmlSheet->sheetPr->tabColor['rgb']);
 								}
 							}
 
@@ -845,18 +845,18 @@ 
 							}
 
 							if (isset($xmlSheet->sheetFormatPr)) {
-								if (isset($xmlSheet->sheetFormatPr['customHeight']) && ((string)$xmlSheet->sheetFormatPr['customHeight'] == '1' || strtolower((string)$xmlSheet->sheetFormatPr['customHeight']) == 'true') && isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
-									$docSheet->getDefaultRowDimension()->setRowHeight( (float)$xmlSheet->sheetFormatPr['defaultRowHeight'] );
+								if (isset($xmlSheet->sheetFormatPr['customHeight']) && ((string) $xmlSheet->sheetFormatPr['customHeight'] == '1' || strtolower((string) $xmlSheet->sheetFormatPr['customHeight']) == 'true') && isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
+									$docSheet->getDefaultRowDimension()->setRowHeight((float) $xmlSheet->sheetFormatPr['defaultRowHeight']);
 								}
 								if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
-									$docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
+									$docSheet->getDefaultColumnDimension()->setWidth((float) $xmlSheet->sheetFormatPr['defaultColWidth']);
 								}
 							}
 
-							if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
+							if (isset($xmlSheet->cols) && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->cols->col as $col) {
 									for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
-										if ($col["style"] && !$this->_readDataOnly) {
+										if ($col["style"] && ! $this->_readDataOnly) {
 											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
 										}
 										if ($col["bestFit"]) {
@@ -880,7 +880,7 @@ 
 								}
 							}
 
-							if (isset($xmlSheet->printOptions) && !$this->_readDataOnly) {
+							if (isset($xmlSheet->printOptions) && ! $this->_readDataOnly) {
 								if ($xmlSheet->printOptions['gridLinesSet'] == 'true' && $xmlSheet->printOptions['gridLinesSet'] == '1') {
 									$docSheet->setShowGridlines(true);
 								}
@@ -899,10 +899,10 @@ 
 
 							if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
 								foreach ($xmlSheet->sheetData->row as $row) {
-									if ($row["ht"] && !$this->_readDataOnly) {
+									if ($row["ht"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
 									}
-									if ($row["hidden"] && !$this->_readDataOnly) {
+									if ($row["hidden"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setVisible(false);
 									}
 									if ($row["collapsed"]) {
@@ -911,21 +911,21 @@ 
 									if ($row["outlineLevel"] > 0) {
 										$docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
 									}
-									if ($row["s"] && !$this->_readDataOnly) {
+									if ($row["s"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
 									}
 
 									foreach ($row->c as $c) {
-										$r 					= (string) $c["r"];
-										$cellDataType 		= (string) $c["t"];
-										$value				= null;
-										$calculatedValue 	= null;
+										$r = (string) $c["r"];
+										$cellDataType = (string) $c["t"];
+										$value = null;
+										$calculatedValue = null;
 
 										// Read cell?
 										if ($this->getReadFilter() !== NULL) {
 											$coordinates = PHPExcel_Cell::coordinateFromString($r);
 
-											if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
+											if ( ! $this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
 												continue;
 											}
 										}
@@ -939,7 +939,7 @@ 
 										switch ($cellDataType) {
 											case "s":
 	//											echo 'String<br />';
-												if ((string)$c->v != '') {
+												if ((string) $c->v != '') {
 													$value = $sharedStrings[intval($c->v)];
 
 													if ($value instanceof PHPExcel_RichText) {
@@ -952,11 +952,11 @@ 
 												break;
 											case "b":
 	//											echo 'Boolean<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 													$value = self::_castToBool($c);
 												} else {
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToBool');
 													if (isset($c->f['t'])) {
 														$att = array();
 														$att = $c->f;
@@ -972,11 +972,11 @@ 
 												break;
 											case "e":
 	//											echo 'Error<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 													$value = self::_castToError($c);
 												} else {
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToError');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToError');
 	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
 												}
 
@@ -984,13 +984,13 @@ 
 
 											default:
 	//											echo 'Default<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 	//												echo 'Not a Formula<br />';
 													$value = self::_castToString($c);
 												} else {
 	//												echo 'Treat as Formula<br />';
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToString');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToString');
 	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
 												}
 
@@ -1000,9 +1000,9 @@ 
 
 										// Check for numeric values
 										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
+											if ($value == (int) $value) $value = (int) $value;
+											elseif ($value == (float) $value) $value = (float) $value;
+											elseif ($value == (double) $value) $value = (double) $value;
 										}
 
 										// Rich text?
@@ -1022,7 +1022,7 @@ 
 										}
 
 										// Style information?
-										if ($c["s"] && !$this->_readDataOnly) {
+										if ($c["s"] && ! $this->_readDataOnly) {
 											// no style index means 0, it seems
 											$cell->setXfIndex(isset($styles[intval($c["s"])]) ?
 												intval($c["s"]) : 0);
@@ -1032,15 +1032,15 @@ 
 							}
 
 							$conditionals = array();
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
 								foreach ($xmlSheet->conditionalFormatting as $conditional) {
 									foreach ($conditional->cfRule as $cfRule) {
 										if (
 											(
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
 											) && isset($dxfs[intval($cfRule["dxfId"])])
 										) {
 											$conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
@@ -1053,19 +1053,19 @@ 
 									$conditionalStyles = array();
 									foreach ($cfRules as $cfRule) {
 										$objConditional = new PHPExcel_Style_Conditional();
-										$objConditional->setConditionType((string)$cfRule["type"]);
-										$objConditional->setOperatorType((string)$cfRule["operator"]);
+										$objConditional->setConditionType((string) $cfRule["type"]);
+										$objConditional->setOperatorType((string) $cfRule["operator"]);
 
-										if ((string)$cfRule["text"] != '') {
-											$objConditional->setText((string)$cfRule["text"]);
+										if ((string) $cfRule["text"] != '') {
+											$objConditional->setText((string) $cfRule["text"]);
 										}
 
 										if (count($cfRule->formula) > 1) {
 											foreach ($cfRule->formula as $formula) {
-												$objConditional->addCondition((string)$formula);
+												$objConditional->addCondition((string) $formula);
 											}
 										} else {
-											$objConditional->addCondition((string)$cfRule->formula);
+											$objConditional->addCondition((string) $cfRule->formula);
 										}
 										$objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
 										$conditionalStyles[] = $objConditional;
@@ -1080,14 +1080,14 @@ 
 							}
 
 							$aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
 								foreach ($aKeys as $key) {
-									$method = "set" . ucfirst($key);
+									$method = "set".ucfirst($key);
 									$docSheet->getProtection()->$method($xmlSheet->sheetProtection[$key] == "true");
 								}
 							}
 
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
 								$docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], true);
 								if ($xmlSheet->protectedRanges->protectedRange) {
 									foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
@@ -1096,17 +1096,17 @@ 
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->autoFilter && ! $this->_readDataOnly) {
 								$docSheet->setAutoFilter((string) $xmlSheet->autoFilter["ref"]);
 							}
 
-							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
 									$docSheet->mergeCells((string) $mergeCell["ref"]);
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->pageMargins && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->pageMargins && ! $this->_readDataOnly) {
 								$docPageMargins = $docSheet->getPageMargins();
 								$docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
 								$docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
@@ -1116,7 +1116,7 @@ 
 								$docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
 							}
 
-							if ($xmlSheet && $xmlSheet->pageSetup && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->pageSetup && ! $this->_readDataOnly) {
 								$docPageSetup = $docSheet->getPageSetup();
 
 								if (isset($xmlSheet->pageSetup["orientation"])) {
@@ -1135,34 +1135,34 @@ 
 									$docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), false);
 								}
 								if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
-									((string)$xmlSheet->pageSetup["useFirstPageNumber"] == 'true' || (string)$xmlSheet->pageSetup["useFirstPageNumber"] == '1')) {
+									((string) $xmlSheet->pageSetup["useFirstPageNumber"] == 'true' || (string) $xmlSheet->pageSetup["useFirstPageNumber"] == '1')) {
 									$docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->headerFooter && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->headerFooter && ! $this->_readDataOnly) {
 								$docHeaderFooter = $docSheet->getHeaderFooter();
 
 								if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
-									((string)$xmlSheet->headerFooter["differentOddEven"] == 'true' || (string)$xmlSheet->headerFooter["differentOddEven"] == '1')) {
+									((string) $xmlSheet->headerFooter["differentOddEven"] == 'true' || (string) $xmlSheet->headerFooter["differentOddEven"] == '1')) {
 									$docHeaderFooter->setDifferentOddEven(true);
 								} else {
 									$docHeaderFooter->setDifferentOddEven(false);
 								}
 								if (isset($xmlSheet->headerFooter["differentFirst"]) &&
-									((string)$xmlSheet->headerFooter["differentFirst"] == 'true' || (string)$xmlSheet->headerFooter["differentFirst"] == '1')) {
+									((string) $xmlSheet->headerFooter["differentFirst"] == 'true' || (string) $xmlSheet->headerFooter["differentFirst"] == '1')) {
 									$docHeaderFooter->setDifferentFirst(true);
 								} else {
 									$docHeaderFooter->setDifferentFirst(false);
 								}
 								if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
-									((string)$xmlSheet->headerFooter["scaleWithDoc"] == 'false' || (string)$xmlSheet->headerFooter["scaleWithDoc"] == '0')) {
+									((string) $xmlSheet->headerFooter["scaleWithDoc"] == 'false' || (string) $xmlSheet->headerFooter["scaleWithDoc"] == '0')) {
 									$docHeaderFooter->setScaleWithDocument(false);
 								} else {
 									$docHeaderFooter->setScaleWithDocument(true);
 								}
 								if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
-									((string)$xmlSheet->headerFooter["alignWithMargins"] == 'false' || (string)$xmlSheet->headerFooter["alignWithMargins"] == '0')) {
+									((string) $xmlSheet->headerFooter["alignWithMargins"] == 'false' || (string) $xmlSheet->headerFooter["alignWithMargins"] == '0')) {
 									$docHeaderFooter->setAlignWithMargins(false);
 								} else {
 									$docHeaderFooter->setAlignWithMargins(true);
@@ -1176,27 +1176,27 @@ 
 								$docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
 							}
 
-							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->rowBreaks->brk as $brk) {
 									if ($brk["man"]) {
 										$docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
 									}
 								}
 							}
-							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->colBreaks->brk as $brk) {
 									if ($brk["man"]) {
-										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex($brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
+										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex($brk["id"])."1", PHPExcel_Worksheet::BREAK_COLUMN);
 									}
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->dataValidations && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
 								    // Uppercase coordinate
 							    	$range = strtoupper($dataValidation["sqref"]);
-									$rangeSet = explode(' ',$range);
-									foreach($rangeSet as $range) {
+									$rangeSet = explode(' ', $range);
+									foreach ($rangeSet as $range) {
 										$stRange = $docSheet->shrinkRangeToFit($range);
 
 										// Extract all cell references in $range
@@ -1224,13 +1224,13 @@ 
 
 							// Add hyperlinks
 							$hyperlinks = array();
-							if (!$this->_readDataOnly) {
+							if ( ! $this->_readDataOnly) {
 								// Locate hyperlink relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
 										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
-											$hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
+											$hyperlinks[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									}
 								}
@@ -1242,17 +1242,17 @@ 
 										$linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
 
 										foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
-											$cell = $docSheet->getCell( $cellReference );
+											$cell = $docSheet->getCell($cellReference);
 											if (isset($linkRel['id'])) {
-												$cell->getHyperlink()->setUrl( $hyperlinks[ (string)$linkRel['id'] ] );
+												$cell->getHyperlink()->setUrl($hyperlinks[(string) $linkRel['id']]);
 											}
 											if (isset($hyperlink['location'])) {
-												$cell->getHyperlink()->setUrl( 'sheet://' . (string)$hyperlink['location'] );
+												$cell->getHyperlink()->setUrl('sheet://'.(string) $hyperlink['location']);
 											}
 
 											// Tooltip
 											if (isset($hyperlink['tooltip'])) {
-												$cell->getHyperlink()->setTooltip( (string)$hyperlink['tooltip'] );
+												$cell->getHyperlink()->setTooltip((string) $hyperlink['tooltip']);
 											}
 										}
 									}
@@ -1262,16 +1262,16 @@ 
 							// Add comments
 							$comments = array();
 							$vmlComments = array();
-							if (!$this->_readDataOnly) {
+							if ( ! $this->_readDataOnly) {
 								// Locate comment relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
 									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
-											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
+											$comments[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
+											$vmlComments[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									}
 								}
@@ -1279,29 +1279,29 @@ 
 								// Loop through comments
 								foreach ($comments as $relName => $relPath) {
 									// Load comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath) );
+									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet")."/".$relPath);
+									$commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath));
 
 									// Utility variables
 									$authors = array();
 
 									// Loop through authors
 									foreach ($commentsFile->authors->author as $author) {
-										$authors[] = (string)$author;
+										$authors[] = (string) $author;
 									}
 
 									// Loop through contents
 									foreach ($commentsFile->commentList->comment as $comment) {
-										$docSheet->getComment( (string)$comment['ref'] )->setAuthor( $authors[(string)$comment['authorId']] );
-										$docSheet->getComment( (string)$comment['ref'] )->setText( $this->_parseRichText($comment->text) );
+										$docSheet->getComment((string) $comment['ref'])->setAuthor($authors[(string) $comment['authorId']]);
+										$docSheet->getComment((string) $comment['ref'])->setText($this->_parseRichText($comment->text));
 									}
 								}
 
 								// Loop through VML comments
 							    foreach ($vmlComments as $relName => $relPath) {
 									// Load VML comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
+									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet")."/".$relPath);
+									$vmlCommentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath));
 									$vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 									$shapes = $vmlCommentsFile->xpath('//v:shape');
@@ -1309,16 +1309,16 @@ 
 										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
+	    									$style        = (string) $shape['style'];
+	    									$fillColor    = strtoupper(substr((string) $shape['fillcolor'], 1));
 	    									$column       = null;
 	    									$row          = null;
 
 	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
+	    									if (is_array($clientData) && ! empty($clientData)) {
+	        									$clientData = $clientData[0];
 
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
+	        									if (isset($clientData['ObjectType']) && (string) $clientData['ObjectType'] == 'Note') {
 	        									    $temp = $clientData->xpath('.//x:Row');
 	        									    if (is_array($temp)) $row = $temp[0];
 
@@ -1330,7 +1330,7 @@ 
 	    									if (($column !== NULL) && ($row !== NULL)) {
 	    									    // Set comment properties
 	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
+	    									    $comment->getFillColor()->setRGB($fillColor);
 
 	    									    // Parse style
 	    									    $styleArray = explode(';', str_replace(' ', '', $style));
@@ -1341,7 +1341,7 @@ 
 	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
 	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
 	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible($stylePair[1] == 'visible');
 
 	    									    }
 	    									}
@@ -1350,9 +1350,9 @@ 
 								}
 
 								// Header/footer images
-								if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->_readDataOnly) {
-									if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-										$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($xmlSheet && $xmlSheet->legacyDrawingHF && ! $this->_readDataOnly) {
+									if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+										$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 										$vmlRelationship = '';
 
 										foreach ($relsWorksheet->Relationship as $ele) {
@@ -1363,7 +1363,7 @@ 
 
 										if ($vmlRelationship != '') {
 											// Fetch linked images
-											$relsVML = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels' )); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+											$relsVML = simplexml_load_string($this->_getFromZipArchive($zip, dirname($vmlRelationship).'/_rels/'.basename($vmlRelationship).'.rels')); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 											$drawings = array();
 											foreach ($relsVML->Relationship as $ele) {
 												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
@@ -1384,20 +1384,20 @@ 
 												$imageData = $imageData[0];
 
 												$imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
-												$style = self::toCSSArray( (string)$shape['style'] );
+												$style = self::toCSSArray((string) $shape['style']);
 
-												$hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
+												$hfImages[(string) $shape['id']] = new PHPExcel_Worksheet_HeaderFooterDrawing();
 												if (isset($imageData['title'])) {
-													$hfImages[ (string)$shape['id'] ]->setName( (string)$imageData['title'] );
+													$hfImages[(string) $shape['id']]->setName((string) $imageData['title']);
 												}
 
-												$hfImages[ (string)$shape['id'] ]->setPath("zip://$pFilename#" . $drawings[(string)$imageData['relid']], false);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
-												$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
-												$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
+												$hfImages[(string) $shape['id']]->setPath("zip://$pFilename#".$drawings[(string) $imageData['relid']], false);
+												$hfImages[(string) $shape['id']]->setResizeProportional(false);
+												$hfImages[(string) $shape['id']]->setWidth($style['width']);
+												$hfImages[(string) $shape['id']]->setHeight($style['height']);
+												$hfImages[(string) $shape['id']]->setOffsetX($style['margin-left']);
+												$hfImages[(string) $shape['id']]->setOffsetY($style['margin-top']);
+												$hfImages[(string) $shape['id']]->setResizeProportional(true);
 											}
 
 											$docSheet->getHeaderFooter()->setImages($hfImages);
@@ -1408,18 +1408,18 @@ 
 							}
 
 	// TODO: Make sure drawings and graph are loaded differently!
-							if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+							if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 								$drawings = array();
 								foreach ($relsWorksheet->Relationship as $ele) {
 									if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
 										$drawings[(string) $ele["Id"]] = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
 									}
 								}
-								if ($xmlSheet->drawing && !$this->_readDataOnly) {
+								if ($xmlSheet->drawing && ! $this->_readDataOnly) {
 									foreach ($xmlSheet->drawing as $drawing) {
 										$fileDrawing = $drawings[(string) self::array_item($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-										$relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+										$relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip, dirname($fileDrawing)."/_rels/".basename($fileDrawing).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 										$images = array();
 
 										if ($relsDrawing && $relsDrawing->Relationship) {
@@ -1446,8 +1446,8 @@ 
 													$objDrawing = new PHPExcel_Worksheet_Drawing;
 													$objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
+													$objDrawing->setPath("zip://$pFilename#".$images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col).($oneCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1468,10 +1468,10 @@ 
 													}
 													$objDrawing->setWorksheet($docSheet);
 												} else {
-													$coordinates	= PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
+													$coordinates = PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col).($oneCellAnchor->from->row + 1);
 													$offsetX		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
 													$offsetY		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
-													$width			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
+													$width = PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
 													$height			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
 												}
 											}
@@ -1485,8 +1485,8 @@ 
 													$objDrawing = new PHPExcel_Worksheet_Drawing;
 													$objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
+													$objDrawing->setPath("zip://$pFilename#".$images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col).($twoCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1508,19 +1508,19 @@ 
 														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
 													}
 													$objDrawing->setWorksheet($docSheet);
-												} elseif($this->_includeCharts) {
-													$fromCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
+												} elseif ($this->_includeCharts) {
+													$fromCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col).($twoCellAnchor->from->row + 1);
 													$fromOffsetX	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
 													$fromOffsetY	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-													$toCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
+													$toCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col).($twoCellAnchor->to->row + 1);
 													$toOffsetX		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
 													$toOffsetY		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
-													$graphic		= $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
-													$chartRef		= $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
+													$graphic = $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
+													$chartRef = $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
 													$thisChart		= (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 
 													$chartDetails[$docSheet->getTitle().'!'.$thisChart] =
-															array(	'fromCoordinate'	=> $fromCoordinate,
+															array('fromCoordinate'	=> $fromCoordinate,
 																	'fromOffsetX'		=> $fromOffsetX,
 																	'fromOffsetY'		=> $fromOffsetY,
 																	'toCoordinate'		=> $toCoordinate,
@@ -1540,23 +1540,23 @@ 
 							if ($xmlWorkbook->definedNames) {
 								foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
 									// Extract range
-									$extractedRange = (string)$definedName;
+									$extractedRange = (string) $definedName;
 									$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-									if (($spos = strpos($extractedRange,'!')) !== false) {
-										$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+									if (($spos = strpos($extractedRange, '!')) !== false) {
+										$extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
 									} else {
 										$extractedRange = str_replace('$', '', $extractedRange);
 									}
 
 									// Valid range?
-									if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+									if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
 										continue;
 									}
 
 									// Some definedNames are only applicable if we are on the same sheet...
-									if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
+									if ((string) $definedName['localSheetId'] != '' && (string) $definedName['localSheetId'] == $sheetId) {
 										// Switch on type
-										switch ((string)$definedName['name']) {
+										switch ((string) $definedName['name']) {
 
 											case '_xlnm._FilterDatabase':
 												$docSheet->setAutoFilter($extractedRange);
@@ -1582,14 +1582,14 @@ 
 												break;
 
 											case '_xlnm.Print_Area':
-												$rangeSets = explode(',', $extractedRange);		// FIXME: what if sheetname contains comma?
+												$rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma?
 												$newRangeSets = array();
-												foreach($rangeSets as $rangeSet) {
-													$range = explode('!', $rangeSet);	// FIXME: what if sheetname contains exclamation mark?
+												foreach ($rangeSets as $rangeSet) {
+													$range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark?
 													$rangeSet = isset($range[1]) ? $range[1] : $range[0];
 													$newRangeSets[] = str_replace('$', '', $rangeSet);
 												}
-												$docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets));
+												$docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
 												break;
 
 											default:
@@ -1607,24 +1607,24 @@ 
 						if ($xmlWorkbook->definedNames) {
 							foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
 								// Extract range
-								$extractedRange = (string)$definedName;
+								$extractedRange = (string) $definedName;
 								$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-								if (($spos = strpos($extractedRange,'!')) !== false) {
-									$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+								if (($spos = strpos($extractedRange, '!')) !== false) {
+									$extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
 								} else {
 									$extractedRange = str_replace('$', '', $extractedRange);
 								}
 
 								// Valid range?
-								if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+								if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
 									continue;
 								}
 
 								// Some definedNames are only applicable if we are on the same sheet...
-								if ((string)$definedName['localSheetId'] != '') {
+								if ((string) $definedName['localSheetId'] != '') {
 									// Local defined name
 									// Switch on type
-									switch ((string)$definedName['name']) {
+									switch ((string) $definedName['name']) {
 
 										case '_xlnm._FilterDatabase':
 										case '_xlnm.Print_Titles':
@@ -1632,26 +1632,26 @@ 
 											break;
 
 										default:
-											$range = explode('!', (string)$definedName);
+											$range = explode('!', (string) $definedName);
 											if (count($range) == 2) {
 												$range[0] = str_replace("''", "'", $range[0]);
 												$range[0] = str_replace("'", "", $range[0]);
 												if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
 													$extractedRange = str_replace('$', '', $range[1]);
-													$scope = $docSheet->getParent()->getSheet((string)$definedName['localSheetId']);
+													$scope = $docSheet->getParent()->getSheet((string) $definedName['localSheetId']);
 
-													$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope) );
+													$excel->addNamedRange(new PHPExcel_NamedRange((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
 												}
 											}
 											break;
 									}
-								} else if (!isset($definedName['localSheetId'])) {
+								} else if ( ! isset($definedName['localSheetId'])) {
 									// "Global" definedNames
 									$locatedSheet = null;
 									$extractedSheetName = '';
-									if (strpos( (string)$definedName, '!' ) !== false) {
+									if (strpos((string) $definedName, '!') !== false) {
 										// Extract sheet name
-										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle( (string)$definedName, true );
+										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle((string) $definedName, true);
 										$extractedSheetName = $extractedSheetName[0];
 
 										// Locate sheet
@@ -1663,14 +1663,14 @@ 
 									}
 
 									if ($locatedSheet !== NULL) {
-										$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
+										$excel->addNamedRange(new PHPExcel_NamedRange((string) $definedName['name'], $locatedSheet, $extractedRange, false));
 									}
 								}
 							}
 						}
 					}
 
-					if (!$this->_readDataOnly) {
+					if ( ! $this->_readDataOnly) {
 						// active sheet index
 						$activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
 
@@ -1690,15 +1690,15 @@ 
 		}
 
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$contentTypes = simplexml_load_string($this->_getFromZipArchive($zip, "[Content_Types].xml"));
 			foreach ($contentTypes->Override as $contentType) {
 				switch ($contentType["ContentType"]) {
 					case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
 						if ($this->_includeCharts) {
-							$chartEntryRef = ltrim($contentType['PartName'],'/');
+							$chartEntryRef = ltrim($contentType['PartName'], '/');
 							$chartElements = simplexml_load_string($this->_getFromZipArchive($zip, $chartEntryRef));
-							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
+							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements, basename($chartEntryRef, '.xml'));
 
 //							echo 'Chart ',$chartEntryRef,'<br />';
 //							var_dump($charts[$chartEntryRef]);
@@ -1711,11 +1711,11 @@ 
 
 									$excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
 									$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-									$objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
+									$objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'],
 																   $chartDetails[$chartPositionRef]['fromOffsetX'],
 																   $chartDetails[$chartPositionRef]['fromOffsetY']
 																 );
-									$objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
+									$objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'],
 																	   $chartDetails[$chartPositionRef]['toOffsetX'],
 																	   $chartDetails[$chartPositionRef]['toOffsetY']
 																	 );
@@ -1732,14 +1732,14 @@ 
 	}
 
 
-	private static function _readColor($color, $background=false) {
+	private static function _readColor($color, $background = false) {
 		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
+			return (string) $color["rgb"];
 		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+			return PHPExcel_Style_Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
 		} else if (isset($color["theme"])) {
 			if (self::$_theme !== NULL) {
-				$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
+				$returnColour = self::$_theme->getColourByIndex((int) $color["theme"]);
 				if (isset($color["tint"])) {
 					$tintAdjust = (float) $color["tint"];
 					$returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
@@ -1766,24 +1766,24 @@ 
 			$docStyle->getFont()->setName((string) $style->font->name["val"]);
 			$docStyle->getFont()->setSize((string) $style->font->sz["val"]);
 			if (isset($style->font->b)) {
-				$docStyle->getFont()->setBold(!isset($style->font->b["val"]) || $style->font->b["val"] == 'true' || $style->font->b["val"] == '1');
+				$docStyle->getFont()->setBold( ! isset($style->font->b["val"]) || $style->font->b["val"] == 'true' || $style->font->b["val"] == '1');
 			}
 			if (isset($style->font->i)) {
-				$docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || $style->font->i["val"] == 'true' || $style->font->i["val"] == '1');
+				$docStyle->getFont()->setItalic( ! isset($style->font->i["val"]) || $style->font->i["val"] == 'true' || $style->font->i["val"] == '1');
 			}
 			if (isset($style->font->strike)) {
-				$docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || $style->font->strike["val"] == 'true' || $style->font->strike["val"] == '1');
+				$docStyle->getFont()->setStrikethrough( ! isset($style->font->strike["val"]) || $style->font->strike["val"] == 'true' || $style->font->strike["val"] == '1');
 			}
 			$docStyle->getFont()->getColor()->setARGB(self::_readColor($style->font->color));
 
-			if (isset($style->font->u) && !isset($style->font->u["val"])) {
+			if (isset($style->font->u) && ! isset($style->font->u["val"])) {
 				$docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
 			} else if (isset($style->font->u) && isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
+				$docStyle->getFont()->setUnderline((string) $style->font->u["val"]);
 			}
 
 			if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
-				$vertAlign = strtolower((string)$style->font->vertAlign["val"]);
+				$vertAlign = strtolower((string) $style->font->vertAlign["val"]);
 				if ($vertAlign == 'superscript') {
 					$docStyle->getFont()->setSuperScript(true);
 				}
@@ -1797,23 +1797,23 @@ 
 		if (isset($style->fill)) {
 			if ($style->fill->gradientFill) {
 				$gradientFill = $style->fill->gradientFill[0];
-				if(!empty($gradientFill["type"])) {
+				if ( ! empty($gradientFill["type"])) {
 					$docStyle->getFill()->setFillType((string) $gradientFill["type"]);
 				}
 				$docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
 				$gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color) );
-				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color) );
+				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor(self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color));
+				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor(self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color));
 			} elseif ($style->fill->patternFill) {
-				$patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
+				$patternType = (string) $style->fill->patternFill["patternType"] != '' ? (string) $style->fill->patternFill["patternType"] : 'solid';
 				$docStyle->getFill()->setFillType($patternType);
 				if ($style->fill->patternFill->fgColor) {
-					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor,true));
+					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor, true));
 				} else {
 					$docStyle->getFill()->getStartColor()->setARGB('FF000000');
 				}
 				if ($style->fill->patternFill->bgColor) {
-					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor,true));
+					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor, true));
 				}
 			}
 		}
@@ -1850,22 +1850,22 @@ 
 			$docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
 
 			$textRotation = 0;
-			if ((int)$style->alignment["textRotation"] <= 90) {
-				$textRotation = (int)$style->alignment["textRotation"];
-			} else if ((int)$style->alignment["textRotation"] > 90) {
-				$textRotation = 90 - (int)$style->alignment["textRotation"];
+			if ((int) $style->alignment["textRotation"] <= 90) {
+				$textRotation = (int) $style->alignment["textRotation"];
+			} else if ((int) $style->alignment["textRotation"] > 90) {
+				$textRotation = 90 - (int) $style->alignment["textRotation"];
 			}
 
 			$docStyle->getAlignment()->setTextRotation(intval($textRotation));
-			$docStyle->getAlignment()->setWrapText( (string)$style->alignment["wrapText"] == "true" || (string)$style->alignment["wrapText"] == "1" );
-			$docStyle->getAlignment()->setShrinkToFit( (string)$style->alignment["shrinkToFit"] == "true" || (string)$style->alignment["shrinkToFit"] == "1" );
-			$docStyle->getAlignment()->setIndent( intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0 );
+			$docStyle->getAlignment()->setWrapText((string) $style->alignment["wrapText"] == "true" || (string) $style->alignment["wrapText"] == "1");
+			$docStyle->getAlignment()->setShrinkToFit((string) $style->alignment["shrinkToFit"] == "true" || (string) $style->alignment["shrinkToFit"] == "1");
+			$docStyle->getAlignment()->setIndent(intval((string) $style->alignment["indent"]) > 0 ? intval((string) $style->alignment["indent"]) : 0);
 		}
 
 		// protection
 		if (isset($style->protection)) {
 			if (isset($style->protection['locked'])) {
-				if ((string)$style->protection['locked'] == 'true') {
+				if ((string) $style->protection['locked'] == 'true') {
 					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
 				} else {
 					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
@@ -1873,7 +1873,7 @@ 
 			}
 
 			if (isset($style->protection['hidden'])) {
-				if ((string)$style->protection['hidden'] == 'true') {
+				if ((string) $style->protection['hidden'] == 'true') {
 					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
 				} else {
 					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
@@ -1897,14 +1897,14 @@ 
 		$value = new PHPExcel_RichText();
 
 		if (isset($is->t)) {
-			$value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $is->t ) );
+			$value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $is->t));
 		} else {
 			foreach ($is->r as $run) {
-				if (!isset($run->rPr)) {
-					$objText = $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+				if ( ! isset($run->rPr)) {
+					$objText = $value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
 
 				} else {
-					$objText = $value->createTextRun( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+					$objText = $value->createTextRun(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
 
 					if (isset($run->rPr->rFont["val"])) {
 						$objText->getFont()->setName((string) $run->rPr->rFont["val"]);
@@ -1915,21 +1915,21 @@ 
 					}
 
 					if (isset($run->rPr->color)) {
-						$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($run->rPr->color) ) );
+						$objText->getFont()->setColor(new PHPExcel_Style_Color(self::_readColor($run->rPr->color)));
 					}
 
-					if ( (isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
-					     || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
+					if ((isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
+					     || (isset($run->rPr->b) && ! isset($run->rPr->b["val"]))) {
 						$objText->getFont()->setBold(true);
 					}
 
-					if ( (isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
-					     || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
+					if ((isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
+					     || (isset($run->rPr->i) && ! isset($run->rPr->i["val"]))) {
 						$objText->getFont()->setItalic(true);
 					}
 
 					if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
-						$vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
+						$vertAlign = strtolower((string) $run->rPr->vertAlign["val"]);
 						if ($vertAlign == 'superscript') {
 							$objText->getFont()->setSuperScript(true);
 						}
@@ -1938,14 +1938,14 @@ 
 						}
 					}
 
-					if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
+					if (isset($run->rPr->u) && ! isset($run->rPr->u["val"])) {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
 					} else if (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
+						$objText->getFont()->setUnderline((string) $run->rPr->u["val"]);
 					}
 
-					if ( (isset($run->rPr->strike["val"])  && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
-					     || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
+					if ((isset($run->rPr->strike["val"]) && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
+					     || (isset($run->rPr->strike) && ! isset($run->rPr->strike["val"]))) {
 						$objText->getFont()->setStrikethrough(true);
 					}
 				}
@@ -1962,12 +1962,12 @@ 
 
 
 	private static function dir_add($base, $add) {
-		return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+		return preg_replace('~[^/]+/\.\./~', '', dirname($base)."/$add");
 	}
 
 
 	private static function toCSSArray($style) {
-		$style = str_replace(array("\r","\n"), "", $style);
+		$style = str_replace(array("\r", "\n"), "", $style);
 
 		$temp = explode(';', $style);
 		$style = array();

Braces +34 added lines, -14 removed lines

@@ -561,10 +561,12 @@ 
 					$xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
 					if (is_object($xmlCore)) {
 						$docProps = $excel->getProperties();
-						if (isset($xmlCore->Company))
-							$docProps->setCompany((string) $xmlCore->Company);
-						if (isset($xmlCore->Manager))
-							$docProps->setManager((string) $xmlCore->Manager);
+						if (isset($xmlCore->Company)) {
+													$docProps->setCompany((string) $xmlCore->Company);
+						}
+						if (isset($xmlCore->Manager)) {
+													$docProps->setManager((string) $xmlCore->Manager);
+						}
 					}
 				break;
 
@@ -1000,9 +1002,13 @@ 
 
 										// Check for numeric values
 										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
+											if ($value == (int)$value) {
+												$value = (int)$value;
+											} elseif ($value == (float)$value) {
+												$value = (float)$value;
+											} elseif ($value == (double)$value) {
+												$value = (double)$value;
+											}
 										}
 
 										// Rich text?
@@ -1320,10 +1326,14 @@ 
 
 	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
 	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
+	        									    if (is_array($temp)) {
+	        									    	$row = $temp[0];
+	        									    }
 
 	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
+	        									    if (is_array($temp)) {
+	        									    	$column = $temp[0];
+	        									    }
 	        									}
 	    									}
 
@@ -1337,11 +1347,21 @@ 
 	    									    foreach ($styleArray as $stylePair) {
 	    									        $stylePair = explode(':', $stylePair);
 
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+	    									        if ($stylePair[0] == 'margin-left') {
+	    									        	$comment->setMarginLeft($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'margin-top') {
+	    									        	$comment->setMarginTop($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'width') {
+	    									        	$comment->setWidth($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'height') {
+	    									        	$comment->setHeight($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'visibility') {
+	    									        	$comment->setVisible( $stylePair[1] == 'visible' );
+	    									        }
 
 	    									    }
 	    									}

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php

Doc Comments +11 added lines

@@ -34,6 +34,10 @@ 
  */
 class PHPExcel_Reader_Excel2007_Chart
 {
+	/**
+	 * @param string $name
+	 * @param string $format
+	 */
 	private static function _getAttribute($component, $name, $format) {
 		$attributes = $component->attributes();
 		if (isset($attributes[$name])) {
@@ -60,6 +64,10 @@ 
 	}
 
 
+	/**
+	 * @param SimpleXMLElement $chartElements
+	 * @param string $chartName
+	 */
 	public static function readChart($chartElements,$chartName) {
 		$namespacesChartMeta = $chartElements->getNamespaces(true);
 		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
@@ -188,6 +196,9 @@ 
 	}	//	function readChart()
 
 
+	/**
+	 * @param string $type
+	 */
 	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
 		$caption = array();
 		$titleLayout = null;

Spacing +67 added lines, -67 removed lines

@@ -51,104 +51,104 @@ 
 	}	//	function _getAttribute()
 
 
-	private static function _readColor($color,$background=false) {
+	private static function _readColor($color, $background = false) {
 		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
+			return (string) $color["rgb"];
 		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+			return PHPExcel_Style_Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
 		}
 	}
 
 
-	public static function readChart($chartElements,$chartName) {
+	public static function readChart($chartElements, $chartName) {
 		$namespacesChartMeta = $chartElements->getNamespaces(true);
 		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
 
 		$XaxisLabel = $YaxisLabel = $legend = $title = null;
 
-		foreach($chartElementsC as $chartElementKey => $chartElement) {
+		foreach ($chartElementsC as $chartElementKey => $chartElement) {
 			switch ($chartElementKey) {
 				case "chart":
-					foreach($chartElement as $chartDetailsKey => $chartDetails) {
+					foreach ($chartElement as $chartDetailsKey => $chartDetails) {
 						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
 						switch ($chartDetailsKey) {
 							case "plotArea":
 									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
 									$plotSeries = array();
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+									foreach ($chartDetails as $chartDetailKey => $chartDetail) {
 										switch ($chartDetailKey) {
 											case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
+												$plotAreaLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
 												break;
 											case "catAx":
 												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "dateAx":
 												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "valAx":
 												if (isset($chartDetail->title)) {
-													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "barChart":
 											case "bar3DChart":
 												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotDirection($barDirection);
 												$plotSeries[] = $plotSer;
 												break;
 											case "lineChart":
 											case "line3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 											case "areaChart":
 											case "area3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 											case "doughnutChart":
 											case "pieChart":
 											case "pie3DChart":
 												$explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($explosion);
 												$plotSeries[] = $plotSer;
 												break;
 											case "scatterChart":
 												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($scatterStyle);
 												$plotSeries[] = $plotSer;
 												break;
 											case "bubbleChart":
 												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($bubbleScale);
 												$plotSeries[] = $plotSer;
 												break;
 											case "radarChart":
 												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($radarStyle);
 												$plotSeries[] = $plotSer;
 												break;
 											case "surfaceChart":
 											case "surface3DChart":
 												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($wireFrame);
 												$plotSeries[] = $plotSer;
 												break;
 											case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 										}
 									}
-									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
+									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries);
 									break;
 							case "plotVisOnly":
 									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
@@ -157,13 +157,13 @@ 
 									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
 									break;
 							case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
+									$title = self::_chartTitle($chartDetails, $namespacesChartMeta, 'title');
 									break;
 							case "legend":
 									$legendPos = 'r';
 									$legendLayout = null;
 									$legendOverlay = false;
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+									foreach ($chartDetails as $chartDetailKey => $chartDetail) {
 										switch ($chartDetailKey) {
 											case "legendPos":
 												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
@@ -172,7 +172,7 @@ 
 												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
 												break;
 											case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
+												$legendLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
 												break;
 										}
 									}
@@ -182,20 +182,20 @@ 
 					}
 			}
 		}
-		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
+		$chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
 
 		return $chart;
 	}	//	function readChart()
 
 
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
+	private static function _chartTitle($titleDetails, $namespacesChartMeta, $type) {
 		$caption = array();
 		$titleLayout = null;
-		foreach($titleDetails as $titleDetailKey => $chartDetail) {
+		foreach ($titleDetails as $titleDetailKey => $chartDetail) {
 			switch ($titleDetailKey) {
 				case "tx":
 					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-					foreach($titleDetails as $titleKey => $titleDetail) {
+					foreach ($titleDetails as $titleKey => $titleDetail) {
 						switch ($titleKey) {
 							case "p":
 								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
@@ -204,7 +204,7 @@ 
 					}
 					break;
 				case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
+					$titleLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta);
 					break;
 			}
 		}
@@ -213,8 +213,8 @@ 
 	}	//	function _chartTitle()
 
 
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
-		if (!isset($chartDetail->manualLayout)) {
+	private static function _chartLayoutDetails($chartDetail, $namespacesChartMeta) {
+		if ( ! isset($chartDetail->manualLayout)) {
 			return null;
 		}
 		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
@@ -222,7 +222,7 @@ 
 			return null;
 		}
 		$layout = array();
-		foreach($details as $detailKey => $detail) {
+		foreach ($details as $detailKey => $detail) {
 //			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),'<br />';
 			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
 		}
@@ -230,20 +230,20 @@ 
 	}	//	function _chartLayoutDetails()
 
 
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
+	private static function _chartDataSeries($chartDetail, $namespacesChartMeta, $plotType) {
 		$multiSeriesType = NULL;
 		$smoothLine = false;
 		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
 
 		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
-		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+		foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
 			switch ($seriesDetailKey) {
 				case "grouping":
 					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
 					break;
 				case "ser":
 					$marker = NULL;
-					foreach($seriesDetails as $seriesKey => $seriesDetail) {
+					foreach ($seriesDetails as $seriesKey => $seriesDetail) {
 						switch ($seriesKey) {
 							case "idx":
 								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
@@ -253,7 +253,7 @@ 
 								$plotOrder[$seriesIndex] = $seriesOrder;
 								break;
 							case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
 								break;
 							case "marker":
 								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
@@ -262,59 +262,59 @@ 
 								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
 								break;
 							case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
 								break;
 							case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 							case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 							case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 						}
 					}
 			}
 		}
-		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
+		return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
 	}	//	function _chartDataSeries()
 
 
 	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
 		if (isset($seriesDetail->strRef)) {
 			$seriesSource = (string) $seriesDetail->strRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->numRef)) {
 			$seriesSource = (string) $seriesDetail->numRef->f;
 			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
 
-			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->multiLvlStrRef)) {
 			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
 			$seriesData['pointCount'] = count($seriesData['dataValues']);
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->multiLvlNumRef)) {
 			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
 			$seriesData['pointCount'] = count($seriesData['dataValues']);
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		}
 		return null;
 	}	//	function _chartDataSeriesValueSet()
 
 
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
+	private static function _chartDataSeriesValues($seriesValueSet, $dataType = 'n') {
 		$seriesVal = array();
 		$formatCode = '';
 		$pointCount = 0;
 
-		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
+		foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
 			switch ($seriesValueIdx) {
 				case 'ptCount':
 					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
@@ -333,20 +333,20 @@ 
 			}
 		}
 
-		return array( 'formatCode'	=> $formatCode,
+		return array('formatCode'	=> $formatCode,
 					  'pointCount'	=> $pointCount,
 					  'dataValues'	=> $seriesVal
 					);
 	}	//	function _chartDataSeriesValues()
 
 
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
+	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n') {
 		$seriesVal = array();
 		$formatCode = '';
 		$pointCount = 0;
 
-		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
-			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
+		foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+			foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
 				switch ($seriesValueIdx) {
 					case 'ptCount':
 						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
@@ -366,7 +366,7 @@ 
 			}
 		}
 
-		return array( 'formatCode'	=> $formatCode,
+		return array('formatCode'	=> $formatCode,
 					  'pointCount'	=> $pointCount,
 					  'dataValues'	=> $seriesVal
 					);
@@ -375,9 +375,9 @@ 
 	private static function _parseRichText($titleDetailPart = null) {
 		$value = new PHPExcel_RichText();
 
-		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+		foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
 			if (isset($titleDetailElement->t)) {
-				$objText = $value->createTextRun( (string) $titleDetailElement->t );
+				$objText = $value->createTextRun((string) $titleDetailElement->t);
 			}
 			if (isset($titleDetailElement->rPr)) {
 				if (isset($titleDetailElement->rPr->rFont["val"])) {
@@ -385,39 +385,39 @@ 
 				}
 
 				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-				if (!is_null($fontSize)) {
+				if ( ! is_null($fontSize)) {
 					$objText->getFont()->setSize(floor($fontSize / 100));
 				}
 
 				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
-				if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
+				if ( ! is_null($fontColor)) {
+					$objText->getFont()->setColor(new PHPExcel_Style_Color(self::_readColor($fontColor)));
 				}
 
 				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-				if (!is_null($bold)) {
+				if ( ! is_null($bold)) {
 					$objText->getFont()->setBold($bold);
 				}
 
 				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-				if (!is_null($italic)) {
+				if ( ! is_null($italic)) {
 					$objText->getFont()->setItalic($italic);
 				}
 
 				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-				if (!is_null($baseline)) {
+				if ( ! is_null($baseline)) {
 					if ($baseline > 0) {
 						$objText->getFont()->setSuperScript(true);
-					} elseif($baseline < 0) {
+					} elseif ($baseline < 0) {
 						$objText->getFont()->setSubScript(true);
 					}
 				}
 
 				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
-				if (!is_null($underscore)) {
+				if ( ! is_null($underscore)) {
 					if ($underscore == 'sng') {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} elseif($underscore == 'dbl') {
+					} elseif ($underscore == 'dbl') {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
 					} else {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
@@ -425,7 +425,7 @@ 
 				}
 
 				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
-				if (!is_null($strikethrough)) {
+				if ( ! is_null($strikethrough)) {
 					if ($strikethrough == 'noStrike') {
 						$objText->getFont()->setStrikethrough(false);
 					} else {