reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Style.php

Indentation +121 added lines, -121 removed lines

@@ -105,18 +105,18 @@ 
 	 */
 	private $_index;
 
-    /**
-     * Create a new PHPExcel_Style
+	/**
+	 * Create a new PHPExcel_Style
 	 *
 	 * @param boolean $isSupervisor
-     */
-    public function __construct($isSupervisor = false)
-    {
-    	// Supervisor?
+	 */
+	public function __construct($isSupervisor = false)
+	{
+		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-    	$this->_conditionalStyles 	= array();
+		$this->_conditionalStyles 	= array();
 		$this->_font				= new PHPExcel_Style_Font($isSupervisor);
 		$this->_fill				= new PHPExcel_Style_Fill($isSupervisor);
 		$this->_borders				= new PHPExcel_Style_Borders($isSupervisor);
@@ -133,7 +133,7 @@ 
 			$this->_numberFormat->bindParent($this);
 			$this->_protection->bindParent($this);
 		}
-    }
+	}
 
 	/**
 	 * Bind parent. Only used for supervisor
@@ -219,45 +219,45 @@ 
 		return $this->_parent;
 	}
 
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->applyFromArray(
-     * 		array(
-     * 			'font'    => array(
-     * 				'name'      => 'Arial',
-     * 				'bold'      => true,
-     * 				'italic'    => false,
-     * 				'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-     * 				'strike'    => false,
-     * 				'color'     => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			),
-     * 			'borders' => array(
-     * 				'bottom'     => array(
-     * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 					'color' => array(
-     * 						'rgb' => '808080'
-     * 					)
-     * 				),
-     * 				'top'     => array(
-     * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 					'color' => array(
-     * 						'rgb' => '808080'
-     * 					)
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @param 	boolean		$pAdvanced	Advanced mode for setting borders.
-     * @throws	Exception
-     * @return PHPExcel_Style
-     */
+	/**
+	 * Apply styles from array
+	 *
+	 * <code>
+	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->applyFromArray(
+	 * 		array(
+	 * 			'font'    => array(
+	 * 				'name'      => 'Arial',
+	 * 				'bold'      => true,
+	 * 				'italic'    => false,
+	 * 				'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+	 * 				'strike'    => false,
+	 * 				'color'     => array(
+	 * 					'rgb' => '808080'
+	 * 				)
+	 * 			),
+	 * 			'borders' => array(
+	 * 				'bottom'     => array(
+	 * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+	 * 					'color' => array(
+	 * 						'rgb' => '808080'
+	 * 					)
+	 * 				),
+	 * 				'top'     => array(
+	 * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+	 * 					'color' => array(
+	 * 						'rgb' => '808080'
+	 * 					)
+	 * 				)
+	 * 			)
+	 * 		)
+	 * );
+	 * </code>
+	 *
+	 * @param	array	$pStyles	Array containing style information
+	 * @param 	boolean		$pAdvanced	Advanced mode for setting borders.
+	 * @throws	Exception
+	 * @return PHPExcel_Style
+	 */
 	public function applyFromArray($pStyles = null, $pAdvanced = true) {
 		if (is_array($pStyles)) {
 			if ($this->_isSupervisor) {
@@ -532,23 +532,23 @@ 
 		return $this;
 	}
 
-    /**
-     * Get Fill
-     *
-     * @return PHPExcel_Style_Fill
-     */
-    public function getFill() {
+	/**
+	 * Get Fill
+	 *
+	 * @return PHPExcel_Style_Fill
+	 */
+	public function getFill() {
 		return $this->_fill;
-    }
-
-    /**
-     * Get Font
-     *
-     * @return PHPExcel_Style_Font
-     */
-    public function getFont() {
+	}
+
+	/**
+	 * Get Font
+	 *
+	 * @return PHPExcel_Style_Font
+	 */
+	public function getFont() {
 		return $this->_font;
-    }
+	}
 
 	/**
 	 * Set font
@@ -562,63 +562,63 @@ 
 		return $this;
 	}
 
-    /**
-     * Get Borders
-     *
-     * @return PHPExcel_Style_Borders
-     */
-    public function getBorders() {
+	/**
+	 * Get Borders
+	 *
+	 * @return PHPExcel_Style_Borders
+	 */
+	public function getBorders() {
 		return $this->_borders;
-    }
-
-    /**
-     * Get Alignment
-     *
-     * @return PHPExcel_Style_Alignment
-     */
-    public function getAlignment() {
+	}
+
+	/**
+	 * Get Alignment
+	 *
+	 * @return PHPExcel_Style_Alignment
+	 */
+	public function getAlignment() {
 		return $this->_alignment;
-    }
-
-    /**
-     * Get Number Format
-     *
-     * @return PHPExcel_Style_NumberFormat
-     */
-    public function getNumberFormat() {
+	}
+
+	/**
+	 * Get Number Format
+	 *
+	 * @return PHPExcel_Style_NumberFormat
+	 */
+	public function getNumberFormat() {
 		return $this->_numberFormat;
-    }
-
-    /**
-     * Get Conditional Styles. Only used on supervisor.
-     *
-     * @return PHPExcel_Style_Conditional[]
-     */
-    public function getConditionalStyles() {
+	}
+
+	/**
+	 * Get Conditional Styles. Only used on supervisor.
+	 *
+	 * @return PHPExcel_Style_Conditional[]
+	 */
+	public function getConditionalStyles() {
 		return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
-    }
-
-    /**
-     * Set Conditional Styles. Only used on supervisor.
-     *
-     * @param PHPExcel_Style_Conditional[]	$pValue	Array of condtional styles
-     * @return PHPExcel_Style
-     */
-    public function setConditionalStyles($pValue = null) {
+	}
+
+	/**
+	 * Set Conditional Styles. Only used on supervisor.
+	 *
+	 * @param PHPExcel_Style_Conditional[]	$pValue	Array of condtional styles
+	 * @return PHPExcel_Style
+	 */
+	public function setConditionalStyles($pValue = null) {
 		if (is_array($pValue)) {
 			$this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
 		}
 		return $this;
-    }
-
-    /**
-     * Get Protection
-     *
-     * @return PHPExcel_Style_Protection
-     */
-    public function getProtection() {
+	}
+
+	/**
+	 * Get Protection
+	 *
+	 * @return PHPExcel_Style_Protection
+	 */
+	public function getProtection() {
 		return $this->_protection;
-    }
+	}
 
 	/**
 	 * Get hash code
@@ -631,17 +631,17 @@ 
 			$hashConditionals .= $conditional->getHashCode();
 		}
 
-    	return md5(
-    		  $this->_fill->getHashCode()
-    		. $this->_font->getHashCode()
-    		. $this->_borders->getHashCode()
-    		. $this->_alignment->getHashCode()
-    		. $this->_numberFormat->getHashCode()
-    		. $hashConditionals
-    		. $this->_protection->getHashCode()
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->_fill->getHashCode()
+			. $this->_font->getHashCode()
+			. $this->_borders->getHashCode()
+			. $this->_alignment->getHashCode()
+			. $this->_numberFormat->getHashCode()
+			. $hashConditionals
+			. $this->_protection->getHashCode()
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Get own index in style collection

Spacing +13 added lines, -13 removed lines

@@ -116,13 +116,13 @@ 
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-    	$this->_conditionalStyles 	= array();
+    	$this->_conditionalStyles = array();
 		$this->_font				= new PHPExcel_Style_Font($isSupervisor);
 		$this->_fill				= new PHPExcel_Style_Fill($isSupervisor);
-		$this->_borders				= new PHPExcel_Style_Borders($isSupervisor);
-		$this->_alignment			= new PHPExcel_Style_Alignment($isSupervisor);
-		$this->_numberFormat		= new PHPExcel_Style_NumberFormat($isSupervisor);
-		$this->_protection			= new PHPExcel_Style_Protection($isSupervisor);
+		$this->_borders = new PHPExcel_Style_Borders($isSupervisor);
+		$this->_alignment = new PHPExcel_Style_Alignment($isSupervisor);
+		$this->_numberFormat = new PHPExcel_Style_NumberFormat($isSupervisor);
+		$this->_protection = new PHPExcel_Style_Protection($isSupervisor);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
@@ -277,11 +277,11 @@ 
 
 				// Calculate range outer borders
 				$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-				$rangeEnd 	= PHPExcel_Cell::coordinateFromString($rangeB);
+				$rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
 
 				// Translate column into index
-				$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-				$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+				$rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
+				$rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
 
 				// Make sure we can loop upwards on rows and columns
 				if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -298,7 +298,7 @@ 
 					//		it applies to components that have not been set explicitly
 					if (isset($pStyles['borders']['allborders'])) {
 						foreach (array('outline', 'inside') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
+							if ( ! isset($pStyles['borders'][$component])) {
 								$pStyles['borders'][$component] = $pStyles['borders']['allborders'];
 							}
 						}
@@ -309,7 +309,7 @@ 
 					//		it applies to components that have not been set explicitly
 					if (isset($pStyles['borders']['outline'])) {
 						foreach (array('top', 'right', 'bottom', 'left') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
+							if ( ! isset($pStyles['borders'][$component])) {
 								$pStyles['borders'][$component] = $pStyles['borders']['outline'];
 							}
 						}
@@ -320,7 +320,7 @@ 
 					//		it applies to components that have not been set explicitly
 					if (isset($pStyles['borders']['inside'])) {
 						foreach (array('vertical', 'horizontal') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
+							if ( ! isset($pStyles['borders'][$component])) {
 								$pStyles['borders'][$component] = $pStyles['borders']['inside'];
 							}
 						}
@@ -377,14 +377,14 @@ 
 								$rangeStart[1] : $rangeEnd[1] - $yMax + $y;
 
 							// build range for region
-							$range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
+							$range = $colStart.$rowStart.':'.$colEnd.$rowEnd;
 
 							// retrieve relevant style array for region
 							$regionStyles = $pStyles;
 							unset($regionStyles['borders']['inside']);
 
 							// what are the inner edges of the region when looking at the selection
-							$innerEdges = array_diff( array('top', 'right', 'bottom', 'left'), $edges );
+							$innerEdges = array_diff(array('top', 'right', 'bottom', 'left'), $edges);
 
 							// inner edges that are not touching the region should take the 'inside' border properties if they have been set
 							foreach ($innerEdges as $innerEdge) {

app/Vendor/PHPExcel/PHPExcel/Style/Alignment.php

Spacing +12 added lines, -12 removed lines

@@ -37,59 +37,59 @@ 
 {
 	/* Horizontal alignment styles */
 	const HORIZONTAL_GENERAL				= 'general';
-	const HORIZONTAL_LEFT					= 'left';
-	const HORIZONTAL_RIGHT					= 'right';
+	const HORIZONTAL_LEFT = 'left';
+	const HORIZONTAL_RIGHT = 'right';
 	const HORIZONTAL_CENTER					= 'center';
-	const HORIZONTAL_CENTER_CONTINUOUS		= 'centerContinuous';
+	const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous';
 	const HORIZONTAL_JUSTIFY				= 'justify';
 
 	/* Vertical alignment styles */
 	const VERTICAL_BOTTOM					= 'bottom';
-	const VERTICAL_TOP						= 'top';
+	const VERTICAL_TOP = 'top';
 	const VERTICAL_CENTER					= 'center';
-	const VERTICAL_JUSTIFY					= 'justify';
+	const VERTICAL_JUSTIFY = 'justify';
 
 	/**
 	 * Horizontal
 	 *
 	 * @var string
 	 */
-	private $_horizontal	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+	private $_horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
 
 	/**
 	 * Vertical
 	 *
 	 * @var string
 	 */
-	private $_vertical		= PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+	private $_vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
 
 	/**
 	 * Text rotation
 	 *
 	 * @var int
 	 */
-	private $_textRotation	= 0;
+	private $_textRotation = 0;
 
 	/**
 	 * Wrap text
 	 *
 	 * @var boolean
 	 */
-	private $_wrapText		= false;
+	private $_wrapText = false;
 
 	/**
 	 * Shrink to fit
 	 *
 	 * @var boolean
 	 */
-	private $_shrinkToFit	= false;
+	private $_shrinkToFit = false;
 
 	/**
 	 * Indent - only possible with horizontal alignment left and right
 	 *
 	 * @var int
 	 */
-	private $_indent		= 0;
+	private $_indent = 0;
 
 	/**
 	 * Parent Borders
@@ -338,7 +338,7 @@ 
 		}
 
 		// Set rotation
-		if ( ($pValue >= -90 && $pValue <= 90) || $pValue == -165 ) {
+		if (($pValue >= -90 && $pValue <= 90) || $pValue == -165) {
 			if ($this->_isSupervisor) {
 				$styleArray = $this->getStyleArray(array('rotation' => $pValue));
 				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);

Braces +1 added lines, -2 removed lines

@@ -273,8 +273,7 @@
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('horizontal' => $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		}
-		else {
+		} else {
 			$this->_horizontal = $pValue;
 		}
 		return $this;

app/Vendor/PHPExcel/PHPExcel/Style/Border.php

Switch Indentation +30 added lines, -30 removed lines

@@ -211,45 +211,45 @@
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_allBorders':
-			$key = 'allborders';
-			break;
+			case '_allBorders':
+				$key = 'allborders';
+				break;
 
-		case '_bottom':
-			$key = 'bottom';
-			break;
+			case '_bottom':
+				$key = 'bottom';
+				break;
 
-		case '_diagonal':
-			$key = 'diagonal';
-			break;
+			case '_diagonal':
+				$key = 'diagonal';
+				break;
 
-		case '_horizontal':
-			$key = 'horizontal';
-			break;
+			case '_horizontal':
+				$key = 'horizontal';
+				break;
 
-		case '_inside':
-			$key = 'inside';
-			break;
+			case '_inside':
+				$key = 'inside';
+				break;
 
-		case '_left':
-			$key = 'left';
-			break;
+			case '_left':
+				$key = 'left';
+				break;
 
-		case '_outline':
-			$key = 'outline';
-			break;
+			case '_outline':
+				$key = 'outline';
+				break;
 
-		case '_right':
-			$key = 'right';
-			break;
+			case '_right':
+				$key = 'right';
+				break;
 
-		case '_top':
-			$key = 'top';
-			break;
+			case '_top':
+				$key = 'top';
+				break;
 
-		case '_vertical':
-			$key = 'vertical';
-			break;
+			case '_vertical':
+				$key = 'vertical';
+				break;
 		}
 		return $this->_parent->getStyleArray(array($key => $array));
 	}

Spacing +9 added lines, -9 removed lines

@@ -36,27 +36,27 @@ 
 class PHPExcel_Style_Border implements PHPExcel_IComparable
 {
 	/* Border style */
-	const BORDER_NONE				= 'none';
+	const BORDER_NONE = 'none';
 	const BORDER_DASHDOT			= 'dashDot';
-	const BORDER_DASHDOTDOT			= 'dashDotDot';
+	const BORDER_DASHDOTDOT = 'dashDotDot';
 	const BORDER_DASHED				= 'dashed';
 	const BORDER_DOTTED				= 'dotted';
 	const BORDER_DOUBLE				= 'double';
-	const BORDER_HAIR				= 'hair';
+	const BORDER_HAIR = 'hair';
 	const BORDER_MEDIUM				= 'medium';
-	const BORDER_MEDIUMDASHDOT		= 'mediumDashDot';
-	const BORDER_MEDIUMDASHDOTDOT	= 'mediumDashDotDot';
+	const BORDER_MEDIUMDASHDOT = 'mediumDashDot';
+	const BORDER_MEDIUMDASHDOTDOT = 'mediumDashDotDot';
 	const BORDER_MEDIUMDASHED		= 'mediumDashed';
 	const BORDER_SLANTDASHDOT		= 'slantDashDot';
-	const BORDER_THICK				= 'thick';
-	const BORDER_THIN				= 'thin';
+	const BORDER_THICK = 'thick';
+	const BORDER_THIN = 'thin';
 
 	/**
 	 * Border style
 	 *
 	 * @var string
 	 */
-	private $_borderStyle	= PHPExcel_Style_Border::BORDER_NONE;
+	private $_borderStyle = PHPExcel_Style_Border::BORDER_NONE;
 
 	/**
 	 * Border color
@@ -97,7 +97,7 @@ 
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-		$this->_color			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		$this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {

app/Vendor/PHPExcel/PHPExcel/Style/Borders.php

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,7 @@ 
 {
 	/* Diagonal directions */
 	const DIAGONAL_NONE		= 0;
-	const DIAGONAL_UP		= 1;
+	const DIAGONAL_UP = 1;
 	const DIAGONAL_DOWN		= 2;
 	const DIAGONAL_BOTH		= 3;
 
@@ -151,20 +151,20 @@ 
 
     	// Initialise values
     	$this->_left				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_right				= new PHPExcel_Style_Border($isSupervisor);
+    	$this->_right = new PHPExcel_Style_Border($isSupervisor);
     	$this->_top					= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor);
-		$this->_diagonalDirection	= PHPExcel_Style_Borders::DIAGONAL_NONE;
+    	$this->_bottom = new PHPExcel_Style_Border($isSupervisor);
+    	$this->_diagonal = new PHPExcel_Style_Border($isSupervisor);
+		$this->_diagonalDirection = PHPExcel_Style_Borders::DIAGONAL_NONE;
 
 		// Specially for supervisor
 		if ($isSupervisor) {
 			// Initialize pseudo-borders
-			$this->_allBorders			= new PHPExcel_Style_Border(true);
+			$this->_allBorders = new PHPExcel_Style_Border(true);
 			$this->_outline				= new PHPExcel_Style_Border(true);
-			$this->_inside				= new PHPExcel_Style_Border(true);
+			$this->_inside = new PHPExcel_Style_Border(true);
 			$this->_vertical			= new PHPExcel_Style_Border(true);
-			$this->_horizontal			= new PHPExcel_Style_Border(true);
+			$this->_horizontal = new PHPExcel_Style_Border(true);
 
 			// bind parent if we are a supervisor
 			$this->_left->bindParent($this, '_left');
@@ -382,7 +382,7 @@ 
      * @throws Exception
      */
     public function getAllBorders() {
-		if (!$this->_isSupervisor) {
+		if ( ! $this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_allBorders;
@@ -395,7 +395,7 @@ 
      * @throws Exception
      */
     public function getOutline() {
-		if (!$this->_isSupervisor) {
+		if ( ! $this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
     	return $this->_outline;
@@ -408,7 +408,7 @@ 
      * @throws Exception
      */
     public function getInside() {
-		if (!$this->_isSupervisor) {
+		if ( ! $this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
     	return $this->_inside;
@@ -421,7 +421,7 @@ 
      * @throws Exception
      */
     public function getVertical() {
-		if (!$this->_isSupervisor) {
+		if ( ! $this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_vertical;
@@ -434,7 +434,7 @@ 
      * @throws Exception
      */
     public function getHorizontal() {
-		if (!$this->_isSupervisor) {
+		if ( ! $this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_horizontal;

Indentation +166 added lines, -166 removed lines

@@ -140,21 +140,21 @@ 
 	private $_parent;
 
 	/**
-     * Create a new PHPExcel_Style_Borders
+	 * Create a new PHPExcel_Style_Borders
 	 *
 	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-     */
-    public function __construct($isSupervisor = false)
-    {
-    	// Supervisor?
+	 */
+	public function __construct($isSupervisor = false)
+	{
+		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
-    	// Initialise values
-    	$this->_left				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_right				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_top					= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor);
+		// Initialise values
+		$this->_left				= new PHPExcel_Style_Border($isSupervisor);
+		$this->_right				= new PHPExcel_Style_Border($isSupervisor);
+		$this->_top					= new PHPExcel_Style_Border($isSupervisor);
+		$this->_bottom				= new PHPExcel_Style_Border($isSupervisor);
+		$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor);
 		$this->_diagonalDirection	= PHPExcel_Style_Borders::DIAGONAL_NONE;
 
 		// Specially for supervisor
@@ -178,7 +178,7 @@ 
 			$this->_vertical->bindParent($this, '_vertical');
 			$this->_horizontal->bindParent($this, '_horizontal');
 		}
-    }
+	}
 
 	/**
 	 * Bind parent. Only used for supervisor
@@ -257,43 +257,43 @@ 
 	}
 
 	/**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'bottom'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			),
-     * 			'top'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'allborders' => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	Exception
-     * @return PHPExcel_Style_Borders
-     */
+	 * Apply styles from array
+	 *
+	 * <code>
+	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+	 * 		array(
+	 * 			'bottom'     => array(
+	 * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+	 * 				'color' => array(
+	 * 					'rgb' => '808080'
+	 * 				)
+	 * 			),
+	 * 			'top'     => array(
+	 * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+	 * 				'color' => array(
+	 * 					'rgb' => '808080'
+	 * 				)
+	 * 			)
+	 * 		)
+	 * );
+	 * </code>
+	 * <code>
+	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+	 * 		array(
+	 * 			'allborders' => array(
+	 * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+	 * 				'color' => array(
+	 * 					'rgb' => '808080'
+	 * 				)
+	 * 			)
+	 * 		)
+	 * );
+	 * </code>
+	 *
+	 * @param	array	$pStyles	Array containing style information
+	 * @throws	Exception
+	 * @return PHPExcel_Style_Borders
+	 */
 	public function applyFromArray($pStyles = null) {
 		if (is_array($pStyles)) {
 			if ($this->_isSupervisor) {
@@ -330,138 +330,138 @@ 
 		return $this;
 	}
 
-    /**
-     * Get Left
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getLeft() {
+	/**
+	 * Get Left
+	 *
+	 * @return PHPExcel_Style_Border
+	 */
+	public function getLeft() {
 		return $this->_left;
-    }
-
-    /**
-     * Get Right
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getRight() {
+	}
+
+	/**
+	 * Get Right
+	 *
+	 * @return PHPExcel_Style_Border
+	 */
+	public function getRight() {
 		return $this->_right;
-    }
-
-    /**
-     * Get Top
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getTop() {
+	}
+
+	/**
+	 * Get Top
+	 *
+	 * @return PHPExcel_Style_Border
+	 */
+	public function getTop() {
 		return $this->_top;
-    }
-
-    /**
-     * Get Bottom
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getBottom() {
+	}
+
+	/**
+	 * Get Bottom
+	 *
+	 * @return PHPExcel_Style_Border
+	 */
+	public function getBottom() {
 		return $this->_bottom;
-    }
-
-    /**
-     * Get Diagonal
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getDiagonal() {
+	}
+
+	/**
+	 * Get Diagonal
+	 *
+	 * @return PHPExcel_Style_Border
+	 */
+	public function getDiagonal() {
 		return $this->_diagonal;
-    }
-
-    /**
-     * Get AllBorders (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getAllBorders() {
+	}
+
+	/**
+	 * Get AllBorders (pseudo-border). Only applies to supervisor.
+	 *
+	 * @return PHPExcel_Style_Border
+	 * @throws Exception
+	 */
+	public function getAllBorders() {
 		if (!$this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_allBorders;
-    }
-
-    /**
-     * Get Outline (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws Exception
-     */
-    public function getOutline() {
+	}
+
+	/**
+	 * Get Outline (pseudo-border). Only applies to supervisor.
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function getOutline() {
 		if (!$this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
-    	return $this->_outline;
-    }
-
-    /**
-     * Get Inside (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws Exception
-     */
-    public function getInside() {
+		return $this->_outline;
+	}
+
+	/**
+	 * Get Inside (pseudo-border). Only applies to supervisor.
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function getInside() {
 		if (!$this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
-    	return $this->_inside;
-    }
-
-    /**
-     * Get Vertical (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getVertical() {
+		return $this->_inside;
+	}
+
+	/**
+	 * Get Vertical (pseudo-border). Only applies to supervisor.
+	 *
+	 * @return PHPExcel_Style_Border
+	 * @throws Exception
+	 */
+	public function getVertical() {
 		if (!$this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_vertical;
-    }
-
-    /**
-     * Get Horizontal (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getHorizontal() {
+	}
+
+	/**
+	 * Get Horizontal (pseudo-border). Only applies to supervisor.
+	 *
+	 * @return PHPExcel_Style_Border
+	 * @throws Exception
+	 */
+	public function getHorizontal() {
 		if (!$this->_isSupervisor) {
 			throw new Exception('Can only get pseudo-border for supervisor.');
 		}
 		return $this->_horizontal;
-    }
-
-    /**
-     * Get DiagonalDirection
-     *
-     * @return int
-     */
-    public function getDiagonalDirection() {
+	}
+
+	/**
+	 * Get DiagonalDirection
+	 *
+	 * @return int
+	 */
+	public function getDiagonalDirection() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getDiagonalDirection();
 		}
-    	return $this->_diagonalDirection;
-    }
-
-    /**
-     * Set DiagonalDirection
-     *
-     * @param int $pValue
-     * @return PHPExcel_Style_Borders
-     */
-    public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) {
-        if ($pValue == '') {
-    		$pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
-    	}
+		return $this->_diagonalDirection;
+	}
+
+	/**
+	 * Set DiagonalDirection
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Style_Borders
+	 */
+	public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) {
+		if ($pValue == '') {
+			$pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
+		}
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -469,7 +469,7 @@ 
 			$this->_diagonalDirection = $pValue;
 		}
 		return $this;
-    }
+	}
 
 	/**
 	 * Get hash code
@@ -480,16 +480,16 @@ 
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getHashcode();
 		}
-    	return md5(
-    		  $this->getLeft()->getHashCode()
-    		. $this->getRight()->getHashCode()
-    		. $this->getTop()->getHashCode()
-    		. $this->getBottom()->getHashCode()
-    		. $this->getDiagonal()->getHashCode()
-    		. $this->getDiagonalDirection()
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->getLeft()->getHashCode()
+			. $this->getRight()->getHashCode()
+			. $this->getTop()->getHashCode()
+			. $this->getBottom()->getHashCode()
+			. $this->getDiagonal()->getHashCode()
+			. $this->getDiagonalDirection()
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.

app/Vendor/PHPExcel/PHPExcel/Style/Color.php

Switch Indentation +18 added lines, -18 removed lines

@@ -131,17 +131,17 @@ 
 	public function getSharedComponent()
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			return $this->_parent->getSharedComponent()->getEndColor();
-			break;
+			case '_endColor':
+				return $this->_parent->getSharedComponent()->getEndColor();
+				break;
 
-		case '_color':
-			return $this->_parent->getSharedComponent()->getColor();
-			break;
+			case '_color':
+				return $this->_parent->getSharedComponent()->getColor();
+				break;
 
-		case '_startColor':
-			return $this->_parent->getSharedComponent()->getStartColor();
-			break;
+			case '_startColor':
+				return $this->_parent->getSharedComponent()->getStartColor();
+				break;
 		}
 	}
 
@@ -186,17 +186,17 @@ 
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			$key = 'endcolor';
-			break;
+			case '_endColor':
+				$key = 'endcolor';
+				break;
 
-		case '_color':
-			$key = 'color';
-			break;
+			case '_color':
+				$key = 'color';
+				break;
 
-		case '_startColor':
-			$key = 'startcolor';
-			break;
+			case '_startColor':
+				$key = 'startcolor';
+				break;
 
 		}
 		return $this->_parent->getStyleArray(array($key => $array));

Spacing +84 added lines, -84 removed lines

@@ -42,10 +42,10 @@ 
 	const COLOR_DARKRED						= 'FF800000';
 	const COLOR_BLUE						= 'FF0000FF';
 	const COLOR_DARKBLUE					= 'FF000080';
-	const COLOR_GREEN						= 'FF00FF00';
-	const COLOR_DARKGREEN					= 'FF008000';
-	const COLOR_YELLOW						= 'FFFFFF00';
-	const COLOR_DARKYELLOW					= 'FF808000';
+	const COLOR_GREEN = 'FF00FF00';
+	const COLOR_DARKGREEN = 'FF008000';
+	const COLOR_YELLOW = 'FFFFFF00';
+	const COLOR_DARKYELLOW = 'FF808000';
 
 	/**
 	 * Indexed colors array
@@ -285,10 +285,10 @@ 
 			$pValue = '000000';
 		}
 		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
+			$styleArray = $this->getStyleArray(array('argb' => 'FF'.$pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
 		} else {
-			$this->_argb = 'FF' . $pValue;
+			$this->_argb = 'FF'.$pValue;
 		}
 		return $this;
 	}
@@ -303,9 +303,9 @@ 
 	 *									decimal value
 	 * @return	string		The extracted colour component
 	 */
-	private static function _getColourComponent($RGB,$offset,$hex=true) {
-		$colour = substr($RGB,$offset,2);
-		if (!$hex)
+	private static function _getColourComponent($RGB, $offset, $hex = true) {
+		$colour = substr($RGB, $offset, 2);
+		if ( ! $hex)
 			$colour = hexdec($colour);
 		return $colour;
 	}
@@ -318,11 +318,11 @@ 
 	 *									decimal value
 	 * @return	string		The red colour component
 	 */
-	public static function getRed($RGB,$hex=true) {
+	public static function getRed($RGB, $hex = true) {
 		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,2,$hex);
+			return self::_getColourComponent($RGB, 2, $hex);
 		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,0,$hex);
+			return self::_getColourComponent($RGB, 0, $hex);
 		}
 	}
 
@@ -334,11 +334,11 @@ 
 	 *									decimal value
 	 * @return	string		The green colour component
 	 */
-	public static function getGreen($RGB,$hex=true) {
+	public static function getGreen($RGB, $hex = true) {
 		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,4,$hex);
+			return self::_getColourComponent($RGB, 4, $hex);
 		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,2,$hex);
+			return self::_getColourComponent($RGB, 2, $hex);
 		}
 	}
 
@@ -350,11 +350,11 @@ 
 	 *									decimal value
 	 * @return	string		The blue colour component
 	 */
-	public static function getBlue($RGB,$hex=true) {
+	public static function getBlue($RGB, $hex = true) {
 		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,6,$hex);
+			return self::_getColourComponent($RGB, 6, $hex);
 		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,4,$hex);
+			return self::_getColourComponent($RGB, 4, $hex);
 		}
 	}
 
@@ -366,17 +366,17 @@ 
 	 * @return	string		The adjusted colour as an RGB value (e.g. FF00CCCC or CCDDEE
 	 */
 	public static function changeBrightness($hex, $adjustPercentage) {
-		$red	= self::getRed($hex,false);
-		$green	= self::getGreen($hex,false);
-		$blue	= self::getBlue($hex,false);
+		$red = self::getRed($hex, false);
+		$green	= self::getGreen($hex, false);
+		$blue = self::getBlue($hex, false);
 		if ($adjustPercentage > 0) {
 			$red	+= (255 - $red) * $adjustPercentage;
-			$green	+= (255 - $green) * $adjustPercentage;
-			$blue	+= (255 - $blue) * $adjustPercentage;
+			$green += (255 - $green) * $adjustPercentage;
+			$blue += (255 - $blue) * $adjustPercentage;
 		} else {
-			$red	+= $red * $adjustPercentage;
-			$green	+= $green * $adjustPercentage;
-			$blue	+= $blue * $adjustPercentage;
+			$red += $red * $adjustPercentage;
+			$green += $green * $adjustPercentage;
+			$blue += $blue * $adjustPercentage;
 		}
 
 		if ($red < 0) $red = 0;
@@ -386,8 +386,8 @@ 
 		if ($blue < 0) $blue = 0;
 		elseif ($blue > 255) $blue = 255;
 
-		return strtoupper(	str_pad(dechex($red), 2, '0', 0) .
-							str_pad(dechex($green), 2, '0', 0) .
+		return strtoupper(str_pad(dechex($red), 2, '0', 0).
+							str_pad(dechex($green), 2, '0', 0).
 							str_pad(dechex($blue), 2, '0', 0)
 						 );
 	}
@@ -400,68 +400,68 @@ 
 	 *											should be returned if the indexed colour doesn't exist
 	 * @return	PHPExcel_Style_Color
 	 */
-	public static function indexedColor($pIndex, $background=false) {
+	public static function indexedColor($pIndex, $background = false) {
 		// Clean parameter
 		$pIndex = intval($pIndex);
 
 		// Indexed colors
 		if (is_null(self::$_indexedColors)) {
 			self::$_indexedColors = array(
-					1	=> 'FF000000',	//	System Colour #1 - Black
-					2	=> 'FFFFFFFF',	//	System Colour #2 - White
-					3	=> 'FFFF0000',	//	System Colour #3 - Red
-					4	=> 'FF00FF00',	//	System Colour #4 - Green
-					5	=> 'FF0000FF',	//	System Colour #5 - Blue
-					6	=> 'FFFFFF00',	//	System Colour #6 - Yellow
-					7	=> 'FFFF00FF',	//	System Colour #7- Magenta
-					8	=> 'FF00FFFF',	//	System Colour #8- Cyan
-					9	=> 'FF800000',	//	Standard Colour #9
-					10	=> 'FF008000',	//	Standard Colour #10
-					11	=> 'FF000080',	//	Standard Colour #11
-					12	=> 'FF808000',	//	Standard Colour #12
-					13	=> 'FF800080',	//	Standard Colour #13
-					14	=> 'FF008080',	//	Standard Colour #14
-					15	=> 'FFC0C0C0',	//	Standard Colour #15
-					16	=> 'FF808080',	//	Standard Colour #16
-					17	=> 'FF9999FF',	//	Chart Fill Colour #17
-					18	=> 'FF993366',	//	Chart Fill Colour #18
-					19	=> 'FFFFFFCC',	//	Chart Fill Colour #19
-					20	=> 'FFCCFFFF',	//	Chart Fill Colour #20
-					21	=> 'FF660066',	//	Chart Fill Colour #21
-					22	=> 'FFFF8080',	//	Chart Fill Colour #22
-					23	=> 'FF0066CC',	//	Chart Fill Colour #23
-					24	=> 'FFCCCCFF',	//	Chart Fill Colour #24
-					25	=> 'FF000080',	//	Chart Line Colour #25
-					26	=> 'FFFF00FF',	//	Chart Line Colour #26
-					27	=> 'FFFFFF00',	//	Chart Line Colour #27
-					28	=> 'FF00FFFF',	//	Chart Line Colour #28
-					29	=> 'FF800080',	//	Chart Line Colour #29
-					30	=> 'FF800000',	//	Chart Line Colour #30
-					31	=> 'FF008080',	//	Chart Line Colour #31
-					32	=> 'FF0000FF',	//	Chart Line Colour #32
-					33	=> 'FF00CCFF',	//	Standard Colour #33
-					34	=> 'FFCCFFFF',	//	Standard Colour #34
-					35	=> 'FFCCFFCC',	//	Standard Colour #35
-					36	=> 'FFFFFF99',	//	Standard Colour #36
-					37	=> 'FF99CCFF',	//	Standard Colour #37
-					38	=> 'FFFF99CC',	//	Standard Colour #38
-					39	=> 'FFCC99FF',	//	Standard Colour #39
-					40	=> 'FFFFCC99',	//	Standard Colour #40
-					41	=> 'FF3366FF',	//	Standard Colour #41
-					42	=> 'FF33CCCC',	//	Standard Colour #42
-					43	=> 'FF99CC00',	//	Standard Colour #43
-					44	=> 'FFFFCC00',	//	Standard Colour #44
-					45	=> 'FFFF9900',	//	Standard Colour #45
-					46	=> 'FFFF6600',	//	Standard Colour #46
-					47	=> 'FF666699',	//	Standard Colour #47
-					48	=> 'FF969696',	//	Standard Colour #48
-					49	=> 'FF003366',	//	Standard Colour #49
-					50	=> 'FF339966',	//	Standard Colour #50
-					51	=> 'FF003300',	//	Standard Colour #51
-					52	=> 'FF333300',	//	Standard Colour #52
-					53	=> 'FF993300',	//	Standard Colour #53
-					54	=> 'FF993366',	//	Standard Colour #54
-					55	=> 'FF333399',	//	Standard Colour #55
+					1	=> 'FF000000', //	System Colour #1 - Black
+					2	=> 'FFFFFFFF', //	System Colour #2 - White
+					3	=> 'FFFF0000', //	System Colour #3 - Red
+					4	=> 'FF00FF00', //	System Colour #4 - Green
+					5	=> 'FF0000FF', //	System Colour #5 - Blue
+					6	=> 'FFFFFF00', //	System Colour #6 - Yellow
+					7	=> 'FFFF00FF', //	System Colour #7- Magenta
+					8	=> 'FF00FFFF', //	System Colour #8- Cyan
+					9	=> 'FF800000', //	Standard Colour #9
+					10	=> 'FF008000', //	Standard Colour #10
+					11	=> 'FF000080', //	Standard Colour #11
+					12	=> 'FF808000', //	Standard Colour #12
+					13	=> 'FF800080', //	Standard Colour #13
+					14	=> 'FF008080', //	Standard Colour #14
+					15	=> 'FFC0C0C0', //	Standard Colour #15
+					16	=> 'FF808080', //	Standard Colour #16
+					17	=> 'FF9999FF', //	Chart Fill Colour #17
+					18	=> 'FF993366', //	Chart Fill Colour #18
+					19	=> 'FFFFFFCC', //	Chart Fill Colour #19
+					20	=> 'FFCCFFFF', //	Chart Fill Colour #20
+					21	=> 'FF660066', //	Chart Fill Colour #21
+					22	=> 'FFFF8080', //	Chart Fill Colour #22
+					23	=> 'FF0066CC', //	Chart Fill Colour #23
+					24	=> 'FFCCCCFF', //	Chart Fill Colour #24
+					25	=> 'FF000080', //	Chart Line Colour #25
+					26	=> 'FFFF00FF', //	Chart Line Colour #26
+					27	=> 'FFFFFF00', //	Chart Line Colour #27
+					28	=> 'FF00FFFF', //	Chart Line Colour #28
+					29	=> 'FF800080', //	Chart Line Colour #29
+					30	=> 'FF800000', //	Chart Line Colour #30
+					31	=> 'FF008080', //	Chart Line Colour #31
+					32	=> 'FF0000FF', //	Chart Line Colour #32
+					33	=> 'FF00CCFF', //	Standard Colour #33
+					34	=> 'FFCCFFFF', //	Standard Colour #34
+					35	=> 'FFCCFFCC', //	Standard Colour #35
+					36	=> 'FFFFFF99', //	Standard Colour #36
+					37	=> 'FF99CCFF', //	Standard Colour #37
+					38	=> 'FFFF99CC', //	Standard Colour #38
+					39	=> 'FFCC99FF', //	Standard Colour #39
+					40	=> 'FFFFCC99', //	Standard Colour #40
+					41	=> 'FF3366FF', //	Standard Colour #41
+					42	=> 'FF33CCCC', //	Standard Colour #42
+					43	=> 'FF99CC00', //	Standard Colour #43
+					44	=> 'FFFFCC00', //	Standard Colour #44
+					45	=> 'FFFF9900', //	Standard Colour #45
+					46	=> 'FFFF6600', //	Standard Colour #46
+					47	=> 'FF666699', //	Standard Colour #47
+					48	=> 'FF969696', //	Standard Colour #48
+					49	=> 'FF003366', //	Standard Colour #49
+					50	=> 'FF339966', //	Standard Colour #50
+					51	=> 'FF003300', //	Standard Colour #51
+					52	=> 'FF333300', //	Standard Colour #52
+					53	=> 'FF993300', //	Standard Colour #53
+					54	=> 'FF993366', //	Standard Colour #54
+					55	=> 'FF333399', //	Standard Colour #55
 					56	=> 'FF333333'	//	Standard Colour #56
 				);
 		}

Braces +18 added lines, -8 removed lines

@@ -305,8 +305,9 @@ 
 	 */
 	private static function _getColourComponent($RGB,$offset,$hex=true) {
 		$colour = substr($RGB,$offset,2);
-		if (!$hex)
-			$colour = hexdec($colour);
+		if (!$hex) {
+					$colour = hexdec($colour);
+		}
 		return $colour;
 	}
 
@@ -379,12 +380,21 @@ 
 			$blue	+= $blue * $adjustPercentage;
 		}
 
-		if ($red < 0) $red = 0;
-		elseif ($red > 255) $red = 255;
-		if ($green < 0) $green = 0;
-		elseif ($green > 255) $green = 255;
-		if ($blue < 0) $blue = 0;
-		elseif ($blue > 255) $blue = 255;
+		if ($red < 0) {
+			$red = 0;
+		} elseif ($red > 255) {
+			$red = 255;
+		}
+		if ($green < 0) {
+			$green = 0;
+		} elseif ($green > 255) {
+			$green = 255;
+		}
+		if ($blue < 0) {
+			$blue = 0;
+		} elseif ($blue > 255) {
+			$blue = 255;
+		}
 
 		return strtoupper(	str_pad(dechex($red), 2, '0', 0) .
 							str_pad(dechex($green), 2, '0', 0) .

app/Vendor/PHPExcel/PHPExcel/Style/Fill.php

Spacing +13 added lines, -13 removed lines

@@ -38,39 +38,39 @@ 
 	/* Fill types */
 	const FILL_NONE							= 'none';
 	const FILL_SOLID						= 'solid';
-	const FILL_GRADIENT_LINEAR				= 'linear';
-	const FILL_GRADIENT_PATH				= 'path';
+	const FILL_GRADIENT_LINEAR = 'linear';
+	const FILL_GRADIENT_PATH = 'path';
 	const FILL_PATTERN_DARKDOWN				= 'darkDown';
 	const FILL_PATTERN_DARKGRAY				= 'darkGray';
 	const FILL_PATTERN_DARKGRID				= 'darkGrid';
-	const FILL_PATTERN_DARKHORIZONTAL		= 'darkHorizontal';
-	const FILL_PATTERN_DARKTRELLIS			= 'darkTrellis';
-	const FILL_PATTERN_DARKUP				= 'darkUp';
-	const FILL_PATTERN_DARKVERTICAL			= 'darkVertical';
+	const FILL_PATTERN_DARKHORIZONTAL = 'darkHorizontal';
+	const FILL_PATTERN_DARKTRELLIS = 'darkTrellis';
+	const FILL_PATTERN_DARKUP = 'darkUp';
+	const FILL_PATTERN_DARKVERTICAL = 'darkVertical';
 	const FILL_PATTERN_GRAY0625				= 'gray0625';
-	const FILL_PATTERN_GRAY125				= 'gray125';
+	const FILL_PATTERN_GRAY125 = 'gray125';
 	const FILL_PATTERN_LIGHTDOWN			= 'lightDown';
 	const FILL_PATTERN_LIGHTGRAY			= 'lightGray';
 	const FILL_PATTERN_LIGHTGRID			= 'lightGrid';
-	const FILL_PATTERN_LIGHTHORIZONTAL		= 'lightHorizontal';
+	const FILL_PATTERN_LIGHTHORIZONTAL = 'lightHorizontal';
 	const FILL_PATTERN_LIGHTTRELLIS			= 'lightTrellis';
-	const FILL_PATTERN_LIGHTUP				= 'lightUp';
+	const FILL_PATTERN_LIGHTUP = 'lightUp';
 	const FILL_PATTERN_LIGHTVERTICAL		= 'lightVertical';
-	const FILL_PATTERN_MEDIUMGRAY			= 'mediumGray';
+	const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
 
 	/**
 	 * Fill type
 	 *
 	 * @var string
 	 */
-	private $_fillType	= PHPExcel_Style_Fill::FILL_NONE;
+	private $_fillType = PHPExcel_Style_Fill::FILL_NONE;
 
 	/**
 	 * Rotation
 	 *
 	 * @var double
 	 */
-	private $_rotation	= 0;
+	private $_rotation = 0;
 
 	/**
 	 * Start color
@@ -119,7 +119,7 @@ 
 
 		// Initialise values
 		$this->_startColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor);
-		$this->_endColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		$this->_endColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {

Doc Comments +1 added lines, -1 removed lines

@@ -327,7 +327,7 @@
 	/**
 	 * Set Size
 	 *
-	 * @param double $pValue
+	 * @param integer $pValue
 	 * @return PHPExcel_Style_Font
 	 */
 	public function setSize($pValue = 10) {

app/Vendor/PHPExcel/PHPExcel/Style/NumberFormat.php

Spacing +32 added lines, -32 removed lines

@@ -36,19 +36,19 @@ 
 class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 {
 	/* Pre-defined formats */
-	const FORMAT_GENERAL					= 'General';
+	const FORMAT_GENERAL = 'General';
 
-	const FORMAT_TEXT						= '@';
+	const FORMAT_TEXT = '@';
 
-	const FORMAT_NUMBER						= '0';
-	const FORMAT_NUMBER_00					= '0.00';
+	const FORMAT_NUMBER = '0';
+	const FORMAT_NUMBER_00 = '0.00';
 	const FORMAT_NUMBER_COMMA_SEPARATED1	= '#,##0.00';
 	const FORMAT_NUMBER_COMMA_SEPARATED2	= '#,##0.00_-';
 
-	const FORMAT_PERCENTAGE					= '0%';
+	const FORMAT_PERCENTAGE = '0%';
 	const FORMAT_PERCENTAGE_00				= '0.00%';
 
-	const FORMAT_DATE_YYYYMMDD2				= 'yyyy-mm-dd';
+	const FORMAT_DATE_YYYYMMDD2 = 'yyyy-mm-dd';
 	const FORMAT_DATE_YYYYMMDD				= 'yy-mm-dd';
 	const FORMAT_DATE_DDMMYYYY				= 'dd/mm/yy';
 	const FORMAT_DATE_DMYSLASH				= 'd/m/y';
@@ -60,7 +60,7 @@ 
 	const FORMAT_DATE_XLSX16				= 'd-mmm';
 	const FORMAT_DATE_XLSX17				= 'mmm-yy';
 	const FORMAT_DATE_XLSX22				= 'm/d/yy h:mm';
-	const FORMAT_DATE_DATETIME				= 'd/m/y h:mm';
+	const FORMAT_DATE_DATETIME = 'd/m/y h:mm';
 	const FORMAT_DATE_TIME1					= 'h:mm AM/PM';
 	const FORMAT_DATE_TIME2					= 'h:mm:ss AM/PM';
 	const FORMAT_DATE_TIME3					= 'h:mm';
@@ -72,7 +72,7 @@ 
 	const FORMAT_DATE_YYYYMMDDSLASH			= 'yy/mm/dd;@';
 
 	const FORMAT_CURRENCY_USD_SIMPLE		= '"$"#,##0.00_-';
-	const FORMAT_CURRENCY_USD				= '$#,##0_-';
+	const FORMAT_CURRENCY_USD = '$#,##0_-';
 	const FORMAT_CURRENCY_EUR_SIMPLE		= '[$EUR ]#,##0.00_-';
 
 	/**
@@ -94,14 +94,14 @@ 
 	 *
 	 * @var string
 	 */
-	private $_formatCode	=	PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+	private $_formatCode = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
 
 	/**
 	 * Built-in format Code
 	 *
 	 * @var string
 	 */
-	private $_builtInFormatCode	= 0;
+	private $_builtInFormatCode = 0;
 
 	/**
 	 * Parent Borders
@@ -518,7 +518,7 @@ 
 	public static function toFormattedString($value = '', $format = '', $callBack = null)
 	{
 		// For now we do not treat strings although section 4 of a format code affects strings
-		if (!is_numeric($value)) return $value;
+		if ( ! is_numeric($value)) return $value;
 
 		// For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
 		// it seems to round numbers to a total of 10 digits.
@@ -548,14 +548,14 @@ 
 
 			case 3:
 				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
+					$sections[0] : (($value < 0) ?
 						$sections[1] : $sections[2]);
 				$value = abs($value); // Use the absolute value
 				break;
 
 			case 4:
 				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
+					$sections[0] : (($value < 0) ?
 						$sections[1] : $sections[2]);
 				$value = abs($value); // Use the absolute value
 				break;
@@ -585,11 +585,11 @@ 
 			// OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case
 			$format = strtolower($format);
 
-			$format = strtr($format,self::$_dateFormatReplacements);
-			if (!strpos($format,'A')) {	// 24-hour time format
-				$format = strtr($format,self::$_dateFormatReplacements24);
+			$format = strtr($format, self::$_dateFormatReplacements);
+			if ( ! strpos($format, 'A')) {	// 24-hour time format
+				$format = strtr($format, self::$_dateFormatReplacements24);
 			} else {					// 12-hour time format
-				$format = strtr($format,self::$_dateFormatReplacements12);
+				$format = strtr($format, self::$_dateFormatReplacements12);
 			}
 
 			$dateObj = PHPExcel_Shared_Date::ExcelToPHPObject($value);
@@ -597,23 +597,23 @@ 
 
 		} else if (preg_match('/%$/', $format)) { // % number format
 			if ($format === self::FORMAT_PERCENTAGE) {
-				$value = round( (100 * $value), 0) . '%';
+				$value = round((100 * $value), 0).'%';
 			} else {
 				if (preg_match('/\.[#0]+/i', $format, $m)) {
-					$s = substr($m[0], 0, 1) . (strlen($m[0]) - 1);
+					$s = substr($m[0], 0, 1).(strlen($m[0]) - 1);
 					$format = str_replace($m[0], $s, $format);
 				}
 				if (preg_match('/^[#0]+/', $format, $m)) {
 					$format = str_replace($m[0], strlen($m[0]), $format);
 				}
-				$format = '%' . str_replace('%', 'f%%', $format);
+				$format = '%'.str_replace('%', 'f%%', $format);
 
 				$value = sprintf($format, 100 * $value);
 			}
 
 		} else {
 			if ($format === self::FORMAT_CURRENCY_EUR_SIMPLE) {
-				$value = 'EUR ' . sprintf('%1.2f', $value);
+				$value = 'EUR '.sprintf('%1.2f', $value);
 
 			} else {
 				// In Excel formats, "_" is used to add spacing, which we can't do in HTML
@@ -623,7 +623,7 @@ 
 				$format = preg_replace("/\\\\/", '', $format);
 
 				// Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
-				$format = str_replace(array('"','*'), '', $format);
+				$format = str_replace(array('"', '*'), '', $format);
 
 				// Find out if we need thousands separator
 				// This is indicated by a comma enclosed by a digit placeholder:
@@ -649,20 +649,20 @@ 
 
 				if (preg_match('/#?.*\?\/\?/', $format, $m)) {
 					//echo 'Format mask is fractional '.$format.' <br />';
-					if ($value != (int)$value) {
+					if ($value != (int) $value) {
 						$sign = ($value < 0) ? '-' : '';
 
 						$integerPart = floor(abs($value));
-						$decimalPart = trim(fmod(abs($value),1),'0.');
+						$decimalPart = trim(fmod(abs($value), 1), '0.');
 						$decimalLength = strlen($decimalPart);
-						$decimalDivisor = pow(10,$decimalLength);
+						$decimalDivisor = pow(10, $decimalLength);
 
-						$GCD = PHPExcel_Calculation_MathTrig::GCD($decimalPart,$decimalDivisor);
+						$GCD = PHPExcel_Calculation_MathTrig::GCD($decimalPart, $decimalDivisor);
 
-						$adjustedDecimalPart = $decimalPart/$GCD;
-						$adjustedDecimalDivisor = $decimalDivisor/$GCD;
+						$adjustedDecimalPart = $decimalPart / $GCD;
+						$adjustedDecimalDivisor = $decimalDivisor / $GCD;
 
-						if ((strpos($format,'0') !== false) || (strpos($format,'#') !== false) || (substr($format,0,3) == '? ?')) {
+						if ((strpos($format, '0') !== false) || (strpos($format, '#') !== false) || (substr($format, 0, 3) == '? ?')) {
 							if ($integerPart == 0) { $integerPart = ''; }
 							$value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
 						} else {
@@ -699,7 +699,7 @@ 
 										, PHPExcel_Shared_String::getThousandsSeparator()
 									);
 						} else {
-							$sprintf_pattern = "%0$minWidth." . strlen($right) . "f";
+							$sprintf_pattern = "%0$minWidth.".strlen($right)."f";
 							$value = sprintf($sprintf_pattern, $value);
 						}
 
@@ -710,11 +710,11 @@ 
 					//	Currency or Accounting
 					$currencyFormat = $m[0];
 					$currencyCode = $m[1];
-					list($currencyCode) = explode('-',$currencyCode);
+					list($currencyCode) = explode('-', $currencyCode);
 					if ($currencyCode == '') {
 						$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
 					}
-					$value = preg_replace('/\[\$([^\]]*)\]/u',$currencyCode,$value);
+					$value = preg_replace('/\[\$([^\]]*)\]/u', $currencyCode, $value);
 				}
 			}
 		}

Braces +3 added lines, -1 removed lines

@@ -518,7 +518,9 @@
 	public static function toFormattedString($value = '', $format = '', $callBack = null)
 	{
 		// For now we do not treat strings although section 4 of a format code affects strings
-		if (!is_numeric($value)) return $value;
+		if (!is_numeric($value)) {
+			return $value;
+		}
 
 		// For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
 		// it seems to round numbers to a total of 10 digits.

app/Vendor/PHPExcel/PHPExcel/Style/Protection.php

Indentation +59 added lines, -59 removed lines

@@ -75,20 +75,20 @@ 
 	 */
 	private $_parent;
 
-    /**
-     * Create a new PHPExcel_Style_Protection
+	/**
+	 * Create a new PHPExcel_Style_Protection
 	 *
 	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-     */
-    public function __construct($isSupervisor = false)
-    {
-    	// Supervisor?
+	 */
+	public function __construct($isSupervisor = false)
+	{
+		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
-    	// Initialise values
-    	$this->_locked			= self::PROTECTION_INHERIT;
-    	$this->_hidden			= self::PROTECTION_INHERIT;
-    }
+		// Initialise values
+		$this->_locked			= self::PROTECTION_INHERIT;
+		$this->_hidden			= self::PROTECTION_INHERIT;
+	}
 
 	/**
 	 * Bind parent. Only used for supervisor
@@ -166,17 +166,17 @@ 
 		return array('protection' => $array);
 	}
 
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray( array('locked' => true, 'hidden' => false) );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	Exception
-     * @return PHPExcel_Style_Protection
-     */
+	/**
+	 * Apply styles from array
+	 *
+	 * <code>
+	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray( array('locked' => true, 'hidden' => false) );
+	 * </code>
+	 *
+	 * @param	array	$pStyles	Array containing style information
+	 * @throws	Exception
+	 * @return PHPExcel_Style_Protection
+	 */
 	public function applyFromArray($pStyles = null) {
 		if (is_array($pStyles)) {
 			if ($this->_isSupervisor) {
@@ -195,25 +195,25 @@ 
 		return $this;
 	}
 
-    /**
-     * Get locked
-     *
-     * @return string
-     */
-    public function getLocked() {
+	/**
+	 * Get locked
+	 *
+	 * @return string
+	 */
+	public function getLocked() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getLocked();
 		}
-    	return $this->_locked;
-    }
+		return $this->_locked;
+	}
 
-    /**
-     * Set locked
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setLocked($pValue = self::PROTECTION_INHERIT) {
+	/**
+	 * Set locked
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Style_Protection
+	 */
+	public function setLocked($pValue = self::PROTECTION_INHERIT) {
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('locked' => $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -221,27 +221,27 @@ 
 			$this->_locked = $pValue;
 		}
 		return $this;
-    }
+	}
 
-    /**
-     * Get hidden
-     *
-     * @return string
-     */
-    public function getHidden() {
+	/**
+	 * Get hidden
+	 *
+	 * @return string
+	 */
+	public function getHidden() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getHidden();
 		}
-    	return $this->_hidden;
-    }
+		return $this->_hidden;
+	}
 
-    /**
-     * Set hidden
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setHidden($pValue = self::PROTECTION_INHERIT) {
+	/**
+	 * Set hidden
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Style_Protection
+	 */
+	public function setHidden($pValue = self::PROTECTION_INHERIT) {
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('hidden' => $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -249,7 +249,7 @@ 
 			$this->_hidden = $pValue;
 		}
 		return $this;
-    }
+	}
 
 	/**
 	 * Get hash code
@@ -260,12 +260,12 @@ 
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getHashCode();
 		}
-    	return md5(
-    		  $this->_locked
-    		. $this->_hidden
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->_locked
+			. $this->_hidden
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.

Spacing +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
 class PHPExcel_Style_Protection implements PHPExcel_IComparable
 {
 	/** Protection styles */
-	const PROTECTION_INHERIT		= 'inherit';
-	const PROTECTION_PROTECTED		= 'protected';
-	const PROTECTION_UNPROTECTED	= 'unprotected';
+	const PROTECTION_INHERIT = 'inherit';
+	const PROTECTION_PROTECTED = 'protected';
+	const PROTECTION_UNPROTECTED = 'unprotected';
 
 	/**
 	 * Locked

app/Vendor/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php

Spacing +9 added lines, -9 removed lines

@@ -132,21 +132,21 @@ 
     public function __construct()
     {
     	// Initialise values
-    	$this->_name				= '';
+    	$this->_name = '';
     	$this->_description			= '';
-    	$this->_worksheet			= null;
+    	$this->_worksheet = null;
     	$this->_coordinates			= 'A1';
     	$this->_offsetX				= 0;
     	$this->_offsetY				= 0;
-    	$this->_width				= 0;
+    	$this->_width = 0;
     	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    	$this->_rotation			= 0;
+    	$this->_resizeProportional = true;
+    	$this->_rotation = 0;
     	$this->_shadow				= new PHPExcel_Worksheet_Drawing_Shadow();
 
 		// Set image index
 		self::$_imageCounter++;
-		$this->_imageIndex 			= self::$_imageCounter;
+		$this->_imageIndex = self::$_imageCounter;
     }
 
     /**
@@ -228,7 +228,7 @@ 
 
     			while ($iterator->valid()) {
     				if ($iterator->current()->getHashCode() == $this->getHashCode()) {
-    					$this->_worksheet->getDrawingCollection()->offsetUnset( $iterator->key() );
+    					$this->_worksheet->getDrawingCollection()->offsetUnset($iterator->key());
     					$this->_worksheet = null;
     					break;
     				}
@@ -375,12 +375,12 @@ 
 	public function setWidthAndHeight($width = 0, $height = 0) {
 		$xratio = $width / $this->_width;
 		$yratio = $height / $this->_height;
-		if ($this->_resizeProportional && !($width == 0 || $height == 0)) {
+		if ($this->_resizeProportional && ! ($width == 0 || $height == 0)) {
 			if (($xratio * $this->_height) < $height) {
 				$this->_height = ceil($xratio * $this->_height);
 				$this->_width  = $width;
 			} else {
-				$this->_width	= ceil($yratio * $this->_width);
+				$this->_width = ceil($yratio * $this->_width);
 				$this->_height	= $height;
 			}
 		}

Indentation +308 added lines, -308 removed lines

@@ -126,252 +126,252 @@ 
 	 */
 	protected $_shadow;
 
-    /**
-     * Create a new PHPExcel_Worksheet_BaseDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_name				= '';
-    	$this->_description			= '';
-    	$this->_worksheet			= null;
-    	$this->_coordinates			= 'A1';
-    	$this->_offsetX				= 0;
-    	$this->_offsetY				= 0;
-    	$this->_width				= 0;
-    	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    	$this->_rotation			= 0;
-    	$this->_shadow				= new PHPExcel_Worksheet_Drawing_Shadow();
+	/**
+	 * Create a new PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function __construct()
+	{
+		// Initialise values
+		$this->_name				= '';
+		$this->_description			= '';
+		$this->_worksheet			= null;
+		$this->_coordinates			= 'A1';
+		$this->_offsetX				= 0;
+		$this->_offsetY				= 0;
+		$this->_width				= 0;
+		$this->_height				= 0;
+		$this->_resizeProportional	= true;
+		$this->_rotation			= 0;
+		$this->_shadow				= new PHPExcel_Worksheet_Drawing_Shadow();
 
 		// Set image index
 		self::$_imageCounter++;
 		$this->_imageIndex 			= self::$_imageCounter;
-    }
-
-    /**
-     * Get image index
-     *
-     * @return int
-     */
-    public function getImageIndex() {
-    	return $this->_imageIndex;
-    }
-
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set Name
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setName($pValue = '') {
-    	$this->_name = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Description
-     *
-     * @return string
-     */
-    public function getDescription() {
-    	return $this->_description;
-    }
-
-    /**
-     * Set Description
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setDescription($pValue = '') {
-    	$this->_description = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function getWorksheet() {
-    	return $this->_worksheet;
-    }
-
-    /**
-     * Set Worksheet
-     *
-     * @param 	PHPExcel_Worksheet 	$pValue
-     * @param 	bool				$pOverrideOld	If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
-    	if (is_null($this->_worksheet)) {
-    		// Add drawing to PHPExcel_Worksheet
-	    	$this->_worksheet = $pValue;
-	    	$this->_worksheet->getCell($this->_coordinates);
-	    	$this->_worksheet->getDrawingCollection()->append($this);
-    	} else {
-    		if ($pOverrideOld) {
-    			// Remove drawing from old PHPExcel_Worksheet
-    			$iterator = $this->_worksheet->getDrawingCollection()->getIterator();
-
-    			while ($iterator->valid()) {
-    				if ($iterator->current()->getHashCode() == $this->getHashCode()) {
-    					$this->_worksheet->getDrawingCollection()->offsetUnset( $iterator->key() );
-    					$this->_worksheet = null;
-    					break;
-    				}
-    			}
-
-    			// Set new PHPExcel_Worksheet
-    			$this->setWorksheet($pValue);
-    		} else {
-    			throw new Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
-    		}
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get Coordinates
-     *
-     * @return string
-     */
-    public function getCoordinates() {
-    	return $this->_coordinates;
-    }
-
-    /**
-     * Set Coordinates
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setCoordinates($pValue = 'A1') {
-    	$this->_coordinates = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetX
-     *
-     * @return int
-     */
-    public function getOffsetX() {
-    	return $this->_offsetX;
-    }
-
-    /**
-     * Set OffsetX
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetX($pValue = 0) {
-    	$this->_offsetX = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetY
-     *
-     * @return int
-     */
-    public function getOffsetY() {
-    	return $this->_offsetY;
-    }
-
-    /**
-     * Set OffsetY
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetY($pValue = 0) {
-    	$this->_offsetY = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return int
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWidth($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_height / $this->_width;
-    		$this->_height = round($ratio * $pValue);
-    	}
-
-    	// Set width
-    	$this->_width = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Get Height
-     *
-     * @return int
-     */
-    public function getHeight() {
-    	return $this->_height;
-    }
-
-    /**
-     * Set Height
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setHeight($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_width = round($ratio * $pValue);
-    	}
-
-    	// Set height
-    	$this->_height = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Set width and height with proportional resize
+	}
+
+	/**
+	 * Get image index
+	 *
+	 * @return int
+	 */
+	public function getImageIndex() {
+		return $this->_imageIndex;
+	}
+
+	/**
+	 * Get Name
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		return $this->_name;
+	}
+
+	/**
+	 * Set Name
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setName($pValue = '') {
+		$this->_name = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Description
+	 *
+	 * @return string
+	 */
+	public function getDescription() {
+		return $this->_description;
+	}
+
+	/**
+	 * Set Description
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setDescription($pValue = '') {
+		$this->_description = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Worksheet
+	 *
+	 * @return PHPExcel_Worksheet
+	 */
+	public function getWorksheet() {
+		return $this->_worksheet;
+	}
+
+	/**
+	 * Set Worksheet
+	 *
+	 * @param 	PHPExcel_Worksheet 	$pValue
+	 * @param 	bool				$pOverrideOld	If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
+	 * @throws 	Exception
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
+		if (is_null($this->_worksheet)) {
+			// Add drawing to PHPExcel_Worksheet
+			$this->_worksheet = $pValue;
+			$this->_worksheet->getCell($this->_coordinates);
+			$this->_worksheet->getDrawingCollection()->append($this);
+		} else {
+			if ($pOverrideOld) {
+				// Remove drawing from old PHPExcel_Worksheet
+				$iterator = $this->_worksheet->getDrawingCollection()->getIterator();
+
+				while ($iterator->valid()) {
+					if ($iterator->current()->getHashCode() == $this->getHashCode()) {
+						$this->_worksheet->getDrawingCollection()->offsetUnset( $iterator->key() );
+						$this->_worksheet = null;
+						break;
+					}
+				}
+
+				// Set new PHPExcel_Worksheet
+				$this->setWorksheet($pValue);
+			} else {
+				throw new Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Get Coordinates
+	 *
+	 * @return string
+	 */
+	public function getCoordinates() {
+		return $this->_coordinates;
+	}
+
+	/**
+	 * Set Coordinates
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setCoordinates($pValue = 'A1') {
+		$this->_coordinates = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get OffsetX
+	 *
+	 * @return int
+	 */
+	public function getOffsetX() {
+		return $this->_offsetX;
+	}
+
+	/**
+	 * Set OffsetX
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setOffsetX($pValue = 0) {
+		$this->_offsetX = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get OffsetY
+	 *
+	 * @return int
+	 */
+	public function getOffsetY() {
+		return $this->_offsetY;
+	}
+
+	/**
+	 * Set OffsetY
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setOffsetY($pValue = 0) {
+		$this->_offsetY = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Width
+	 *
+	 * @return int
+	 */
+	public function getWidth() {
+		return $this->_width;
+	}
+
+	/**
+	 * Set Width
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setWidth($pValue = 0) {
+		// Resize proportional?
+		if ($this->_resizeProportional && $pValue != 0) {
+			$ratio = $this->_height / $this->_width;
+			$this->_height = round($ratio * $pValue);
+		}
+
+		// Set width
+		$this->_width = $pValue;
+
+		return $this;
+	}
+
+	/**
+	 * Get Height
+	 *
+	 * @return int
+	 */
+	public function getHeight() {
+		return $this->_height;
+	}
+
+	/**
+	 * Set Height
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setHeight($pValue = 0) {
+		// Resize proportional?
+		if ($this->_resizeProportional && $pValue != 0) {
+			$ratio = $this->_width / $this->_height;
+			$this->_width = round($ratio * $pValue);
+		}
+
+		// Set height
+		$this->_height = $pValue;
+
+		return $this;
+	}
+
+	/**
+	 * Set width and height with proportional resize
 	 * Example:
 	 * <code>
 	 * $objDrawing->setResizeProportional(true);
 	 * $objDrawing->setWidthAndHeight(160,120);
 	 * </code>
 	 *
-     * @author Vincent@luo MSN:kele_100@hotmail.com
-     * @param int $width
-     * @param int $height
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
+	 * @author Vincent@luo MSN:kele_100@hotmail.com
+	 * @param int $width
+	 * @param int $height
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
 	public function setWidthAndHeight($width = 0, $height = 0) {
 		$xratio = $width / $this->_width;
 		$yratio = $height / $this->_height;
@@ -387,66 +387,66 @@ 
 		return $this;
 	}
 
-    /**
-     * Get ResizeProportional
-     *
-     * @return boolean
-     */
-    public function getResizeProportional() {
-    	return $this->_resizeProportional;
-    }
-
-    /**
-     * Set ResizeProportional
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setResizeProportional($pValue = true) {
-    	$this->_resizeProportional = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Rotation
-     *
-     * @return int
-     */
-    public function getRotation() {
-    	return $this->_rotation;
-    }
-
-    /**
-     * Set Rotation
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setRotation($pValue = 0) {
-    	$this->_rotation = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow
-     *
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function getShadow() {
-    	return $this->_shadow;
-    }
-
-    /**
-     * Set Shadow
-     *
-     * @param 	PHPExcel_Worksheet_Drawing_Shadow $pValue
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {
+	/**
+	 * Get ResizeProportional
+	 *
+	 * @return boolean
+	 */
+	public function getResizeProportional() {
+		return $this->_resizeProportional;
+	}
+
+	/**
+	 * Set ResizeProportional
+	 *
+	 * @param boolean $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setResizeProportional($pValue = true) {
+		$this->_resizeProportional = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Rotation
+	 *
+	 * @return int
+	 */
+	public function getRotation() {
+		return $this->_rotation;
+	}
+
+	/**
+	 * Set Rotation
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setRotation($pValue = 0) {
+		$this->_rotation = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Shadow
+	 *
+	 * @return PHPExcel_Worksheet_Drawing_Shadow
+	 */
+	public function getShadow() {
+		return $this->_shadow;
+	}
+
+	/**
+	 * Set Shadow
+	 *
+	 * @param 	PHPExcel_Worksheet_Drawing_Shadow $pValue
+	 * @throws 	Exception
+	 * @return PHPExcel_Worksheet_BaseDrawing
+	 */
+	public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {
    		$this->_shadow = $pValue;
    		return $this;
-    }
+	}
 
 	/**
 	 * Get hash code
@@ -454,20 +454,20 @@ 
 	 * @return string	Hash code
 	 */
 	public function getHashCode() {
-    	return md5(
-    		  $this->_name
-    		. $this->_description
-    		. $this->_worksheet->getHashCode()
-    		. $this->_coordinates
-    		. $this->_offsetX
-    		. $this->_offsetY
-    		. $this->_width
-    		. $this->_height
-    		. $this->_rotation
-    		. $this->_shadow->getHashCode()
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->_name
+			. $this->_description
+			. $this->_worksheet->getHashCode()
+			. $this->_coordinates
+			. $this->_offsetX
+			. $this->_offsetY
+			. $this->_width
+			. $this->_height
+			. $this->_rotation
+			. $this->_shadow->getHashCode()
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.