reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Reader/SYLK.php

Doc Comments +1 added lines, -1 removed lines

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

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');
 }
 
 /**
@@ -49,14 +49,14 @@ 
 	 *
 	 * @var string
 	 */
-	private $_inputEncoding	= 'ANSI';
+	private $_inputEncoding = 'ANSI';
 
 	/**
 	 * Sheet index to read
 	 *
 	 * @var int
 	 */
-	private $_sheetIndex 	= 0;
+	private $_sheetIndex = 0;
 
 	/**
 	 * Formats
@@ -84,7 +84,7 @@ 
 	 * Create a new PHPExcel_Reader_SYLK
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}
 
 
@@ -98,8 +98,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.");
 		}
 
 		// Read sample data (first 2 KB will do)
@@ -115,7 +115,7 @@ 
 
 		// Analyze first line looking for ID; signature
 		$lines = explode("\n", $data);
-		if (substr($lines[0],0,4) != 'ID;P') {
+		if (substr($lines[0], 0, 4) != 'ID;P') {
 			return false;
 		}
 
@@ -176,14 +176,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.");
 		}
 
 		$worksheetInfo = array();
@@ -206,20 +206,20 @@ 
 
 			// explode each row at semicolons while taking into account that literal semicolon (;)
 			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('?',';',str_replace(';',"\t",str_replace(';;','?',rtrim($rowData)))));
+			$rowData = explode("\t", str_replace('?', ';', str_replace(';', "\t", str_replace(';;', '?', rtrim($rowData)))));
 
 			$dataType = array_shift($rowData);
 			if ($dataType == 'C') {
 				//  Read cell value data
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
+				foreach ($rowData as $rowDatum) {
+					switch ($rowDatum{0}) {
 						case 'C' :
 						case 'X' :
-							$columnIndex = substr($rowDatum,1) - 1;
+							$columnIndex = substr($rowDatum, 1) - 1;
 							break;
 						case 'R' :
 						case 'Y' :
-							$rowIndex = substr($rowDatum,1);
+							$rowIndex = substr($rowDatum, 1);
 							break;
 					}
 
@@ -267,18 +267,18 @@ 
 	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();
 		}
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+		$objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
 
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
+		$fromFormats = array('\-', '\ ');
+		$toFormats		= array('-', ' ');
 
 		// Open file
 		$fileHandle = fopen($pFilename, 'r');
@@ -298,23 +298,23 @@ 
 
 			// explode each row at semicolons while taking into account that literal semicolon (;)
 			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
+			$rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
 
 			$dataType = array_shift($rowData);
 			//	Read shared styles
 			if ($dataType == 'P') {
 				$formatArray = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1));
+				foreach ($rowData as $rowDatum) {
+					switch ($rowDatum{0}) {
+						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
 									break;
 						case 'E' :
-						case 'F' :	$formatArray['font']['name'] = substr($rowDatum,1);
+						case 'F' :	$formatArray['font']['name'] = substr($rowDatum, 1);
 									break;
-						case 'L' :	$formatArray['font']['size'] = substr($rowDatum,1);
+						case 'L' :	$formatArray['font']['size'] = substr($rowDatum, 1);
 									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
+						case 'S' :	$styleSettings = substr($rowDatum, 1);
+									for ($i = 0; $i < strlen($styleSettings); ++$i) {
 										switch ($styleSettings{$i}) {
 											case 'I' :	$formatArray['font']['italic'] = true;
 														break;
@@ -338,55 +338,55 @@ 
 			} elseif ($dataType == 'C') {
 				$hasCalculatedValue = false;
 				$cellData = $cellDataFormula = '';
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
+				foreach ($rowData as $rowDatum) {
+					switch ($rowDatum{0}) {
 						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
+						case 'X' :	$column = substr($rowDatum, 1);
 									break;
 						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
+						case 'Y' :	$row = substr($rowDatum, 1);
 									break;
-						case 'K' :	$cellData = substr($rowDatum,1);
+						case 'K' :	$cellData = substr($rowDatum, 1);
 									break;
-						case 'E' :	$cellDataFormula = '='.substr($rowDatum,1);
+						case 'E' :	$cellDataFormula = '='.substr($rowDatum, 1);
 									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-									$temp = explode('"',$cellDataFormula);
+									$temp = explode('"', $cellDataFormula);
 									$key = false;
-									foreach($temp as &$value) {
+									foreach ($temp as &$value) {
 										//	Only count/replace in alternate array entries
-										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 = $row;
 												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference,'[]');
+												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference, '[]');
 												$columnReference = $cellReference[4][0];
 												//	Empty C reference is the current column
 												if ($columnReference == '') $columnReference = $column;
 												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $column + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+												if ($columnReference{0} == '[') $columnReference = $column + trim($columnReference, '[]');
+												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference - 1).$rowReference;
 
-												$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
+												$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);
 									$hasCalculatedValue = true;
 									break;
 					}
 				}
-				$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+				$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column - 1);
 				$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
 
 				// Set cell value
@@ -399,20 +399,20 @@ 
 			} elseif ($dataType == 'F') {
 				$formatStyle = $columnWidth = $styleSettings = '';
 				$styleData = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
+				foreach ($rowData as $rowDatum) {
+					switch ($rowDatum{0}) {
 						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
+						case 'X' :	$column = substr($rowDatum, 1);
 									break;
 						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
+						case 'Y' :	$row = substr($rowDatum, 1);
 									break;
 						case 'P' :	$formatStyle = $rowDatum;
 									break;
-						case 'W' :	list($startCol,$endCol,$columnWidth) = explode(' ',substr($rowDatum,1));
+						case 'W' :	list($startCol, $endCol, $columnWidth) = explode(' ', substr($rowDatum, 1));
 									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
+						case 'S' :	$styleSettings = substr($rowDatum, 1);
+									for ($i = 0; $i < strlen($styleSettings); ++$i) {
 										switch ($styleSettings{$i}) {
 											case 'I' :	$styleData['font']['italic'] = true;
 														break;
@@ -432,20 +432,20 @@ 
 					}
 				}
 				if (($formatStyle > '') && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column - 1);
 					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->_formats[$formatStyle]);
 				}
-				if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+				if (( ! empty($styleData)) && ($column > '') && ($row > '')) {
+					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column - 1);
 					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
 				}
 				if ($columnWidth > '') {
 					if ($startCol == $endCol) {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol - 1);
 						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
 					} else {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
+						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol - 1);
+						$endCol = PHPExcel_Cell::stringFromColumnIndex($endCol - 1);
 						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
 						do {
 							$objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
@@ -453,13 +453,13 @@ 
 					}
 				}
 			} else {
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
+				foreach ($rowData as $rowDatum) {
+					switch ($rowDatum{0}) {
 						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
+						case 'X' :	$column = substr($rowDatum, 1);
 									break;
 						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
+						case 'Y' :	$row = substr($rowDatum, 1);
 									break;
 					}
 				}

Braces +12 added lines, -4 removed lines

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

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 +149 added lines, -149 removed lines

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

Indentation +24 added lines, -24 removed lines

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

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,

app/Vendor/PHPExcel/PHPExcel/Shared/Font.php

Doc Comments +2 added lines, -3 removed lines

@@ -232,8 +232,6 @@ 
 	/**
 	 * Calculate an (approximate) OpenXML column width, based on font size and text contained
 	 *
-	 * @param 	int		$fontSize			Font size (in pixels or points)
-	 * @param 	bool	$fontSizeInPixels	Is the font size specified in pixels (true) or in points (false) ?
 	 * @param 	string	$cellText			Text to calculate width
 	 * @param 	int		$rotation			Rotation angle
 	 * @return 	int		Column width
@@ -399,7 +397,7 @@ 
 	 * Calculate an (approximate) pixel size, based on centimeter size
 	 *
 	 * @param 	int		$sizeInCm	Font size (in centimeters)
-	 * @return 	int		Size (in pixels)
+	 * @return 	double		Size (in pixels)
 	 */
 	public static function centimeterSizeToPixels($sizeInCm = 1) {
 		return ($sizeInCm * 37.795275591);
@@ -409,6 +407,7 @@ 
 	 * Returns the font path given the font
 	 *
 	 * @param PHPExcel_Style_Font
+	 * @param PHPExcel_Style_Font $font
 	 * @return string Path to TrueType font file
 	 */
 	public static function getTrueTypeFontFileFromFont($font) {

Spacing +59 added lines, -59 removed lines

@@ -40,87 +40,87 @@ 
 	const AUTOSIZE_METHOD_EXACT		= 'exact';
 
 	/** Character set codes used by BIFF5-8 in Font records */
-	const CHARSET_ANSI_LATIN				= 0x00;
-	const CHARSET_SYSTEM_DEFAULT			= 0x01;
-	const CHARSET_SYMBOL					= 0x02;
-	const CHARSET_APPLE_ROMAN				= 0x4D;
-	const CHARSET_ANSI_JAPANESE_SHIFTJIS	= 0x80;
+	const CHARSET_ANSI_LATIN = 0x00;
+	const CHARSET_SYSTEM_DEFAULT = 0x01;
+	const CHARSET_SYMBOL = 0x02;
+	const CHARSET_APPLE_ROMAN = 0x4D;
+	const CHARSET_ANSI_JAPANESE_SHIFTJIS = 0x80;
 	const CHARSET_ANSI_KOREAN_HANGUL		= 0x81;
 	const CHARSET_ANSI_KOREAN_JOHAB			= 0x82;
-	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86;		//	gb2312
-	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88;		//	big5
-	const CHARSET_ANSI_GREEK				= 0xA1;
-	const CHARSET_ANSI_TURKISH				= 0xA2;
-	const CHARSET_ANSI_VIETNAMESE			= 0xA3;
+	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86; //	gb2312
+	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88; //	big5
+	const CHARSET_ANSI_GREEK = 0xA1;
+	const CHARSET_ANSI_TURKISH = 0xA2;
+	const CHARSET_ANSI_VIETNAMESE = 0xA3;
 	const CHARSET_ANSI_HEBREW				= 0xB1;
 	const CHARSET_ANSI_ARABIC				= 0xB2;
 	const CHARSET_ANSI_BALTIC				= 0xBA;
 	const CHARSET_ANSI_CYRILLIC				= 0xCC;
-	const CHARSET_ANSI_THAI					= 0xDD;
+	const CHARSET_ANSI_THAI = 0xDD;
 	const CHARSET_ANSI_LATIN_II				= 0xEE;
-	const CHARSET_OEM_LATIN_I				= 0xFF;
+	const CHARSET_OEM_LATIN_I = 0xFF;
 
 	//  XXX: Constants created!
 	/** Font filenames */
-	const ARIAL								= 'arial.ttf';
-	const ARIAL_BOLD						= 'arialbd.ttf';
-	const ARIAL_ITALIC						= 'ariali.ttf';
-	const ARIAL_BOLD_ITALIC					= 'arialbi.ttf';
+	const ARIAL = 'arial.ttf';
+	const ARIAL_BOLD = 'arialbd.ttf';
+	const ARIAL_ITALIC = 'ariali.ttf';
+	const ARIAL_BOLD_ITALIC = 'arialbi.ttf';
 
-	const CALIBRI							= 'CALIBRI.TTF';
-	const CALIBRI_BOLD						= 'CALIBRIB.TTF';
+	const CALIBRI = 'CALIBRI.TTF';
+	const CALIBRI_BOLD = 'CALIBRIB.TTF';
 	const CALIBRI_ITALIC					= 'CALIBRII.TTF';
-	const CALIBRI_BOLD_ITALIC				= 'CALIBRIZ.TTF';
+	const CALIBRI_BOLD_ITALIC = 'CALIBRIZ.TTF';
 
 	const COMIC_SANS_MS						= 'comic.ttf';
-	const COMIC_SANS_MS_BOLD				= 'comicbd.ttf';
+	const COMIC_SANS_MS_BOLD = 'comicbd.ttf';
 
-	const COURIER_NEW						= 'cour.ttf';
-	const COURIER_NEW_BOLD					= 'courbd.ttf';
-	const COURIER_NEW_ITALIC				= 'couri.ttf';
-	const COURIER_NEW_BOLD_ITALIC			= 'courbi.ttf';
+	const COURIER_NEW = 'cour.ttf';
+	const COURIER_NEW_BOLD = 'courbd.ttf';
+	const COURIER_NEW_ITALIC = 'couri.ttf';
+	const COURIER_NEW_BOLD_ITALIC = 'courbi.ttf';
 
-	const GEORGIA							= 'georgia.ttf';
-	const GEORGIA_BOLD						= 'georgiab.ttf';
-	const GEORGIA_ITALIC					= 'georgiai.ttf';
-	const GEORGIA_BOLD_ITALIC				= 'georgiaz.ttf';
+	const GEORGIA = 'georgia.ttf';
+	const GEORGIA_BOLD = 'georgiab.ttf';
+	const GEORGIA_ITALIC = 'georgiai.ttf';
+	const GEORGIA_BOLD_ITALIC = 'georgiaz.ttf';
 
-	const IMPACT							= 'impact.ttf';
+	const IMPACT = 'impact.ttf';
 
-	const LIBERATION_SANS					= 'LiberationSans-Regular.ttf';
-	const LIBERATION_SANS_BOLD				= 'LiberationSans-Bold.ttf';
-	const LIBERATION_SANS_ITALIC			= 'LiberationSans-Italic.ttf';
-	const LIBERATION_SANS_BOLD_ITALIC		= 'LiberationSans-BoldItalic.ttf';
+	const LIBERATION_SANS = 'LiberationSans-Regular.ttf';
+	const LIBERATION_SANS_BOLD = 'LiberationSans-Bold.ttf';
+	const LIBERATION_SANS_ITALIC = 'LiberationSans-Italic.ttf';
+	const LIBERATION_SANS_BOLD_ITALIC = 'LiberationSans-BoldItalic.ttf';
 
-	const LUCIDA_CONSOLE					= 'lucon.ttf';
-	const LUCIDA_SANS_UNICODE				= 'l_10646.ttf';
+	const LUCIDA_CONSOLE = 'lucon.ttf';
+	const LUCIDA_SANS_UNICODE = 'l_10646.ttf';
 
-	const MICROSOFT_SANS_SERIF				= 'micross.ttf';
+	const MICROSOFT_SANS_SERIF = 'micross.ttf';
 
-	const PALATINO_LINOTYPE					= 'pala.ttf';
-	const PALATINO_LINOTYPE_BOLD			= 'palab.ttf';
-	const PALATINO_LINOTYPE_ITALIC			= 'palai.ttf';
-	const PALATINO_LINOTYPE_BOLD_ITALIC		= 'palabi.ttf';
+	const PALATINO_LINOTYPE = 'pala.ttf';
+	const PALATINO_LINOTYPE_BOLD = 'palab.ttf';
+	const PALATINO_LINOTYPE_ITALIC = 'palai.ttf';
+	const PALATINO_LINOTYPE_BOLD_ITALIC = 'palabi.ttf';
 
 	const SYMBOL							= 'symbol.ttf';
 
 	const TAHOMA							= 'tahoma.ttf';
-	const TAHOMA_BOLD						= 'tahomabd.ttf';
+	const TAHOMA_BOLD = 'tahomabd.ttf';
 
-	const TIMES_NEW_ROMAN					= 'times.ttf';
-	const TIMES_NEW_ROMAN_BOLD				= 'timesbd.ttf';
-	const TIMES_NEW_ROMAN_ITALIC			= 'timesi.ttf';
-	const TIMES_NEW_ROMAN_BOLD_ITALIC		= 'timesbi.ttf';
+	const TIMES_NEW_ROMAN = 'times.ttf';
+	const TIMES_NEW_ROMAN_BOLD = 'timesbd.ttf';
+	const TIMES_NEW_ROMAN_ITALIC = 'timesi.ttf';
+	const TIMES_NEW_ROMAN_BOLD_ITALIC = 'timesbi.ttf';
 
-	const TREBUCHET_MS						= 'trebuc.ttf';
-	const TREBUCHET_MS_BOLD					= 'trebucbd.ttf';
-	const TREBUCHET_MS_ITALIC				= 'trebucit.ttf';
-	const TREBUCHET_MS_BOLD_ITALIC			= 'trebucbi.ttf';
+	const TREBUCHET_MS = 'trebuc.ttf';
+	const TREBUCHET_MS_BOLD = 'trebucbd.ttf';
+	const TREBUCHET_MS_ITALIC = 'trebucit.ttf';
+	const TREBUCHET_MS_BOLD_ITALIC = 'trebucbi.ttf';
 
-	const VERDANA							= 'verdana.ttf';
-	const VERDANA_BOLD						= 'verdanab.ttf';
-	const VERDANA_ITALIC					= 'verdanai.ttf';
-	const VERDANA_BOLD_ITALIC				= 'verdanaz.ttf';
+	const VERDANA = 'verdana.ttf';
+	const VERDANA_BOLD = 'verdanab.ttf';
+	const VERDANA_ITALIC = 'verdanai.ttf';
+	const VERDANA_BOLD_ITALIC = 'verdanaz.ttf';
 
 	/**
 	 * AutoSize method
@@ -293,7 +293,7 @@ 
 	 * @throws Exception
 	 */
 	public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) {
-		if (!function_exists('imagettfbbox')) {
+		if ( ! function_exists('imagettfbbox')) {
 			throw new Exception('GD library needs to be enabled');
 		}
 
@@ -412,13 +412,13 @@ 
 	 * @return string Path to TrueType font file
 	 */
 	public static function getTrueTypeFontFileFromFont($font) {
-		if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
+		if ( ! file_exists(self::$trueTypeFontPath) || ! is_dir(self::$trueTypeFontPath)) {
 			throw new Exception('Valid directory to TrueType Font files not specified');
 		}
 
 		$name		= $font->getName();
 		$bold		= $font->getBold();
-		$italic		= $font->getItalic();
+		$italic = $font->getItalic();
 
 		// Check if we can map font to true type font file
 		switch ($name) {
@@ -518,14 +518,14 @@ 
 				break;
 
 			default:
-				throw new Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
+				throw new Exception('Unknown font name "'.$name.'". Cannot map to TrueType font file');
 				break;
 		}
 
-		$fontFile = self::$trueTypeFontPath . $fontFile;
+		$fontFile = self::$trueTypeFontPath.$fontFile;
 
 		// Check if file actually exists
-		if (!file_exists($fontFile)) {
+		if ( ! file_exists($fontFile)) {
 			throw New Exception('TrueType Font file not found');
 		}
 

app/Vendor/PHPExcel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php

Doc Comments -2 removed lines

@@ -14,8 +14,6 @@
 	 *
 	 * @param double[][] $x
 	 * @param double[] $a
-	 * @param double[] $y,
-	 * @param double[] $s,
 	 * @param object $f
 	 */
 	function chiSquared($x, $a, $y, $s, $f) {

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
 		for ($i = 0; $i < $npts; ++$i) {
 			$d = $y[$i] - $f->val($x[$i], $a);
 			$d = $d / $s[$i];
-			$sum = $sum + ($d*$d);
+			$sum = $sum + ($d * $d);
 		}
 
 		return $sum;
@@ -78,19 +78,19 @@ 
 
 		$oos2 = array();
 
-		for($i = 0; $i < $npts; ++$i) {
-			$oos2[$i] = 1./($s[$i]*$s[$i]);
+		for ($i = 0; $i < $npts; ++$i) {
+			$oos2[$i] = 1. / ($s[$i] * $s[$i]);
 		}
 		$iter = 0;
-		$term = 0;	// termination count test
+		$term = 0; // termination count test
 
 		do {
 			++$iter;
 
 			// hessian approximation
-			for( $r = 0; $r < $nparm; ++$r) {
-				for( $c = 0; $c < $nparm; ++$c) {
-					for( $i = 0; $i < $npts; ++$i) {
+			for ($r = 0; $r < $nparm; ++$r) {
+				for ($c = 0; $c < $nparm; ++$c) {
+					for ($i = 0; $i < $npts; ++$i) {
 						if ($i == 0) $H[$r][$c] = 0.;
 						$xi = $x[$i];
 						$H[$r][$c] += ($oos2[$i] * $f->grad($xi, $a, $r) * $f->grad($xi, $a, $c));
@@ -99,23 +99,23 @@ 
 			} //r
 
 			// boost diagonal towards gradient descent
-			for( $r = 0; $r < $nparm; ++$r)
+			for ($r = 0; $r < $nparm; ++$r)
 				$H[$r][$r] *= (1. + $lambda);
 
 			// gradient
-			for( $r = 0; $r < $nparm; ++$r) {
-				for( $i = 0; $i < $npts; ++$i) {
+			for ($r = 0; $r < $nparm; ++$r) {
+				for ($i = 0; $i < $npts; ++$i) {
 					if ($i == 0) $g[$r] = 0.;
 					$xi = $x[$i];
-					$g[$r] += ($oos2[$i] * ($y[$i]-$f->val($xi,$a)) * $f->grad($xi, $a, $r));
+					$g[$r] += ($oos2[$i] * ($y[$i] - $f->val($xi, $a)) * $f->grad($xi, $a, $r));
 				}
 			} //npts
 
 			// scale (for consistency with NR, not necessary)
 			if ($false) {
-				for( $r = 0; $r < $nparm; ++$r) {
+				for ($r = 0; $r < $nparm; ++$r) {
 					$g[$r] = -0.5 * $g[$r];
-					for( $c = 0; $c < $nparm; ++$c) {
+					for ($c = 0; $c < $nparm; ++$c) {
 						$H[$r][$c] *= 0.5;
 					}
 				}
@@ -177,7 +177,7 @@ 
 //					if (vary[i]) a[i] = na[i];
 //				}
 //			}
-		} while(!$done);
+		} while ( ! $done);
 
 		return $lambda;
 	}	//	function solve()

Braces +9 added lines, -4 removed lines

@@ -91,7 +91,9 @@ 
 			for( $r = 0; $r < $nparm; ++$r) {
 				for( $c = 0; $c < $nparm; ++$c) {
 					for( $i = 0; $i < $npts; ++$i) {
-						if ($i == 0) $H[$r][$c] = 0.;
+						if ($i == 0) {
+							$H[$r][$c] = 0.;
+						}
 						$xi = $x[$i];
 						$H[$r][$c] += ($oos2[$i] * $f->grad($xi, $a, $r) * $f->grad($xi, $a, $c));
 					}  //npts
@@ -99,13 +101,16 @@ 
 			} //r
 
 			// boost diagonal towards gradient descent
-			for( $r = 0; $r < $nparm; ++$r)
-				$H[$r][$r] *= (1. + $lambda);
+			for( $r = 0; $r < $nparm; ++$r) {
+							$H[$r][$r] *= (1. + $lambda);
+			}
 
 			// gradient
 			for( $r = 0; $r < $nparm; ++$r) {
 				for( $i = 0; $i < $npts; ++$i) {
-					if ($i == 0) $g[$r] = 0.;
+					if ($i == 0) {
+						$g[$r] = 0.;
+					}
 					$xi = $x[$i];
 					$g[$r] += ($oos2[$i] * ($y[$i]-$f->val($xi,$a)) * $f->grad($xi, $a, $r));
 				}