reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Reader/Gnumeric.php

Doc Comments +4 added lines, -1 removed lines

@@ -189,7 +189,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -268,6 +268,9 @@ 
 	}
 
 
+	/**
+	 * @param string $filename
+	 */
 	private function _gzfileGetContents($filename) {
 		$file = @gzopen($filename, 'rb');
 		if ($file !== false) {

Indentation +1 added lines, -1 removed lines

@@ -363,7 +363,7 @@
 		//	Document Properties are held differently, depending on the version of Gnumeric
 		if (isset($namespacesMeta['office'])) {
 			$officeXML = $xml->children($namespacesMeta['office']);
-		    $officeDocXML = $officeXML->{'document-meta'};
+			$officeDocXML = $officeXML->{'document-meta'};
 			$officeDocMetaXML = $officeDocXML->meta;
 
 			foreach($officeDocMetaXML as $officePropertyData) {

Spacing +64 added lines, -64 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');
 }
 
 /**
@@ -89,7 +89,7 @@ 
 	 * Create a new PHPExcel_Reader_Gnumeric
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
 	}
 
@@ -196,12 +196,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 gzlib functions are available
-		if (!function_exists('gzread')) {
+		if ( ! function_exists('gzread')) {
 			throw new Exception("gzlib library is not enabled");
 		}
 
@@ -227,8 +227,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.");
 		}
 
 		$gFileData = $this->_gzfileGetContents($pFilename);
@@ -272,7 +272,7 @@ 
 		$file = @gzopen($filename, 'rb');
 		if ($file !== false) {
 			$data = '';
-			while (!gzeof($file)) {
+			while ( ! gzeof($file)) {
 				$data .= gzread($file, 1024);
 			}
 			gzclose($file);
@@ -307,8 +307,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.");
 		}
 
 		$gFileData = $this->_gzfileGetContents($pFilename);
@@ -320,7 +320,7 @@ 
 
 		$worksheetNames = array();
 
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
+		foreach ($gnmXML->Sheets->Sheet as $sheet) {
 			$worksheetNames[] = (string) $sheet->Name;
 		}
 
@@ -339,8 +339,8 @@ 
 	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.");
 		}
 
 		$timezoneObj = new DateTimeZone('Europe/London');
@@ -366,13 +366,13 @@ 
 		    $officeDocXML = $officeXML->{'document-meta'};
 			$officeDocMetaXML = $officeDocXML->meta;
 
-			foreach($officeDocMetaXML as $officePropertyData) {
+			foreach ($officeDocMetaXML as $officePropertyData) {
 
 				$officePropertyDC = array();
 				if (isset($namespacesMeta['dc'])) {
 					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
 				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
+				foreach ($officePropertyDC as $propertyName => $propertyValue) {
 					$propertyValue = (string) $propertyValue;
 					switch ($propertyName) {
 						case 'title' :
@@ -399,7 +399,7 @@ 
 				if (isset($namespacesMeta['meta'])) {
 					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
 				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
+				foreach ($officePropertyMeta as $propertyName => $propertyValue) {
 					$attributes = $propertyValue->attributes($namespacesMeta['meta']);
 					$propertyValue = (string) $propertyValue;
 					switch ($propertyName) {
@@ -416,7 +416,7 @@ 
 								$docProps->setModified($creationDate);
 								break;
 						case 'user-defined' :
-								list(,$attrName) = explode(':',$attributes['name']);
+								list(,$attrName) = explode(':', $attributes['name']);
 								switch ($attrName) {
 									case 'publisher' :
 											$docProps->setCompany(trim($propertyValue));
@@ -433,7 +433,7 @@ 
 				}
 			}
 		} elseif (isset($gnmXML->Summary)) {
-			foreach($gnmXML->Summary->Item as $summaryItem) {
+			foreach ($gnmXML->Summary->Item as $summaryItem) {
 				$propertyName = $summaryItem->name;
 				$propertyValue = $summaryItem->{'val-string'};
 				switch ($propertyName) {
@@ -464,10 +464,10 @@ 
 		}
 
 		$worksheetID = 0;
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
+		foreach ($gnmXML->Sheets->Sheet as $sheet) {
 			$worksheetName = (string) $sheet->Name;
 //			echo '<b>Worksheet: ',$worksheetName,'</b><br />';
-			if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
+			if ((isset($this->_loadSheetsOnly)) && ( ! in_array($worksheetName, $this->_loadSheetsOnly))) {
 				continue;
 			}
 
@@ -479,19 +479,19 @@ 
 			//	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);
 
-			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->PrintInformation))) {
 				if (isset($sheet->PrintInformation->Margins)) {
-					foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
+					foreach ($sheet->PrintInformation->Margins->children('gnm', TRUE) as $key => $margin) {
 						$marginAttributes = $margin->attributes();
-						$marginSize = 72 / 100;	//	Default
-						switch($marginAttributes['PrefUnit']) {
+						$marginSize = 72 / 100; //	Default
+						switch ($marginAttributes['PrefUnit']) {
 							case 'mm' :
 								$marginSize = intval($marginAttributes['Points']) / 100;
 								break;
 						}
-						switch($key) {
+						switch ($key) {
 							case 'top' :
 								$objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
 								break;
@@ -515,7 +515,7 @@ 
 				}
 			}
 
-			foreach($sheet->Cells->Cell as $cell) {
+			foreach ($sheet->Cells->Cell as $cell) {
 				$cellAttributes = $cell->attributes();
 				$row = (int) $cellAttributes->Row + 1;
 				$column = (int) $cellAttributes->Col;
@@ -527,7 +527,7 @@ 
 
 				// Read cell?
 				if ($this->getReadFilter() !== NULL) {
-					if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
+					if ( ! $this->getReadFilter()->readCell($column, $row, $worksheetName)) {
 						continue;
 					}
 				}
@@ -541,7 +541,7 @@ 
 				if ($ExprID > '') {
 					if (((string) $cell) > '') {
 
-						$this->_expressions[$ExprID] = array( 'column'	=> $cellAttributes->Col,
+						$this->_expressions[$ExprID] = array('column'	=> $cellAttributes->Col,
 															  'row'		=> $cellAttributes->Row,
 															  'formula'	=> (string) $cell
 															);
@@ -549,7 +549,7 @@ 
 					} else {
 						$expression = $this->_expressions[$ExprID];
 
-						$cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
+						$cell = $this->_referenceHelper->updateFormulaReferences($expression['formula'],
 																				  'A1',
 																				  $cellAttributes->Col - $expression['column'],
 																				  $cellAttributes->Row - $expression['row'],
@@ -560,7 +560,7 @@ 
 					}
 					$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
 				} else {
-					switch($ValueType) {
+					switch ($ValueType) {
 						case '10' :		//	NULL
 							$type = PHPExcel_Cell_DataType::TYPE_NULL;
 							break;
@@ -583,23 +583,23 @@ 
 						case '80' :		//	Array
 					}
 				}
-				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
+				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
-				foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Objects))) {
+				foreach ($sheet->Objects->children('gnm', TRUE) as $key => $comment) {
 					$commentAttributes = $comment->attributes();
 					//	Only comment objects are handled at the moment
 					if ($commentAttributes->Text) {
-						$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
-															->setAuthor( (string)$commentAttributes->Author )
-															->setText($this->_parseRichText((string)$commentAttributes->Text) );
+						$objPHPExcel->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)
+															->setAuthor((string) $commentAttributes->Author)
+															->setText($this->_parseRichText((string) $commentAttributes->Text));
 					}
 				}
 			}
 //			echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
 //
-			foreach($sheet->Styles->StyleRegion as $styleRegion) {
+			foreach ($sheet->Styles->StyleRegion as $styleRegion) {
 				$styleAttributes = $styleRegion->attributes();
 				if (($styleAttributes['startRow'] <= $maxRow) &&
 					($styleAttributes['startCol'] <= $maxCol)) {
@@ -619,13 +619,13 @@ 
 //					echo '<br />';
 
 					//	We still set the number format mask for date/time values, even if _readDataOnly is true
-					if ((!$this->_readDataOnly) ||
+					if (( ! $this->_readDataOnly) ||
 						(PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
 						$styleArray = array();
 						$styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
 						//	If _readDataOnly is false, we set all formatting information
-						if (!$this->_readDataOnly) {
-							switch($styleAttributes['HAlign']) {
+						if ( ! $this->_readDataOnly) {
+							switch ($styleAttributes['HAlign']) {
 								case '1' :
 									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
 									break;
@@ -647,7 +647,7 @@ 
 									break;
 							}
 
-							switch($styleAttributes['VAlign']) {
+							switch ($styleAttributes['VAlign']) {
 								case '1' :
 									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
 									break;
@@ -674,7 +674,7 @@ 
 								$styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
 								$RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
 								$styleArray['fill']['endcolor']['rgb'] = $RGB2;
-								switch($shade) {
+								switch ($shade) {
 									case '1' :
 										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
 										break;
@@ -746,7 +746,7 @@ 
 							$styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
 							$styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
 							$styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
-							switch($fontAttributes['Underline']) {
+							switch ($fontAttributes['Underline']) {
 								case '1' :
 									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
 									break;
@@ -763,7 +763,7 @@ 
 									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
 									break;
 							}
-							switch($fontAttributes['Script']) {
+							switch ($fontAttributes['Script']) {
 								case '1' :
 									$styleArray['font']['superScript'] = True;
 									break;
@@ -808,22 +808,22 @@ 
 				}
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Cols))) {
 				//	Column Widths
 				$columnAttributes = $sheet->Cols->attributes();
-				$defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
+				$defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
 				$c = 0;
-				foreach($sheet->Cols->ColInfo as $columnOverride) {
+				foreach ($sheet->Cols->ColInfo as $columnOverride) {
 					$columnAttributes = $columnOverride->attributes();
 					$column = $columnAttributes['No'];
-					$columnWidth = $columnAttributes['Unit']  / 5.4;
+					$columnWidth = $columnAttributes['Unit'] / 5.4;
 					$hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
 					$columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
 					while ($c < $column) {
 						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
 						++$c;
 					}
-					while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
+					while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
 						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
 						if ($hidden) {
 							$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
@@ -837,13 +837,13 @@ 
 				}
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Rows))) {
 				//	Row Heights
 				$rowAttributes = $sheet->Rows->attributes();
 				$defaultHeight = $rowAttributes['DefaultSizePts'];
 				$r = 0;
 
-				foreach($sheet->Rows->RowInfo as $rowOverride) {
+				foreach ($sheet->Rows->RowInfo as $rowOverride) {
 					$rowAttributes = $rowOverride->attributes();
 					$row = $rowAttributes['No'];
 					$rowHeight = $rowAttributes['Unit'];
@@ -853,7 +853,7 @@ 
 						++$r;
 						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
 					}
-					while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
+					while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
 						++$r;
 						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
 						if ($hidden) {
@@ -869,7 +869,7 @@ 
 
 			//	Handle Merged Cells in this worksheet
 			if (isset($sheet->MergedRegions)) {
-				foreach($sheet->MergedRegions->Merge as $mergeCells) {
+				foreach ($sheet->MergedRegions->Merge as $mergeCells) {
 					$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
 				}
 			}
@@ -879,18 +879,18 @@ 
 
 		//	Loop through definedNames (global named ranges)
 		if (isset($gnmXML->Names)) {
-			foreach($gnmXML->Names->Name as $namedRange) {
+			foreach ($gnmXML->Names->Name as $namedRange) {
 				$name = (string) $namedRange->name;
 				$range = (string) $namedRange->value;
 				if (stripos($range, '#REF!') !== false) {
 					continue;
 				}
 
-				$range = explode('!',$range);
-				$range[0] = trim($range[0],"'");;
+				$range = explode('!', $range);
+				$range[0] = trim($range[0], "'"); ;
 				if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
 					$extractedRange = str_replace('$', '', $range[1]);
-					$objPHPExcel->addNamedRange( new PHPExcel_NamedRange($name, $worksheet, $extractedRange) );
+					$objPHPExcel->addNamedRange(new PHPExcel_NamedRange($name, $worksheet, $extractedRange));
 				}
 			}
 		}
@@ -967,10 +967,10 @@ 
 
 
 	private static function _parseGnumericColour($gnmColour) {
-		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
-		$gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmG = substr(str_pad($gnmG,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmB = substr(str_pad($gnmB,4,'0',STR_PAD_RIGHT),0,2);
+		list($gnmR, $gnmG, $gnmB) = explode(':', $gnmColour);
+		$gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
+		$gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
+		$gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
 		$RGB = $gnmR.$gnmG.$gnmB;
 //		echo 'Excel Colour: ',$RGB,'<br />';
 		return $RGB;

Braces +6 added lines, -2 removed lines

@@ -520,8 +520,12 @@
 				$row = (int) $cellAttributes->Row + 1;
 				$column = (int) $cellAttributes->Col;
 
-				if ($row > $maxRow) $maxRow = $row;
-				if ($column > $maxCol) $maxCol = $column;
+				if ($row > $maxRow) {
+					$maxRow = $row;
+				}
+				if ($column > $maxCol) {
+					$maxCol = $column;
+				}
 
 				$column = PHPExcel_Cell::stringFromColumnIndex($column);
 

app/Vendor/PHPExcel/PHPExcel/Reader/IReader.php

Doc Comments +3 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 */
 	public function canRead($pFilename);
@@ -46,8 +46,9 @@ 
 	/**
 	 * Loads PHPExcel from file
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @throws 	Exception
+	 * @return PHPExcel
 	 */
 	public function load($pFilename);
 }

app/Vendor/PHPExcel/PHPExcel/Reader/OOCalc.php

Doc Comments +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */

Spacing +53 added lines, -53 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');
 }
 
 /**
@@ -80,7 +80,7 @@ 
 	 * Create a new PHPExcel_Reader_OOCalc
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}
 
 
@@ -185,12 +185,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");
 		}
 
@@ -218,8 +218,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();
@@ -231,9 +231,9 @@ 
 			$namespacesContent = $xml->getNamespaces(true);
 
 			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
+			foreach ($workbook->body->spreadsheet as $workbookData) {
 				$workbookData = $workbookData->children($namespacesContent['table']);
-				foreach($workbookData->table as $worksheetDataSet) {
+				foreach ($workbookData->table as $worksheetDataSet) {
 					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
 
 					$worksheetNames[] = $worksheetDataAttributes['name'];
@@ -262,9 +262,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;
@@ -283,8 +283,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();
@@ -296,9 +296,9 @@ 
 			$namespacesContent = $xml->getNamespaces(true);
 
 			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
+			foreach ($workbook->body->spreadsheet as $workbookData) {
 				$workbookData = $workbookData->children($namespacesContent['table']);
-				foreach($workbookData->table as $worksheetDataSet) {
+				foreach ($workbookData->table as $worksheetDataSet) {
 					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
 					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
 
@@ -375,8 +375,8 @@ 
 	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.");
 		}
 
 		$timezoneObj = new DateTimeZone('Europe/London');
@@ -393,12 +393,12 @@ 
 
 			$docProps = $objPHPExcel->getProperties();
 			$officeProperty = $xml->children($namespacesMeta['office']);
-			foreach($officeProperty as $officePropertyData) {
+			foreach ($officeProperty as $officePropertyData) {
 				$officePropertyDC = array();
 				if (isset($namespacesMeta['dc'])) {
 					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
 				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
+				foreach ($officePropertyDC as $propertyName => $propertyValue) {
 					switch ($propertyName) {
 						case 'title' :
 								$docProps->setTitle($propertyValue);
@@ -424,7 +424,7 @@ 
 				if (isset($namespacesMeta['dc'])) {
 					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
 				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
+				foreach ($officePropertyMeta as $propertyName => $propertyValue) {
 					$propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
 					switch ($propertyName) {
 						case 'initial-creator' :
@@ -442,18 +442,18 @@ 
 								foreach ($propertyValueAttributes as $key => $value) {
 									if ($key == 'name') {
 										$propertyValueName = (string) $value;
-									} elseif($key == 'value-type') {
+									} elseif ($key == 'value-type') {
 										switch ($value) {
 											case 'date'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'date');
+												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'date');
 												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
 												break;
 											case 'boolean'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'bool');
+												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'bool');
 												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
 												break;
 											case 'float'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'r4');
+												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'r4');
 												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
 												break;
 											default :
@@ -461,7 +461,7 @@ 
 										}
 									}
 								}
-								$docProps->setCustomProperty($propertyValueName,$propertyValue,$propertyValueType);
+								$docProps->setCustomProperty($propertyValueName, $propertyValue, $propertyValueType);
 								break;
 					}
 				}
@@ -476,10 +476,10 @@ 
 //			echo '</pre><hr />';
 
 			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
+			foreach ($workbook->body->spreadsheet as $workbookData) {
 				$workbookData = $workbookData->children($namespacesContent['table']);
 				$worksheetID = 0;
-				foreach($workbookData->table as $worksheetDataSet) {
+				foreach ($workbookData->table as $worksheetDataSet) {
 					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
 //					print_r($worksheetData);
 //					echo '<br />';
@@ -487,7 +487,7 @@ 
 //					print_r($worksheetDataAttributes);
 //					echo '<br />';
 					if ((isset($this->_loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
-						(!in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
+						( ! in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
 						continue;
 					}
 
@@ -500,11 +500,11 @@ 
 						//	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);
 					}
 
 					$rowID = 1;
-					foreach($worksheetData as $key => $rowData) {
+					foreach ($worksheetData as $key => $rowData) {
 //						echo '<b>'.$key.'</b><br />';
 						switch ($key) {
 							case 'table-header-rows':
@@ -514,9 +514,9 @@ 
 								}
 							case 'table-row' :
 								$columnID = 'A';
-								foreach($rowData as $key => $cellData) {
+								foreach ($rowData as $key => $cellData) {
 									if ($this->getReadFilter() !== NULL) {
-										if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+										if ( ! $this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
 											continue;
 										}
 									}
@@ -547,16 +547,16 @@ 
 //										echo 'Cell has comment<br />';
 										$annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
 										$textArray = array();
-										foreach($annotationText as $t) {
-											foreach($t->span as $text) {
-												$textArray[] = (string)$text;
+										foreach ($annotationText as $t) {
+											foreach ($t->span as $text) {
+												$textArray[] = (string) $text;
 											}
 										}
-										$text = implode("\n",$textArray);
+										$text = implode("\n", $textArray);
 //										echo $text,'<br />';
-										$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
+										$objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)
 //																		->setAuthor( $author )
-																		->setText($this->_parseRichText($text) );
+																		->setText($this->_parseRichText($text));
 									}
 
 									if (isset($cellDataText->p)) {
@@ -586,8 +586,8 @@ 
 													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
 												    $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
 													$dateObj->setTimeZone($timezoneObj);
-													list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s'));
-													$dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second);
+													list($year, $month, $day, $hour, $minute, $second) = explode(' ', $dateObj->format('Y m d H i s'));
+													$dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year, $month, $day, $hour, $minute, $second);
 													if ($dataValue != floor($dataValue)) {
 														$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15.' '.PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
 													} else {
@@ -596,7 +596,7 @@ 
 													break;
 											case 'time' :
 													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-													$dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':',sscanf($cellDataOfficeAttributes['time-value'],'PT%dH%dM%dS'))));
+													$dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':', sscanf($cellDataOfficeAttributes['time-value'], 'PT%dH%dM%dS'))));
 													$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
 													break;
 										}
@@ -609,20 +609,20 @@ 
 									if ($hasCalculatedValue) {
 										$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
 //										echo 'Formula: '.$cellDataFormula.'<br />';
-										$cellDataFormula = substr($cellDataFormula,strpos($cellDataFormula,':=')+1);
-										$temp = explode('"',$cellDataFormula);
+										$cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
+										$temp = explode('"', $cellDataFormula);
 										$tKey = false;
-										foreach($temp as &$value) {
+										foreach ($temp as &$value) {
 											//	Only replace in alternate array entries (i.e. non-quoted blocks)
-											if ($tKey = !$tKey) {
-												$value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value);
-												$value = preg_replace('/\[\.(.*)\]/Ui','$1',$value);
-												$value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces);
+											if ($tKey = ! $tKey) {
+												$value = preg_replace('/\[\.(.*):\.(.*)\]/Ui', '$1:$2', $value);
+												$value = preg_replace('/\[\.(.*)\]/Ui', '$1', $value);
+												$value = PHPExcel_Calculation::_translateSeparator(';', ',', $value, $inBraces);
 											}
 										}
 										unset($value);
 										//	Then rebuild the formula string
-										$cellDataFormula = implode('"',$temp);
+										$cellDataFormula = implode('"', $temp);
 //										echo 'Adjusted Formula: '.$cellDataFormula.'<br />';
 									}
 
@@ -633,7 +633,7 @@ 
 											if ($i > 0) {
 												++$columnID;
 											}
-											$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
+											$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue), $type);
 											if ($hasCalculatedValue) {
 //												echo 'Forumla result is '.$dataValue.'<br />';
 												$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($dataValue);
@@ -652,7 +652,7 @@ 
 									if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
 										$columnTo = $columnID;
 										if (isset($cellDataTableAttributes['number-columns-spanned'])) {
-											$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+											$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] - 2);
 										}
 										$rowTo = $rowID;
 										if (isset($cellDataTableAttributes['number-rows-spanned'])) {

Indentation +1 added lines, -1 removed lines

@@ -584,7 +584,7 @@
 													break;
 											case 'date' :
 													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												    $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
+													$dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
 													$dateObj->setTimeZone($timezoneObj);
 													list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s'));
 													$dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second);

app/Vendor/PHPExcel/PHPExcel/RichText.php

Doc Comments -1 removed lines

@@ -45,7 +45,6 @@
     /**
      * Create a new PHPExcel_RichText instance
      *
-     * @param 	PHPExcel_Cell	$pParent
      * @throws	Exception
      */
     public function __construct(PHPExcel_Cell $pCell = null)

Indentation +125 added lines, -125 removed lines

@@ -42,126 +42,126 @@ 
 	 */
 	private $_richTextElements;
 
-    /**
-     * Create a new PHPExcel_RichText instance
-     *
-     * @param 	PHPExcel_Cell	$pParent
-     * @throws	Exception
-     */
-    public function __construct(PHPExcel_Cell $pCell = null)
-    {
-    	// Initialise variables
-    	$this->_richTextElements = array();
-
-    	// Rich-Text string attached to cell?
-    	if ($pCell !== NULL) {
-	    	// Add cell text and style
-	    	if ($pCell->getValue() != "") {
-	    		$objRun = new PHPExcel_RichText_Run($pCell->getValue());
-	    		$objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
-	    		$this->addText($objRun);
-	    	}
-
-	    	// Set parent value
-	    	$pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
-    	}
-    }
-
-    /**
-     * Add text
-     *
-     * @param 	PHPExcel_RichText_ITextElement		$pText		Rich text element
-     * @throws 	Exception
-     * @return PHPExcel_RichText
-     */
-    public function addText(PHPExcel_RichText_ITextElement $pText = null)
-    {
-    	$this->_richTextElements[] = $pText;
-    	return $this;
-    }
-
-    /**
-     * Create text
-     *
-     * @param 	string	$pText	Text
-     * @return	PHPExcel_RichText_TextElement
-     * @throws 	Exception
-     */
-    public function createText($pText = '')
-    {
-    	$objText = new PHPExcel_RichText_TextElement($pText);
-    	$this->addText($objText);
-    	return $objText;
-    }
-
-    /**
-     * Create text run
-     *
-     * @param 	string	$pText	Text
-     * @return	PHPExcel_RichText_Run
-     * @throws 	Exception
-     */
-    public function createTextRun($pText = '')
-    {
-    	$objText = new PHPExcel_RichText_Run($pText);
-    	$this->addText($objText);
-    	return $objText;
-    }
-
-    /**
-     * Get plain text
-     *
-     * @return string
-     */
-    public function getPlainText()
-    {
-    	// Return value
-    	$returnValue = '';
-
-    	// Loop through all PHPExcel_RichText_ITextElement
-    	foreach ($this->_richTextElements as $text) {
-    		$returnValue .= $text->getText();
-    	}
-
-    	// Return
-    	return $returnValue;
-    }
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-    public function __toString() {
-    	return $this->getPlainText();
-    }
-
-    /**
-     * Get Rich Text elements
-     *
-     * @return PHPExcel_RichText_ITextElement[]
-     */
-    public function getRichTextElements()
-    {
-    	return $this->_richTextElements;
-    }
-
-    /**
-     * Set Rich Text elements
-     *
-     * @param 	PHPExcel_RichText_ITextElement[]	$pElements		Array of elements
-     * @throws 	Exception
-     * @return PHPExcel_RichText
-     */
-    public function setRichTextElements($pElements = null)
-    {
-    	if (is_array($pElements)) {
-    		$this->_richTextElements = $pElements;
-    	} else {
-    		throw new Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
-    	}
-    	return $this;
-    }
+	/**
+	 * Create a new PHPExcel_RichText instance
+	 *
+	 * @param 	PHPExcel_Cell	$pParent
+	 * @throws	Exception
+	 */
+	public function __construct(PHPExcel_Cell $pCell = null)
+	{
+		// Initialise variables
+		$this->_richTextElements = array();
+
+		// Rich-Text string attached to cell?
+		if ($pCell !== NULL) {
+			// Add cell text and style
+			if ($pCell->getValue() != "") {
+				$objRun = new PHPExcel_RichText_Run($pCell->getValue());
+				$objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
+				$this->addText($objRun);
+			}
+
+			// Set parent value
+			$pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
+		}
+	}
+
+	/**
+	 * Add text
+	 *
+	 * @param 	PHPExcel_RichText_ITextElement		$pText		Rich text element
+	 * @throws 	Exception
+	 * @return PHPExcel_RichText
+	 */
+	public function addText(PHPExcel_RichText_ITextElement $pText = null)
+	{
+		$this->_richTextElements[] = $pText;
+		return $this;
+	}
+
+	/**
+	 * Create text
+	 *
+	 * @param 	string	$pText	Text
+	 * @return	PHPExcel_RichText_TextElement
+	 * @throws 	Exception
+	 */
+	public function createText($pText = '')
+	{
+		$objText = new PHPExcel_RichText_TextElement($pText);
+		$this->addText($objText);
+		return $objText;
+	}
+
+	/**
+	 * Create text run
+	 *
+	 * @param 	string	$pText	Text
+	 * @return	PHPExcel_RichText_Run
+	 * @throws 	Exception
+	 */
+	public function createTextRun($pText = '')
+	{
+		$objText = new PHPExcel_RichText_Run($pText);
+		$this->addText($objText);
+		return $objText;
+	}
+
+	/**
+	 * Get plain text
+	 *
+	 * @return string
+	 */
+	public function getPlainText()
+	{
+		// Return value
+		$returnValue = '';
+
+		// Loop through all PHPExcel_RichText_ITextElement
+		foreach ($this->_richTextElements as $text) {
+			$returnValue .= $text->getText();
+		}
+
+		// Return
+		return $returnValue;
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		return $this->getPlainText();
+	}
+
+	/**
+	 * Get Rich Text elements
+	 *
+	 * @return PHPExcel_RichText_ITextElement[]
+	 */
+	public function getRichTextElements()
+	{
+		return $this->_richTextElements;
+	}
+
+	/**
+	 * Set Rich Text elements
+	 *
+	 * @param 	PHPExcel_RichText_ITextElement[]	$pElements		Array of elements
+	 * @throws 	Exception
+	 * @return PHPExcel_RichText
+	 */
+	public function setRichTextElements($pElements = null)
+	{
+		if (is_array($pElements)) {
+			$this->_richTextElements = $pElements;
+		} else {
+			throw new Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
+		}
+		return $this;
+	}
 
 	/**
 	 * Get hash code
@@ -174,11 +174,11 @@ 
 			$hashElements .= $element->getHashCode();
 		}
 
-    	return md5(
-    		  $hashElements
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $hashElements
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.

app/Vendor/PHPExcel/PHPExcel/Shared/CodePage.php

Doc Comments -1 removed lines

@@ -39,7 +39,6 @@
 	 * Convert Microsoft Code Page Identifier to Code Page Name which iconv
 	 * and mbstring understands
 	 *
-	 * @param int $number Microsoft Code Page Indentifier
 	 * @return string Code Page Name
 	 * @throws Exception
 	 */

Spacing +45 added lines, -45 removed lines

@@ -46,56 +46,56 @@
 	public static function NumberToName($codePage = '1252')
 	{
 		switch ($codePage) {
-			case 367:	return 'ASCII';				break;	//	ASCII
-			case 437:	return 'CP437';				break;	//	OEM US
+			case 367:	return 'ASCII'; break; //	ASCII
+			case 437:	return 'CP437'; break; //	OEM US
 			case 720:	throw new Exception('Code page 720 not supported.');
-													break;	//	OEM Arabic
-			case 737:	return 'CP737';				break;	//	OEM Greek
-			case 775:	return 'CP775';				break;	//	OEM Baltic
-			case 850:	return 'CP850';				break;	//	OEM Latin I
-			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';				break;	//	OEM Cyrillic
-			case 857:	return 'CP857';				break;	//	OEM Turkish
-			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';				break;	//	OEM Portugese
-			case 861:	return 'CP861';				break;	//	OEM Icelandic
-			case 862:	return 'CP862';				break;	//	OEM Hebrew
-			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';				break;	//	OEM Arabic
-			case 865:	return 'CP865';				break;	//	OEM Nordic
-			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';				break;	//	ANSI Thai
-			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
+													break; //	OEM Arabic
+			case 737:	return 'CP737'; break; //	OEM Greek
+			case 775:	return 'CP775'; break; //	OEM Baltic
+			case 850:	return 'CP850'; break; //	OEM Latin I
+			case 852:	return 'CP852'; break; //	OEM Latin II (Central European)
+			case 855:	return 'CP855'; break; //	OEM Cyrillic
+			case 857:	return 'CP857'; break; //	OEM Turkish
+			case 858:	return 'CP858'; break; //	OEM Multilingual Latin I with Euro
+			case 860:	return 'CP860'; break; //	OEM Portugese
+			case 861:	return 'CP861'; break; //	OEM Icelandic
+			case 862:	return 'CP862'; break; //	OEM Hebrew
+			case 863:	return 'CP863'; break; //	OEM Canadian (French)
+			case 864:	return 'CP864'; break; //	OEM Arabic
+			case 865:	return 'CP865'; break; //	OEM Nordic
+			case 866:	return 'CP866'; break; //	OEM Cyrillic (Russian)
+			case 869:	return 'CP869'; break; //	OEM Greek (Modern)
+			case 874:	return 'CP874'; break; //	ANSI Thai
+			case 932:	return 'CP932'; break; //	ANSI Japanese Shift-JIS
+			case 936:	return 'CP936'; break; //	ANSI Chinese Simplified GBK
+			case 949:	return 'CP949'; break; //	ANSI Korean (Wansung)
+			case 950:	return 'CP950'; break; //	ANSI Chinese Traditional BIG5
+			case 1200:	return 'UTF-16LE'; break; //	UTF-16 (BIFF8)
+			case 1250:	return 'CP1250'; break; //	ANSI Latin II (Central European)
+			case 1251:	return 'CP1251'; break; //	ANSI Cyrillic
 			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';			break;	//	ANSI Greek
-			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';				break;	//	Apple Roman
-			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
-			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
-			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
-			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
-			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
-			case 32768:	return 'MAC';				break;	//	Apple Roman
+			case 1252:	return 'CP1252'; break; //	ANSI Latin I (BIFF4-BIFF7)
+			case 1253:	return 'CP1253'; break; //	ANSI Greek
+			case 1254:	return 'CP1254'; break; //	ANSI Turkish
+			case 1255:	return 'CP1255'; break; //	ANSI Hebrew
+			case 1256:	return 'CP1256'; break; //	ANSI Arabic
+			case 1257:	return 'CP1257'; break; //	ANSI Baltic
+			case 1258:	return 'CP1258'; break; //	ANSI Vietnamese
+			case 1361:	return 'CP1361'; break; //	ANSI Korean (Johab)
+			case 10000:	return 'MAC'; break; //	Apple Roman
+			case 10006:	return 'MACGREEK'; break; //	Macintosh Greek
+			case 10007:	return 'MACCYRILLIC'; break; //	Macintosh Cyrillic
+			case 10029:	return 'MACCENTRALEUROPE'; break; //	Macintosh Central Europe
+			case 10079: return 'MACICELAND'; break; //	Macintosh Icelandic
+			case 10081: return 'MACTURKISH'; break; //	Macintosh Turkish
+			case 32768:	return 'MAC'; break; //	Apple Roman
 			case 32769:	throw new Exception('Code page 32769 not supported.');
-													break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
-			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
+													break; //	ANSI Latin I (BIFF2-BIFF3)
+			case 65000:	return 'UTF-7'; break; //	Unicode (UTF-7)
+			case 65001:	return 'UTF-8'; break; //	Unicode (UTF-8)
 		}
 
-		throw new Exception('Unknown codepage: ' . $codePage);
+		throw new Exception('Unknown codepage: '.$codePage);
 	}
 
 }

app/Vendor/PHPExcel/PHPExcel/Shared/Date.php

Doc Comments +8 added lines, -8 removed lines

@@ -107,8 +107,8 @@ 
 	/**
 	 * Convert a date from Excel to PHP
 	 *
-	 * @param	 long	 $dateValue		Excel date/time value
-	 * @return	 long					PHP serialized date/time
+	 * @param	 integer	 $dateValue		Excel date/time value
+	 * @return	 integer|null					PHP serialized date/time
 	 */
 	public static function ExcelToPHP($dateValue = 0) {
 		if (self::$ExcelBaseDate == self::CALENDAR_WINDOWS_1900) {
@@ -143,7 +143,7 @@ 
 	/**
 	 * Convert a date from Excel to a PHP Date/Time object
 	 *
-	 * @param	 long	 $dateValue		Excel date/time value
+	 * @param	 integer	 $dateValue		Excel date/time value
 	 * @return	 long					PHP date/time object
 	 */
 	public static function ExcelToPHPObject($dateValue = 0) {
@@ -164,7 +164,7 @@ 
 	/**
 	 * Convert a date from PHP to Excel
 	 *
-	 * @param	 mixed		$dateValue	PHP serialized date/time or date object
+	 * @param	 integer		$dateValue	PHP serialized date/time or date object
 	 * @return	 mixed					Excel date/time value
 	 *										or boolean False on failure
 	 */
@@ -193,10 +193,10 @@ 
 	 * @param	long	$year
 	 * @param	long	$month
 	 * @param	long	$day
-	 * @param	long	$hours
-	 * @param	long	$minutes
-	 * @param	long	$seconds
-	 * @return  long				Excel date/time value
+	 * @param	integer	$hours
+	 * @param	integer	$minutes
+	 * @param	integer	$seconds
+	 * @return  double				Excel date/time value
 	 */
 	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
 		if (self::$ExcelBaseDate == self::CALENDAR_WINDOWS_1900) {

Spacing +18 added lines, -18 removed lines

@@ -37,8 +37,8 @@ 
 class PHPExcel_Shared_Date
 {
 	/** constants */
-	const CALENDAR_WINDOWS_1900 = 1900;		//	Base date of 1st Jan 1900 = 1.0
-	const CALENDAR_MAC_1904 = 1904;			//	Base date of 2nd Jan 1904 = 1.0
+	const CALENDAR_WINDOWS_1900 = 1900; //	Base date of 1st Jan 1900 = 1.0
+	const CALENDAR_MAC_1904 = 1904; //	Base date of 2nd Jan 1904 = 1.0
 
 	/*
 	 * Names of the months of the year, indexed by shortname
@@ -47,7 +47,7 @@ 
 	 * @public
 	 * @var	string[]
 	 */
-	public static $_monthNames = array(	'Jan' => 'January',
+	public static $_monthNames = array('Jan' => 'January',
 										'Feb' => 'February',
 										'Mar' => 'March',
 										'Apr' => 'April',
@@ -67,7 +67,7 @@ 
 	 * @private
 	 * @var	int
 	 */
-	private static $ExcelBaseDate	= self::CALENDAR_WINDOWS_1900;
+	private static $ExcelBaseDate = self::CALENDAR_WINDOWS_1900;
 
 	/*
 	 * Object type for PHP Date/Time values
@@ -75,7 +75,7 @@ 
 	 * @private
 	 * @var	string
 	 */
-	public static $dateTimeObjectType	= 'DateTime';
+	public static $dateTimeObjectType = 'DateTime';
 
 
 	/**
@@ -155,7 +155,7 @@ 
 		$seconds = round($time) - ($hours * 3600) - ($minutes * 60);
 
 		$dateObj = date_create('1-Jan-1970+'.$days.' days');
-		$dateObj->setTime($hours,$minutes,$seconds);
+		$dateObj->setTime($hours, $minutes, $seconds);
 
 		return $dateObj;
 	}	//	function ExcelToPHPObject()
@@ -173,12 +173,12 @@ 
 		date_default_timezone_set('UTC');
 		$retValue = False;
 		if ((is_object($dateValue)) && ($dateValue instanceof self::$dateTimeObjectType)) {
-			$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
+			$retValue = self::FormattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
 												   $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
 												 );
 		} elseif (is_numeric($dateValue)) {
-			$retValue = self::FormattedPHPToExcel( date('Y',$dateValue), date('m',$dateValue), date('d',$dateValue),
-												   date('H',$dateValue), date('i',$dateValue), date('s',$dateValue)
+			$retValue = self::FormattedPHPToExcel(date('Y', $dateValue), date('m', $dateValue), date('d', $dateValue),
+												   date('H', $dateValue), date('i', $dateValue), date('s', $dateValue)
 												 );
 		}
 		date_default_timezone_set($saveTimeZone);
@@ -198,7 +198,7 @@ 
 	 * @param	long	$seconds
 	 * @return  long				Excel date/time value
 	 */
-	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
+	public static function FormattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0) {
 		if (self::$ExcelBaseDate == self::CALENDAR_WINDOWS_1900) {
 			//
 			//	Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
@@ -221,8 +221,8 @@ 
 		}
 
 		//	Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
-		$century = substr($year,0,2);
-		$decade = substr($year,2,2);
+		$century = substr($year, 0, 2);
+		$decade = substr($year, 2, 2);
 		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myExcelBaseDate + $excel1900isLeapYear;
 
 		$excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
@@ -290,18 +290,18 @@ 
 		}
 
 		//	Typically number, currency or accounting (or occasionally fraction) formats
-		if ((substr($pFormatCode,0,1) == '_') || (substr($pFormatCode,0,2) == '0 ')) {
+		if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
 			return false;
 		}
 		// Try checking for any of the date formatting characters that don't appear within square braces
-		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$pFormatCode)) {
+		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $pFormatCode)) {
 			//	We might also have a format mask containing quoted strings...
 			//		we don't want to test for any of our characters within the quoted blocks
-			if (strpos($pFormatCode,'"') !== false) {
+			if (strpos($pFormatCode, '"') !== false) {
 				$i = false;
-				foreach(explode('"',$pFormatCode) as $subVal) {
+				foreach (explode('"', $pFormatCode) as $subVal) {
 					//	Only test in alternate array entries (the non-quoted blocks)
-					if (($i = !$i) && (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$subVal))) {
+					if (($i = ! $i) && (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $subVal))) {
 						return true;
 					}
 				}
@@ -324,7 +324,7 @@ 
 	public static function stringToExcel($dateValue = '') {
 		if (strlen($dateValue) < 2)
 			return false;
-		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
+		if ( ! preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
 			return false;
 
 		$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);

Braces +6 added lines, -4 removed lines

@@ -322,10 +322,12 @@
 	 * @return	float|false		Excel date/time serial value
 	 */
 	public static function stringToExcel($dateValue = '') {
-		if (strlen($dateValue) < 2)
-			return false;
-		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
-			return false;
+		if (strlen($dateValue) < 2) {
+					return false;
+		}
+		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue)) {
+					return false;
+		}
 
 		$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
 

app/Vendor/PHPExcel/PHPExcel/Shared/Drawing.php

Doc Comments +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 	 * Convert pixels to EMU
 	 *
 	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in EMU
+	 * @return 	double			Value in EMU
 	 */
 	public static function pixelsToEMU($pValue = 0) {
 		return round($pValue * 9525);
@@ -92,7 +92,7 @@ 
 	/**
 	 * Convert column width from (intrinsic) Excel units to pixels
 	 *
-	 * @param 	float	$pValue		Value in cell dimension
+	 * @param 	integer	$pValue		Value in cell dimension
 	 * @param 	PHPExcel_Style_Font $pDefaultFont	Default font of the workbook
 	 * @return 	int		Value in pixels
 	 */
@@ -125,7 +125,7 @@ 
 	 * Convert pixels to points
 	 *
 	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in points
+	 * @return 	double			Value in points
 	 */
 	public static function pixelsToPoints($pValue = 0) {
 		return $pValue * 0.67777777;
@@ -173,7 +173,7 @@ 
 	 * Create a new image from file. By alexander at alexauto dot nl
 	 *
 	 * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-	 * @param string $filename Path to Windows DIB (BMP) image
+	 * @param string $p_sFile
 	 * @return resource
 	 */
 	public static function imagecreatefrombmp($p_sFile)

Indentation +89 added lines, -89 removed lines

@@ -178,95 +178,95 @@
 	 */
 	public static function imagecreatefrombmp($p_sFile)
 	{
-        //    Load the image into a string
-        $file    =    fopen($p_sFile,"rb");
-        $read    =    fread($file,10);
-        while(!feof($file)&&($read<>""))
-            $read    .=    fread($file,1024);
-
-        $temp    =    unpack("H*",$read);
-        $hex    =    $temp[1];
-        $header    =    substr($hex,0,108);
-
-        //    Process the header
-        //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        if (substr($header,0,4)=="424d")
-        {
-            //    Cut it in parts of 2 bytes
-            $header_parts    =    str_split($header,2);
-
-            //    Get the width        4 bytes
-            $width            =    hexdec($header_parts[19].$header_parts[18]);
-
-            //    Get the height        4 bytes
-            $height            =    hexdec($header_parts[23].$header_parts[22]);
-
-            //    Unset the header params
-            unset($header_parts);
-        }
-
-        //    Define starting X and Y
-        $x                =    0;
-        $y                =    1;
-
-        //    Create newimage
-        $image            =    imagecreatetruecolor($width,$height);
-
-        //    Grab the body from the image
-        $body            =    substr($hex,108);
-
-        //    Calculate if padding at the end-line is needed
-        //    Divided by two to keep overview.
-        //    1 byte = 2 HEX-chars
-        $body_size        =    (strlen($body)/2);
-        $header_size    =    ($width*$height);
-
-        //    Use end-line padding? Only when needed
-        $usePadding        =    ($body_size>($header_size*3)+4);
-
-        //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
-        //    Calculate the next DWORD-position in the body
-        for ($i=0;$i<$body_size;$i+=3)
-        {
-            //    Calculate line-ending and padding
-            if ($x>=$width)
-            {
-                //    If padding needed, ignore image-padding
-                //    Shift i to the ending of the current 32-bit-block
-                if ($usePadding)
-                    $i    +=    $width%4;
-
-                //    Reset horizontal position
-                $x    =    0;
-
-                //    Raise the height-position (bottom-up)
-                $y++;
-
-                //    Reached the image-height? Break the for-loop
-                if ($y>$height)
-                    break;
-            }
-
-            //    Calculation of the RGB-pixel (defined as BGR in image-data)
-            //    Define $i_pos as absolute position in the body
-            $i_pos    =    $i*2;
-            $r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
-            $g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
-            $b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
-
-            //    Calculate and draw the pixel
-            $color    =    imagecolorallocate($image,$r,$g,$b);
-            imagesetpixel($image,$x,$height-$y,$color);
-
-            //    Raise the horizontal position
-            $x++;
-        }
-
-        //    Unset the body / free the memory
-        unset($body);
-
-        //    Return image-object
-        return $image;
+		//    Load the image into a string
+		$file    =    fopen($p_sFile,"rb");
+		$read    =    fread($file,10);
+		while(!feof($file)&&($read<>""))
+			$read    .=    fread($file,1024);
+
+		$temp    =    unpack("H*",$read);
+		$hex    =    $temp[1];
+		$header    =    substr($hex,0,108);
+
+		//    Process the header
+		//    Structure: http://www.fastgraph.com/help/bmp_header_format.html
+		if (substr($header,0,4)=="424d")
+		{
+			//    Cut it in parts of 2 bytes
+			$header_parts    =    str_split($header,2);
+
+			//    Get the width        4 bytes
+			$width            =    hexdec($header_parts[19].$header_parts[18]);
+
+			//    Get the height        4 bytes
+			$height            =    hexdec($header_parts[23].$header_parts[22]);
+
+			//    Unset the header params
+			unset($header_parts);
+		}
+
+		//    Define starting X and Y
+		$x                =    0;
+		$y                =    1;
+
+		//    Create newimage
+		$image            =    imagecreatetruecolor($width,$height);
+
+		//    Grab the body from the image
+		$body            =    substr($hex,108);
+
+		//    Calculate if padding at the end-line is needed
+		//    Divided by two to keep overview.
+		//    1 byte = 2 HEX-chars
+		$body_size        =    (strlen($body)/2);
+		$header_size    =    ($width*$height);
+
+		//    Use end-line padding? Only when needed
+		$usePadding        =    ($body_size>($header_size*3)+4);
+
+		//    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
+		//    Calculate the next DWORD-position in the body
+		for ($i=0;$i<$body_size;$i+=3)
+		{
+			//    Calculate line-ending and padding
+			if ($x>=$width)
+			{
+				//    If padding needed, ignore image-padding
+				//    Shift i to the ending of the current 32-bit-block
+				if ($usePadding)
+					$i    +=    $width%4;
+
+				//    Reset horizontal position
+				$x    =    0;
+
+				//    Raise the height-position (bottom-up)
+				$y++;
+
+				//    Reached the image-height? Break the for-loop
+				if ($y>$height)
+					break;
+			}
+
+			//    Calculation of the RGB-pixel (defined as BGR in image-data)
+			//    Define $i_pos as absolute position in the body
+			$i_pos    =    $i*2;
+			$r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
+			$g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
+			$b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
+
+			//    Calculate and draw the pixel
+			$color    =    imagecolorallocate($image,$r,$g,$b);
+			imagesetpixel($image,$x,$height-$y,$color);
+
+			//    Raise the horizontal position
+			$x++;
+		}
+
+		//    Unset the body / free the memory
+		unset($body);
+
+		//    Return image-object
+		return $image;
 	}
 
 }

Spacing +30 added lines, -30 removed lines

@@ -152,7 +152,7 @@ 
 	 * @return 	int			Angle
 	 */
 	public static function degreesToAngle($pValue = 0) {
-		return (int)round($pValue * 60000);
+		return (int) round($pValue * 60000);
 	}
 
 	/**
@@ -179,84 +179,84 @@ 
 	public static function imagecreatefrombmp($p_sFile)
 	{
         //    Load the image into a string
-        $file    =    fopen($p_sFile,"rb");
-        $read    =    fread($file,10);
-        while(!feof($file)&&($read<>""))
-            $read    .=    fread($file,1024);
+        $file    = fopen($p_sFile, "rb");
+        $read    = fread($file, 10);
+        while ( ! feof($file) && ($read <> ""))
+            $read .= fread($file, 1024);
 
-        $temp    =    unpack("H*",$read);
-        $hex    =    $temp[1];
-        $header    =    substr($hex,0,108);
+        $temp = unpack("H*", $read);
+        $hex = $temp[1];
+        $header = substr($hex, 0, 108);
 
         //    Process the header
         //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        if (substr($header,0,4)=="424d")
+        if (substr($header, 0, 4) == "424d")
         {
             //    Cut it in parts of 2 bytes
-            $header_parts    =    str_split($header,2);
+            $header_parts = str_split($header, 2);
 
             //    Get the width        4 bytes
-            $width            =    hexdec($header_parts[19].$header_parts[18]);
+            $width = hexdec($header_parts[19].$header_parts[18]);
 
             //    Get the height        4 bytes
-            $height            =    hexdec($header_parts[23].$header_parts[22]);
+            $height = hexdec($header_parts[23].$header_parts[22]);
 
             //    Unset the header params
             unset($header_parts);
         }
 
         //    Define starting X and Y
-        $x                =    0;
-        $y                =    1;
+        $x                = 0;
+        $y                = 1;
 
         //    Create newimage
-        $image            =    imagecreatetruecolor($width,$height);
+        $image            = imagecreatetruecolor($width, $height);
 
         //    Grab the body from the image
-        $body            =    substr($hex,108);
+        $body = substr($hex, 108);
 
         //    Calculate if padding at the end-line is needed
         //    Divided by two to keep overview.
         //    1 byte = 2 HEX-chars
-        $body_size        =    (strlen($body)/2);
-        $header_size    =    ($width*$height);
+        $body_size = (strlen($body) / 2);
+        $header_size = ($width * $height);
 
         //    Use end-line padding? Only when needed
-        $usePadding        =    ($body_size>($header_size*3)+4);
+        $usePadding = ($body_size > ($header_size * 3) + 4);
 
         //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
         //    Calculate the next DWORD-position in the body
-        for ($i=0;$i<$body_size;$i+=3)
+        for ($i = 0; $i < $body_size; $i += 3)
         {
             //    Calculate line-ending and padding
-            if ($x>=$width)
+            if ($x >= $width)
             {
                 //    If padding needed, ignore image-padding
                 //    Shift i to the ending of the current 32-bit-block
                 if ($usePadding)
-                    $i    +=    $width%4;
+                    $i += $width % 4;
 
                 //    Reset horizontal position
-                $x    =    0;
+                $x = 0;
 
                 //    Raise the height-position (bottom-up)
                 $y++;
 
                 //    Reached the image-height? Break the for-loop
-                if ($y>$height)
+                if ($y > $height)
                     break;
             }
 
             //    Calculation of the RGB-pixel (defined as BGR in image-data)
             //    Define $i_pos as absolute position in the body
-            $i_pos    =    $i*2;
-            $r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
-            $g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
-            $b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
+            $i_pos    = $i * 2;
+            $r        = hexdec($body[$i_pos + 4].$body[$i_pos + 5]);
+            $g        = hexdec($body[$i_pos + 2].$body[$i_pos + 3]);
+            $b        = hexdec($body[$i_pos].$body[$i_pos + 1]);
 
             //    Calculate and draw the pixel
-            $color    =    imagecolorallocate($image,$r,$g,$b);
-            imagesetpixel($image,$x,$height-$y,$color);
+            $color    = imagecolorallocate($image, $r, $g, $b);
+            imagesetpixel($image, $x, $height - $y, $color);
 
             //    Raise the horizontal position
             $x++;

Braces +9 added lines, -6 removed lines

@@ -181,8 +181,9 @@ 
         //    Load the image into a string
         $file    =    fopen($p_sFile,"rb");
         $read    =    fread($file,10);
-        while(!feof($file)&&($read<>""))
-            $read    .=    fread($file,1024);
+        while(!feof($file)&&($read<>"")) {
+                    $read    .=    fread($file,1024);
+        }
 
         $temp    =    unpack("H*",$read);
         $hex    =    $temp[1];
@@ -233,8 +234,9 @@ 
             {
                 //    If padding needed, ignore image-padding
                 //    Shift i to the ending of the current 32-bit-block
-                if ($usePadding)
-                    $i    +=    $width%4;
+                if ($usePadding) {
+                                    $i    +=    $width%4;
+                }
 
                 //    Reset horizontal position
                 $x    =    0;
@@ -243,8 +245,9 @@ 
                 $y++;
 
                 //    Reached the image-height? Break the for-loop
-                if ($y>$height)
-                    break;
+                if ($y>$height) {
+                                    break;
+                }
             }
 
             //    Calculation of the RGB-pixel (defined as BGR in image-data)

app/Vendor/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php

Doc Comments +2 added lines, -3 removed lines

@@ -184,7 +184,7 @@ 
 	/**
 	 * Get the shape index
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function getSpId()
 	{
@@ -195,7 +195,7 @@ 
 	 * Set an option for the Shape Group Container
 	 *
 	 * @param int $property The number specifies the option
-	 * @param mixed $value
+	 * @param integer $value
 	 */
 	public function setOPT($property, $value)
 	{
@@ -309,7 +309,6 @@ 
 	/**
 	 * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
 	 *
-	 * @param int $startOffsetX
 	 */
 	public function setEndOffsetX($endOffsetX = 0)
 	{

app/Vendor/PHPExcel/PHPExcel/Shared/Excel5.php

Doc Comments +6 added lines, -6 removed lines

@@ -136,9 +136,9 @@ 
 	 *
 	 * @param PHPExcel_Worksheet $sheet
 	 * @param string $startColumn
-	 * @param integer $startOffset Offset within start cell measured in 1/1024 of the cell width
+	 * @param integer $startOffsetX Offset within start cell measured in 1/1024 of the cell width
 	 * @param string $endColumn
-	 * @param integer $endOffset Offset within end cell measured in 1/1024 of the cell width
+	 * @param integer $endOffsetX Offset within end cell measured in 1/1024 of the cell width
 	 * @return integer Horizontal measured in pixels
 	 */
 	public static function getDistanceX(PHPExcel_Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
@@ -166,10 +166,10 @@ 
 	 * The distanceY is found as sum of all the spanning rows minus two offsets
 	 *
 	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $startRow (1-based)
-	 * @param integer $startOffset Offset within start cell measured in 1/256 of the cell height
-	 * @param string $endRow (1-based)
-	 * @param integer $endOffset Offset within end cell measured in 1/256 of the cell height
+	 * @param integer $startRow (1-based)
+	 * @param integer $startOffsetY Offset within start cell measured in 1/256 of the cell height
+	 * @param integer $endRow (1-based)
+	 * @param integer $endOffsetY Offset within end cell measured in 1/256 of the cell height
 	 * @return integer Vertical distance measured in pixels
 	 */
 	public static function getDistanceY(PHPExcel_Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param PHPExcel_Worksheet $sheet The sheet
 	 * @param integer $col The column
 	 * @return integer The width in pixels
-	*/
+	 */
 	public static function sizeCol($sheet, $col = 'A')
 	{
 		// default font of the workbook

Spacing +16 added lines, -16 removed lines

@@ -51,7 +51,7 @@ 
 		$columnDimensions = $sheet->getColumnDimensions();
 
 		// first find the true column width in pixels (uncollapsed and unhidden)
-		if ( isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1 ) {
+		if (isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1) {
 
 			// then we have column dimension with explicit width
 			$columnDimension = $columnDimensions[$col];
@@ -72,7 +72,7 @@ 
 		}
 
 		// now find the effective column width in pixels
-		if (isset($columnDimensions[$col]) and !$columnDimensions[$col]->getVisible()) {
+		if (isset($columnDimensions[$col]) and ! $columnDimensions[$col]->getVisible()) {
 			$effectivePixelWidth = 0;
 		} else {
 			$effectivePixelWidth = $pixelWidth;
@@ -98,7 +98,7 @@ 
 		$rowDimensions = $sheet->getRowDimensions();
 
 		// first find the true row height in pixels (uncollapsed and unhidden)
-		if ( isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
+		if (isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
 
 			// then we have a row dimension
 			$rowDimension = $rowDimensions[$row];
@@ -121,7 +121,7 @@ 
 		}
 
 		// now find the effective row height in pixels
-		if ( isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible() ) {
+		if (isset($rowDimensions[$row]) and ! $rowDimensions[$row]->getVisible()) {
 			$effectivePixelRowHeight = 0;
 		} else {
 			$effectivePixelRowHeight = $pixelRowHeight;
@@ -252,8 +252,8 @@ 
 		$y1 = $offsetY;
 
 		// Initialise end cell to the same as the start cell
-		$col_end	= $col_start;  // Col containing lower right corner of object
-		$row_end	= $row_start;  // Row containing bottom right corner of object
+		$col_end	= $col_start; // Col containing lower right corner of object
+		$row_end	= $row_start; // Row containing bottom right corner of object
 
 		// Zero the specified offset if greater than the cell dimensions
 		if ($x1 >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
@@ -263,8 +263,8 @@ 
 			$y1 = 0;
 		}
 
-		$width	  = $width  + $x1 -1;
-		$height	 = $height + $y1 -1;
+		$width	  = $width + $x1 - 1;
+		$height	 = $height + $y1 - 1;
 
 		// Subtract the underlying cell widths to find the end cell of the image
 		while ($width >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
@@ -283,24 +283,24 @@ 
 		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
 			return;
 		}
-		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
+		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) == 0) {
 			return;
 		}
 		if (self::sizeRow($sheet, $row_start + 1) == 0) {
 			return;
 		}
-		if (self::sizeRow($sheet, $row_end + 1)   == 0) {
+		if (self::sizeRow($sheet, $row_end + 1) == 0) {
 			return;
 		}
 
 		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / self::sizeRow($sheet, $row_start + 1)   *  256;
-		$x2 = ($width + 1)  / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1)	 *  256; // Distance to bottom of object
+		$x1 = $x1 / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) * 1024;
+		$y1 = $y1 / self::sizeRow($sheet, $row_start + 1) * 256;
+		$x2 = ($width + 1) / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+		$y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1) * 256; // Distance to bottom of object
 
-		$startCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_start) . ($row_start + 1);
-		$endCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_end) . ($row_end + 1);
+		$startCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_start).($row_start + 1);
+		$endCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_end).($row_end + 1);
 
 		$twoAnchor = array(
 			'startCoordinates' => $startCoordinates,