reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php

Doc Comments +5 added lines, -2 removed lines

@@ -198,7 +198,9 @@ 
 	 * @param int		&$str_unique	Total number of unique strings
 	 * @param array		&$str_table		String Table
 	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
+	 * @param PHPExcel_Writer_Excel5_Parser		$parser			The formula parser created for the Workbook
+	 * @param integer $str_total
+	 * @param integer $str_unique
 	 */
 	public function __construct(PHPExcel $phpExcel = null,
 								&$str_total, &$str_unique, &$str_table, &$colors,
@@ -248,6 +250,7 @@ 
 	 *
 	 * @param PHPExcel_Style
 	 * @param boolean Is it a style XF?
+	 * @param PHPExcel_Style $style
 	 * @return int Index to XF record
 	 */
 	public function addXfWriter($style, $isStyleXf = false)
@@ -788,7 +791,7 @@ 
 	 *
 	 * @param	string		$name			The name in UTF-8
 	 * @param	string		$formulaData	The binary formula data
-	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
+	 * @param	integer		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
 	 * @param	boolean		$isBuiltIn		Built-in name?
 	 * @return	string	Complete binary record data
 	 */

Spacing +117 added lines, -117 removed lines

@@ -202,7 +202,7 @@ 
 	 */
 	public function __construct(PHPExcel $phpExcel = null,
 								&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser )
+								$parser)
 	{
 		// It needs to call its parent's constructor explicitly
 		parent::__construct();
@@ -229,11 +229,11 @@ 
 		for ($i = 0; $i < $countSheets; ++$i) {
 			$phpSheet = $phpExcel->getSheet($i);
 
-			$this->_parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
+			$this->_parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
 
 			$supbook_index = 0x00;
 			$ref = pack('vvv', $supbook_index, $i, $i);
-			$this->_parser->_references[] = $ref;  // Register reference with parser
+			$this->_parser->_references[] = $ref; // Register reference with parser
 
 			// Sheet tab colors?
 			if ($phpSheet->isTabColorSet()) {
@@ -303,7 +303,7 @@ 
 	public function _addFont(PHPExcel_Style_Font $font)
 	{
 		$fontHashCode = $font->getHashCode();
-		if(isset($this->_addedFonts[$fontHashCode])){
+		if (isset($this->_addedFonts[$fontHashCode])) {
 			$fontIndex = $this->_addedFonts[$fontHashCode];
 		} else {
 			$countFonts = count($this->_fontWriters);
@@ -324,7 +324,7 @@ 
 	 * @return int Color index
 	 */
 	private function _addColor($rgb) {
-		if (!isset($this->_colors[$rgb])) {
+		if ( ! isset($this->_colors[$rgb])) {
 			if (count($this->_colors) < 57) {
 				// then we add a custom color altering the palette
 				$colorIndex = 8 + count($this->_colors);
@@ -478,7 +478,7 @@ 
 	 */
 	function _calcSheetOffsets()
 	{
-		$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
+		$boundsheet_length = 10; // fixed length for a BOUNDSHEET record
 
 		// size of Workbook globals part 1 + 3
 		$offset            = $this->_datasize;
@@ -661,7 +661,7 @@ 
 				// Create absolute coordinate
 				$range = PHPExcel_Cell::splitRange($namedRange->getRange());
 				for ($i = 0; $i < count($range); $i++) {
-					$range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
+					$range[$i][0] = '\''.str_replace("'", "''", $namedRange->getWorksheet()->getTitle()).'\'!'.PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
 					if (isset($range[$i][1])) {
 						$range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
 					}
@@ -675,7 +675,7 @@ 
 
 					// make sure tRef3d is of type tRef3dR (0x3A)
 					if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
-						$formulaData = "\x3A" . substr($formulaData, 1);
+						$formulaData = "\x3A".substr($formulaData, 1);
 					}
 
 					if ($namedRange->getLocalOnly()) {
@@ -687,7 +687,7 @@ 
 					}
 					$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
 
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					// do nothing
 				}
 			}
@@ -810,12 +810,12 @@ 
 
 		// combine the parts
 		$data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
-			. $name . $formulaData;
+			. $name.$formulaData;
 		$length = strlen($data);
 
 		$header = pack('vv', $record, $length);
 
-		return $header . $data;
+		return $header.$data;
 	}
 
 	/**
@@ -823,14 +823,14 @@ 
 	 */
 	private function _writeCodepage()
 	{
-		$record          = 0x0042;             // Record identifier
-		$length          = 0x0002;             // Number of bytes to follow
-		$cv              = $this->_codepage;   // The code page
+		$record          = 0x0042; // Record identifier
+		$length          = 0x0002; // Number of bytes to follow
+		$cv              = $this->_codepage; // The code page
 
 		$header          = pack('vv', $record, $length);
-		$data            = pack('v',  $cv);
+		$data            = pack('v', $cv);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -838,31 +838,31 @@ 
 	 */
 	private function _writeWindow1()
 	{
-		$record    = 0x003D;                 // Record identifier
-		$length    = 0x0012;                 // Number of bytes to follow
+		$record    = 0x003D; // Record identifier
+		$length    = 0x0012; // Number of bytes to follow
 
-		$xWn       = 0x0000;                 // Horizontal position of window
-		$yWn       = 0x0000;                 // Vertical position of window
-		$dxWn      = 0x25BC;                 // Width of window
-		$dyWn      = 0x1572;                 // Height of window
+		$xWn       = 0x0000; // Horizontal position of window
+		$yWn       = 0x0000; // Vertical position of window
+		$dxWn      = 0x25BC; // Width of window
+		$dyWn      = 0x1572; // Height of window
 
-		$grbit     = 0x0038;                 // Option flags
+		$grbit     = 0x0038; // Option flags
 
 		// not supported by PHPExcel, so there is only one selected sheet, the active
-		$ctabsel   = 1;       // Number of workbook tabs selected
+		$ctabsel   = 1; // Number of workbook tabs selected
 
-		$wTabRatio = 0x0258;                 // Tab to scrollbar ratio
+		$wTabRatio = 0x0258; // Tab to scrollbar ratio
 
 		// not supported by PHPExcel, set to 0
-		$itabFirst = 0;     // 1st displayed worksheet
-		$itabCur   = $this->_phpExcel->getActiveSheetIndex();    // Active worksheet
+		$itabFirst = 0; // 1st displayed worksheet
+		$itabCur   = $this->_phpExcel->getActiveSheetIndex(); // Active worksheet
 
-		$header    = pack("vv",        $record, $length);
+		$header    = pack("vv", $record, $length);
 		$data      = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn,
 									   $grbit,
 									   $itabCur, $itabFirst,
 									   $ctabsel, $wTabRatio);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -874,7 +874,7 @@ 
 	private function _writeBoundsheet($sheet, $offset)
 	{
 		$sheetname = $sheet->getTitle();
-		$record    = 0x0085;                    // Record identifier
+		$record    = 0x0085; // Record identifier
 
 		// sheet state
 		switch ($sheet->getSheetState()) {
@@ -887,14 +887,14 @@ 
 		// sheet type
 		$st = 0x00;
 
-		$grbit     = 0x0000;                    // Visibility and sheet type
+		$grbit     = 0x0000; // Visibility and sheet type
 
 		$data      = pack("VCC", $offset, $ss, $st);
 		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
 
 		$length = strlen($data);
-		$header = pack("vv",  $record, $length);
-		$this->_append($header . $data);
+		$header = pack("vv", $record, $length);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -902,12 +902,12 @@ 
 	 */
 	private function _writeSupbookInternal()
 	{
-		$record    = 0x01AE;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
+		$record    = 0x01AE; // Record identifier
+		$length    = 0x0004; // Bytes to follow
 
 		$header    = pack("vv", $record, $length);
 		$data      = pack("vv", $this->_phpExcel->getSheetCount(), 0x0401);
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -918,16 +918,16 @@ 
 	private function _writeExternsheetBiff8()
 	{
 		$total_references = count($this->_parser->_references);
-		$record   = 0x0017;                     // Record identifier
-		$length   = 2 + 6 * $total_references;  // Number of bytes to follow
+		$record   = 0x0017; // Record identifier
+		$length   = 2 + 6 * $total_references; // Number of bytes to follow
 
-		$supbook_index = 0;           // FIXME: only using internal SUPBOOK record
-		$header           = pack("vv",  $record, $length);
+		$supbook_index = 0; // FIXME: only using internal SUPBOOK record
+		$header           = pack("vv", $record, $length);
 		$data             = pack('v', $total_references);
 		for ($i = 0; $i < $total_references; ++$i) {
 			$data .= $this->_parser->_references[$i];
 		}
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -935,16 +935,16 @@ 
 	 */
 	private function _writeStyle()
 	{
-		$record    = 0x0293;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
+		$record    = 0x0293; // Record identifier
+		$length    = 0x0004; // Bytes to follow
 
-		$ixfe      = 0x8000;  // Index to cell style XF
-		$BuiltIn   = 0x00;     // Built-in style
-		$iLevel    = 0xff;     // Outline style level
+		$ixfe      = 0x8000; // Index to cell style XF
+		$BuiltIn   = 0x00; // Built-in style
+		$iLevel    = 0xff; // Outline style level
 
-		$header    = pack("vv",  $record, $length);
+		$header    = pack("vv", $record, $length);
 		$data      = pack("vCC", $ixfe, $BuiltIn, $iLevel);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -955,15 +955,15 @@ 
 	 */
 	private function _writeNumFormat($format, $ifmt)
 	{
-		$record    = 0x041E;                      // Record identifier
+		$record    = 0x041E; // Record identifier
 
 		$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
-		$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
+		$length    = 2 + strlen($numberFormatString); // Number of bytes to follow
 
 
 		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $ifmt) .  $numberFormatString;
-		$this->_append($header . $data);
+		$data      = pack("v", $ifmt).$numberFormatString;
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -971,15 +971,15 @@ 
 	 */
 	private function _writeDatemode()
 	{
-		$record    = 0x0022;         // Record identifier
-		$length    = 0x0002;         // Bytes to follow
+		$record    = 0x0022; // Record identifier
+		$length    = 0x0002; // Bytes to follow
 
 		$f1904     = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) ?
-			1 : 0;   // Flag for 1904 date system
+			1 : 0; // Flag for 1904 date system
 
 		$header    = pack("vv", $record, $length);
 		$data      = pack("v", $f1904);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -996,12 +996,12 @@ 
 	 */
 	private function _writeExterncount($cxals)
 	{
-		$record   = 0x0016;          // Record identifier
-		$length   = 0x0002;          // Number of bytes to follow
+		$record   = 0x0016; // Record identifier
+		$length   = 0x0002; // Number of bytes to follow
 
 		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $cxals);
-		$this->_append($header . $data);
+		$data     = pack("v", $cxals);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1015,15 +1015,15 @@ 
 	 */
 	private function _writeExternsheet($sheetname)
 	{
-		$record      = 0x0017;                     // Record identifier
-		$length      = 0x02 + strlen($sheetname);  // Number of bytes to follow
+		$record      = 0x0017; // Record identifier
+		$length      = 0x02 + strlen($sheetname); // Number of bytes to follow
 
-		$cch         = strlen($sheetname);         // Length of sheet name
-		$rgch        = 0x03;                       // Filename encoding
+		$cch         = strlen($sheetname); // Length of sheet name
+		$rgch        = 0x03; // Filename encoding
 
-		$header      = pack("vv",  $record, $length);
+		$header      = pack("vv", $record, $length);
 		$data        = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
+		$this->_append($header.$data.$sheetname);
 	}
 
 	/**
@@ -1039,23 +1039,23 @@ 
 	 */
 	private function _writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
 	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x0024;       // Number of bytes to follow
-
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x0015;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
+		$record          = 0x0018; // Record identifier
+		$length          = 0x0024; // Number of bytes to follow
+
+		$grbit           = 0x0020; // Option flags
+		$chKey           = 0x00; // Keyboard shortcut
+		$cch             = 0x01; // Length of text name
+		$cce             = 0x0015; // Length of text definition
+		$ixals           = $index + 1; // Sheet index
+		$itab            = $ixals; // Equal to ixals
+		$cchCustMenu     = 0x00; // Length of cust menu text
+		$cchDescription  = 0x00; // Length of description text
+		$cchHelptopic    = 0x00; // Length of help topic text
+		$cchStatustext   = 0x00; // Length of status bar text
+		$rgch            = $type; // Built-in name type
 
 		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
+		$unknown04       = 0xffff - $index;
 		$unknown05       = 0x0000;
 		$unknown06       = 0x0000;
 		$unknown07       = 0x1087;
@@ -1085,7 +1085,7 @@ 
 		$data              .= pack("v", $rowmax);
 		$data              .= pack("C", $colmin);
 		$data              .= pack("C", $colmax);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1103,30 +1103,30 @@ 
 	 */
 	private function _writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
 	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x003d;       // Number of bytes to follow
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x002e;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
+		$record          = 0x0018; // Record identifier
+		$length          = 0x003d; // Number of bytes to follow
+		$grbit           = 0x0020; // Option flags
+		$chKey           = 0x00; // Keyboard shortcut
+		$cch             = 0x01; // Length of text name
+		$cce             = 0x002e; // Length of text definition
+		$ixals           = $index + 1; // Sheet index
+		$itab            = $ixals; // Equal to ixals
+		$cchCustMenu     = 0x00; // Length of cust menu text
+		$cchDescription  = 0x00; // Length of description text
+		$cchHelptopic    = 0x00; // Length of help topic text
+		$cchStatustext   = 0x00; // Length of status bar text
+		$rgch            = $type; // Built-in name type
 
 		$unknown01       = 0x29;
 		$unknown02       = 0x002b;
 		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
+		$unknown04       = 0xffff - $index;
 		$unknown05       = 0x0000;
 		$unknown06       = 0x0000;
 		$unknown07       = 0x1087;
 		$unknown08       = 0x8008;
 
-		$header             = pack("vv",  $record, $length);
+		$header             = pack("vv", $record, $length);
 		$data               = pack("v", $grbit);
 		$data              .= pack("C", $chKey);
 		$data              .= pack("C", $cch);
@@ -1168,7 +1168,7 @@ 
 		$data              .= pack("C", 0xff);
 		// End of data
 		$data              .= pack("C", 0x10);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1178,14 +1178,14 @@ 
 	 */
 	private function _writeCountry()
 	{
-		$record          = 0x008C;    // Record identifier
-		$length          = 4;         // Number of bytes to follow
+		$record          = 0x008C; // Record identifier
+		$length          = 4; // Number of bytes to follow
 
-		$header = pack('vv',  $record, $length);
+		$header = pack('vv', $record, $length);
 		/* using the same country code always for simplicity */
 		$data = pack('vv', $this->_country_code, $this->_country_code);
 		//$this->_append($header . $data);
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -1195,15 +1195,15 @@ 
 	 */
 	private function _writeRecalcId()
 	{
-		$record = 0x01C1;    // Record identifier
-		$length = 8;         // Number of bytes to follow
+		$record = 0x01C1; // Record identifier
+		$length = 8; // Number of bytes to follow
 
-		$header = pack('vv',  $record, $length);
+		$header = pack('vv', $record, $length);
 
 		// by inspection of real Excel files, MS Office Excel 2007 writes this
 		$data = pack('VV', 0x000001C1, 0x00001E667);
 
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -1213,20 +1213,20 @@ 
 	{
 		$aref            = $this->_palette;
 
-		$record          = 0x0092;                 // Record identifier
-		$length          = 2 + 4 * count($aref);   // Number of bytes to follow
-		$ccv             =         count($aref);   // Number of RGB values to follow
-		$data = '';                                // The RGB data
+		$record          = 0x0092; // Record identifier
+		$length          = 2 + 4 * count($aref); // Number of bytes to follow
+		$ccv             = count($aref); // Number of RGB values to follow
+		$data = ''; // The RGB data
 
 		// Pack the RGB data
 		foreach ($aref as $color) {
 			foreach ($color as $byte) {
-				$data .= pack("C",$byte);
+				$data .= pack("C", $byte);
 			}
 		}
 
-		$header = pack("vvv",  $record, $length, $ccv);
-		$this->_append($header . $data);
+		$header = pack("vvv", $record, $length, $ccv);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1318,7 +1318,7 @@ 
 						$effective_space_remaining = $space_remaining;
 
 						// for uncompressed strings, sometimes effective space remaining is reduced by 1
-						if ( $encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1 ) {
+						if ($encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1) {
 							--$effective_space_remaining;
 						}
 
@@ -1348,7 +1348,7 @@ 
 			$record = ($i == 0) ? 0x00FC : 0x003C;
 
 			$header = pack("vv", $record, strlen($recordData));
-			$data = $header . $recordData;
+			$data = $header.$recordData;
 
 			$chunk .= $this->writeData($data);
 		}
@@ -1368,9 +1368,9 @@ 
 
 			$record = 0x00EB;
 			$length = strlen($data);
-			$header = pack("vv",  $record, $length);
+			$header = pack("vv", $record, $length);
 
-			return $this->writeData($header . $data);
+			return $this->writeData($header.$data);
 
 		} else {
 			return '';

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php

Doc Comments +10 added lines, -8 removed lines

@@ -206,10 +206,12 @@ 
 	 * @param int		&$str_unique	Total number of unique strings
 	 * @param array		&$str_table		String Table
 	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
+	 * @param PHPExcel_Writer_Excel5_Parser		$parser			The formula parser created for the Workbook
 	 * @param boolean	$preCalculateFormulas	Flag indicating whether formulas should be calculated or just written
 	 * @param string	$phpSheet		The worksheet to write
 	 * @param PHPExcel_Worksheet $phpSheet
+	 * @param integer $str_total
+	 * @param integer $str_unique
 	 */
 	public function __construct(&$str_total, &$str_unique, &$str_table, &$colors,
 								$parser, $preCalculateFormulas, $phpSheet)
@@ -606,7 +608,7 @@ 
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
 	 * @param float   $num	The number to write
-	 * @param mixed   $xfIndex The optional XF format
+	 * @param integer   $xfIndex The optional XF format
 	 * @return integer
 	 */
 	private function _writeNumber($row, $col, $num, $xfIndex)
@@ -643,7 +645,7 @@ 
 	 * @param int $row Row index (0-based)
 	 * @param int $col Column index (0-based)
 	 * @param string $str The string
-	 * @param mixed   $xfIndex The XF format index for the cell
+	 * @param integer   $xfIndex The XF format index for the cell
 	 * @param array $arrcRun Index to Font record and characters beginning
 	 */
 	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
@@ -711,7 +713,7 @@ 
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
 	 * @param string  $str	The string to write
-	 * @param mixed   $xfIndex The XF format index for the cell
+	 * @param integer   $xfIndex The XF format index for the cell
 	 * @return integer
 	 */
 	private function _writeLabelSst($row, $col, $str, $xfIndex)
@@ -776,7 +778,7 @@ 
 	 *
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
-	 * @param mixed   $xfIndex The XF format index
+	 * @param integer   $xfIndex The XF format index
 	 */
 	function _writeBlank($row, $col, $xfIndex)
 	{
@@ -821,7 +823,7 @@ 
 	 * @param integer $row	 Zero indexed row
 	 * @param integer $col	 Zero indexed column
 	 * @param string  $formula The formula text string
-	 * @param mixed   $xfIndex  The XF format index
+	 * @param integer   $xfIndex  The XF format index
 	 * @param mixed   $calculatedValue  Calculated value
 	 * @return integer
 	 */
@@ -2304,8 +2306,8 @@ 
 	 * @param mixed   $bitmap  The bitmap filename or GD-image resource
 	 * @param integer $x	   The horizontal position (offset) of the image inside the cell.
 	 * @param integer $y	   The vertical position (offset) of the image inside the cell.
-	 * @param float   $scale_x The horizontal scale
-	 * @param float   $scale_y The vertical scale
+	 * @param integer   $scale_x The horizontal scale
+	 * @param integer   $scale_y The vertical scale
 	 */
 	function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
 	{

Spacing +432 added lines, -432 removed lines

@@ -223,7 +223,7 @@ 
 
 		$this->_preCalculateFormulas = $preCalculateFormulas;
 		$this->_str_total		= &$str_total;
-		$this->_str_unique		= &$str_unique;
+		$this->_str_unique = &$str_unique;
 		$this->_str_table		= &$str_table;
 		$this->_colors			= &$colors;
 		$this->_parser			= $parser;
@@ -232,10 +232,10 @@ 
 
 		//$this->ext_sheets		= array();
 		//$this->offset			= 0;
-		$this->_xls_strmax		= 255;
-		$this->_colinfo			= array();
-		$this->_selection		= array(0,0,0,0);
-		$this->_active_pane		= 3;
+		$this->_xls_strmax = 255;
+		$this->_colinfo = array();
+		$this->_selection = array(0, 0, 0, 0);
+		$this->_active_pane = 3;
 
 		$this->_print_headers		= 0;
 
@@ -250,12 +250,12 @@ 
 		$minR = 1;
 		$minC = 'A';
 
-		$maxR  = $this->_phpSheet->getHighestRow();
+		$maxR = $this->_phpSheet->getHighestRow();
 		$maxC = $this->_phpSheet->getHighestColumn();
 
 		// Determine lowest and highest column and row
 //		$this->_firstRowIndex = ($minR > 65535) ? 65535 : $minR;
-		$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
+		$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR;
 
 		$this->_firstColumnIndex	= PHPExcel_Cell::columnIndexFromString($minC);
 		$this->_lastColumnIndex		= PHPExcel_Cell::columnIndexFromString($maxC);
@@ -300,7 +300,7 @@ 
 		}
 
 		$columnDimensions = $_phpSheet->getColumnDimensions();
-		$maxCol = $this->_lastColumnIndex -1;
+		$maxCol = $this->_lastColumnIndex - 1;
 		for ($i = 0; $i <= $maxCol; ++$i) {
 			$hidden = 0;
 			$level = 0;
@@ -384,7 +384,7 @@ 
 		$this->_writeDefcol();
 
 		// Write the COLINFO records if they exist
-		if (!empty($this->_colinfo)) {
+		if ( ! empty($this->_colinfo)) {
 			$colcount = count($this->_colinfo);
 			for ($i = 0; $i < $colcount; ++$i) {
 				$this->_writeColinfo($this->_colinfo[$i]);
@@ -397,7 +397,7 @@ 
 		// Row dimensions
 		foreach ($_phpSheet->getRowDimensions() as $rowDimension) {
 			$xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
-			$this->_writeRow( $rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel() );
+			$this->_writeRow($rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel());
 		}
 
 		// Write Cells
@@ -485,17 +485,17 @@ 
 
 			$url = $hyperlink->getUrl();
 
-			if ( strpos($url, 'sheet://') !== false ) {
+			if (strpos($url, 'sheet://') !== false) {
 				// internal to current workbook
 				$url = str_replace('sheet://', 'internal:', $url);
 
-			} else if ( preg_match('/^(http:|https:|ftp:|mailto:)/', $url) ) {
+			} else if (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
 				// URL
 				// $url = $url;
 
 			} else {
 				// external (local file)
-				$url = 'external:' . $url;
+				$url = 'external:'.$url;
 			}
 
 			$this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
@@ -532,7 +532,7 @@ 
 		}
 
 		$firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-		$lastCellCoordinates  = PHPExcel_Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
+		$lastCellCoordinates  = PHPExcel_Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
 
 		return(pack('vvvv',
 			$firstCellCoordinates[1] - 1,
@@ -554,7 +554,7 @@ 
 
 		// Return data stored in memory
 		if (isset($this->_data)) {
-			$tmp   = $this->_data;
+			$tmp = $this->_data;
 			unset($this->_data);
 			return $tmp;
 		}
@@ -584,7 +584,7 @@ 
 	 */
 	function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false)
 	{
-		$this->_outline_on	= $visible;
+		$this->_outline_on = $visible;
 		$this->_outline_below = $symbols_below;
 		$this->_outline_right = $symbols_right;
 		$this->_outline_style = $auto_style;
@@ -611,12 +611,12 @@ 
 	 */
 	private function _writeNumber($row, $col, $num, $xfIndex)
 	{
-		$record	= 0x0203;				 // Record identifier
-		$length	= 0x000E;				 // Number of bytes to follow
+		$record	= 0x0203; // Record identifier
+		$length	= 0x000E; // Number of bytes to follow
 
-		$header		= pack("vv",  $record, $length);
-		$data		= pack("vvv", $row, $col, $xfIndex);
-		$xl_double	= pack("d",   $num);
+		$header = pack("vv", $record, $length);
+		$data = pack("vvv", $row, $col, $xfIndex);
+		$xl_double = pack("d", $num);
 		if (self::getByteOrder()) { // if it's Big Endian
 			$xl_double = strrev($xl_double);
 		}
@@ -646,20 +646,20 @@ 
 	 * @param mixed   $xfIndex The XF format index for the cell
 	 * @param array $arrcRun Index to Font record and characters beginning
 	 */
-	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
+	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun) {
+		$record	= 0x00FD; // Record identifier
+		$length	= 0x000A; // Bytes to follow
 
 		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
 
 		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
+		if ( ! isset($this->_str_table[$str])) {
 			$this->_str_table[$str] = $this->_str_unique++;
 		}
 		$this->_str_total++;
 
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
+		$header = pack('vv', $record, $length);
+		$data = pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
 		$this->_append($header.$data);
 	}
 
@@ -681,21 +681,21 @@ 
 	private function _writeLabel($row, $col, $str, $xfIndex)
 	{
 		$strlen	= strlen($str);
-		$record	= 0x0204;				   // Record identifier
-		$length	= 0x0008 + $strlen;		 // Bytes to follow
+		$record	= 0x0204; // Record identifier
+		$length	= 0x0008 + $strlen; // Bytes to follow
 
 		$str_error = 0;
 
 		if ($strlen > $this->_xls_strmax) { // LABEL must be < 255 chars
-			$str	= substr($str, 0, $this->_xls_strmax);
+			$str = substr($str, 0, $this->_xls_strmax);
 			$length	= 0x0008 + $this->_xls_strmax;
 			$strlen	= $this->_xls_strmax;
 			$str_error = -3;
 		}
 
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvvv", $row, $col, $xfIndex, $strlen);
-		$this->_append($header . $data . $str);
+		$header = pack("vv", $record, $length);
+		$data = pack("vvvv", $row, $col, $xfIndex, $strlen);
+		$this->_append($header.$data.$str);
 		return($str_error);
 	}
 
@@ -716,19 +716,19 @@ 
 	 */
 	private function _writeLabelSst($row, $col, $str, $xfIndex)
 	{
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
+		$record	= 0x00FD; // Record identifier
+		$length	= 0x000A; // Bytes to follow
 
 		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($str);
 
 		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
+		if ( ! isset($this->_str_table[$str])) {
 			$this->_str_table[$str] = $this->_str_unique++;
 		}
 		$this->_str_total++;
 
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
+		$header = pack('vv', $record, $length);
+		$data = pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
 		$this->_append($header.$data);
 	}
 
@@ -743,19 +743,19 @@ 
 	private function _writeNote($row, $col, $note)
 	{
 		$note_length	= strlen($note);
-		$record			= 0x001C;			// Record identifier
-		$max_length		= 2048;				// Maximun length for a NOTE record
+		$record = 0x001C; // Record identifier
+		$max_length		= 2048; // Maximun length for a NOTE record
 
 		// Length for this record is no more than 2048 + 6
 		$length	= 0x0006 + min($note_length, 2048);
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvv", $row, $col, $note_length);
-		$this->_append($header . $data . substr($note, 0, 2048));
+		$header	= pack("vv", $record, $length);
+		$data = pack("vvv", $row, $col, $note_length);
+		$this->_append($header.$data.substr($note, 0, 2048));
 
 		for ($i = $max_length; $i < $note_length; $i += $max_length) {
 			$chunk  = substr($note, $i, $max_length);
 			$length = 0x0006 + strlen($chunk);
-			$header = pack("vv",   $record, $length);
+			$header = pack("vv", $record, $length);
 			$data   = pack("vvv", -1, 0, strlen($chunk));
 			$this->_append($header.$data.$chunk);
 		}
@@ -780,12 +780,12 @@ 
 	 */
 	function _writeBlank($row, $col, $xfIndex)
 	{
-		$record	= 0x0201;				 // Record identifier
-		$length	= 0x0006;				 // Number of bytes to follow
+		$record	= 0x0201; // Record identifier
+		$length	= 0x0006; // Number of bytes to follow
 
-		$header	= pack("vv",  $record, $length);
+		$header	= pack("vv", $record, $length);
 		$data	  = pack("vvv", $row, $col, $xfIndex);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 		return 0;
 	}
 
@@ -803,9 +803,9 @@ 
 		$record = 0x0205;
 		$length = 8;
 
-		$header	= pack("vv",  $record, $length);
+		$header	= pack("vv", $record, $length);
 		$data	  = pack("vvvCC", $row, $col, $xfIndex, $value, $isError);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 		return 0;
 	}
 
@@ -827,7 +827,7 @@ 
 	 */
 	private function _writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
 	{
-		$record	= 0x0006;	 // Record identifier
+		$record = 0x0006; // Record identifier
 
 		// Initialize possible additional value for STRING record that should be written after the FORMULA record?
 		$stringValue = null;
@@ -838,7 +838,7 @@ 
 			// we use best effort to determine data type
 			if (is_bool($calculatedValue)) {
 				// Boolean value
-				$num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
+				$num = pack('CCCvCv', 0x01, 0x00, (int) $calculatedValue, 0x00, 0x00, 0xFFFF);
 			} elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
 				// Numeric value
 				$num = pack('d', $calculatedValue);
@@ -862,12 +862,12 @@ 
 			$num = pack('d', 0x00);
 		}
 
-		$grbit		= 0x03;				// Option flags
-		$unknown	= 0x0000;			// Must be zero
+		$grbit = 0x03; // Option flags
+		$unknown = 0x0000; // Must be zero
 
 		// Strip the '=' or '@' sign at the beginning of the formula string
 		if ($formula{0} == '=') {
-			$formula = substr($formula,1);
+			$formula = substr($formula, 1);
 		} else {
 			// Error handling
 			$this->_writeString($row, $col, 'Unrecognised character for formula');
@@ -879,15 +879,15 @@ 
 			$error = $this->_parser->parse($formula);
 			$formula = $this->_parser->toReversePolish();
 
-			$formlen	= strlen($formula);	// Length of the binary string
-			$length	 = 0x16 + $formlen;	 // Length of the record data
+			$formlen	= strlen($formula); // Length of the binary string
+			$length	 = 0x16 + $formlen; // Length of the record data
 
-			$header	= pack("vv",	  $record, $length);
+			$header	= pack("vv", $record, $length);
 
 			$data	  = pack("vvv", $row, $col, $xfIndex)
 						. $num
 						. pack("vVv", $grbit, $unknown, $formlen);
-			$this->_append($header . $data . $formula);
+			$this->_append($header.$data.$formula);
 
 			// Append also a STRING record if necessary
 			if ($stringValue !== null) {
@@ -909,13 +909,13 @@ 
 	 */
 	private function _writeStringRecord($stringValue)
 	{
-		$record = 0x0207;	 // Record identifier
+		$record = 0x0207; // Record identifier
 		$data = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
 
 		$length = strlen($data);
 		$header = pack('vv', $record, $length);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -987,8 +987,8 @@ 
 	 */
 	function _writeUrlWeb($row1, $col1, $row2, $col2, $url)
 	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
+		$record	  = 0x01B8; // Record identifier
+		$length	  = 0x00000; // Bytes to follow
 
 		// Pack the undocumented parts of the hyperlink stream
 		$unknown1	= pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
@@ -999,7 +999,7 @@ 
 
 		// Convert URL to a null terminated wchar string
 		$url		 = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-		$url		 = $url . "\0\0\0";
+		$url		 = $url."\0\0\0";
 
 		// Pack the length of the URL
 		$url_len	 = pack("V", strlen($url));
@@ -1008,13 +1008,13 @@ 
 		$length	  = 0x34 + strlen($url);
 
 		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
+		$header	  = pack("vv", $record, $length);
+		$data = pack("vvvv", $row1, $row2, $col1, $col2);
 
 		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $unknown2 . $url_len . $url);
+		$this->_append($header.$data.
+					   $unknown1.$options.
+					   $unknown2.$url_len.$url);
 		return 0;
 	}
 
@@ -1032,8 +1032,8 @@ 
 	 */
 	function _writeUrlInternal($row1, $col1, $row2, $col2, $url)
 	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
+		$record	  = 0x01B8; // Record identifier
+		$length	  = 0x00000; // Bytes to follow
 
 		// Strip URL type
 		$url = preg_replace('/^internal:/', '', $url);
@@ -1057,13 +1057,13 @@ 
 		$length	  = 0x24 + strlen($url);
 
 		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
+		$header	  = pack("vv", $record, $length);
+		$data = pack("vvvv", $row1, $row2, $col1, $col2);
 
 		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $url_len . $url);
+		$this->_append($header.$data.
+					   $unknown1.$options.
+					   $url_len.$url);
 		return 0;
 	}
 
@@ -1091,8 +1091,8 @@ 
 			return; //($this->_writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
 		}
 
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
+		$record	  = 0x01B8; // Record identifier
+		$length	  = 0x00000; // Bytes to follow
 
 		// Strip URL type and change Unix dir separator to Dos style (if needed)
 		//
@@ -1105,10 +1105,10 @@ 
 		//   otherwise, absolute
 
 		$absolute = 0x00; // relative path
-		if ( preg_match('/^[A-Z]:/', $url) ) {
+		if (preg_match('/^[A-Z]:/', $url)) {
 			$absolute = 0x02; // absolute path on Windows, e.g. C:\...
 		}
-		$link_type			   = 0x01 | $absolute;
+		$link_type = 0x01 | $absolute;
 
 		// Determine if the link contains a sheet reference and change some of the
 		// parameters accordingly.
@@ -1120,39 +1120,39 @@ 
 
 
 		// Pack the link type
-		$link_type   = pack("V", $link_type);
+		$link_type = pack("V", $link_type);
 
 		// Calculate the up-level dir count e.g.. (..\..\..\ == 3)
 		$up_count	= preg_match_all("/\.\.\\\/", $dir_long, $useless);
 		$up_count	= pack("v", $up_count);
 
 		// Store the short dos dir name (null terminated)
-		$dir_short   = preg_replace("/\.\.\\\/", '', $dir_long) . "\0";
+		$dir_short   = preg_replace("/\.\.\\\/", '', $dir_long)."\0";
 
 		// Store the long dir name as a wchar string (non-null terminated)
-		$dir_long	   = $dir_long . "\0";
+		$dir_long	   = $dir_long."\0";
 
 		// Pack the lengths of the dir strings
-		$dir_short_len = pack("V", strlen($dir_short)	  );
-		$dir_long_len  = pack("V", strlen($dir_long)	   );
-		$stream_len	= pack("V", 0);//strlen($dir_long) + 0x06);
+		$dir_short_len = pack("V", strlen($dir_short));
+		$dir_long_len  = pack("V", strlen($dir_long));
+		$stream_len = pack("V", 0); //strlen($dir_long) + 0x06);
 
 		// Pack the undocumented parts of the hyperlink stream
-		$unknown1 = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000'	   );
-		$unknown2 = pack("H*",'0303000000000000C000000000000046'			   );
-		$unknown3 = pack("H*",'FFFFADDE000000000000000000000000000000000000000');
-		$unknown4 = pack("v",  0x03											);
+		$unknown1 = pack("H*", 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
+		$unknown2 = pack("H*", '0303000000000000C000000000000046');
+		$unknown3 = pack("H*", 'FFFFADDE000000000000000000000000000000000000000');
+		$unknown4 = pack("v", 0x03);
 
 		// Pack the main data stream
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2) .
-						  $unknown1	 .
-						  $link_type	.
-						  $unknown2	 .
-						  $up_count	 .
+		$data = pack("vvvv", $row1, $row2, $col1, $col2).
+						  $unknown1.
+						  $link_type.
+						  $unknown2.
+						  $up_count.
 						  $dir_short_len.
-						  $dir_short	.
-						  $unknown3	 .
-						  $stream_len   ;/*.
+						  $dir_short.
+						  $unknown3.
+						  $stream_len; /*.
 						  $dir_long_len .
 						  $unknown4	 .
 						  $dir_long	 .
@@ -1164,7 +1164,7 @@ 
 		$header   = pack("vv", $record, $length);
 
 		// Write the packed data
-		$this->_append($header. $data);
+		$this->_append($header.$data);
 		return 0;
 	}
 
@@ -1180,25 +1180,25 @@ 
 	 */
 	private function _writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
 	{
-		$record	  = 0x0208;			   // Record identifier
-		$length	  = 0x0010;			   // Number of bytes to follow
+		$record	  = 0x0208; // Record identifier
+		$length	  = 0x0010; // Number of bytes to follow
 
-		$colMic	  = 0x0000;			   // First defined column
-		$colMac	  = 0x0000;			   // Last defined column
-		$irwMac	  = 0x0000;			   // Used by Excel to optimise loading
-		$reserved	= 0x0000;			   // Reserved
-		$grbit	   = 0x0000;			   // Option flags
-		$ixfe		= $xfIndex;
+		$colMic	  = 0x0000; // First defined column
+		$colMac	  = 0x0000; // Last defined column
+		$irwMac	  = 0x0000; // Used by Excel to optimise loading
+		$reserved	= 0x0000; // Reserved
+		$grbit	   = 0x0000; // Option flags
+		$ixfe = $xfIndex;
 
-		if ( $height < 0 ){
+		if ($height < 0) {
 			$height = null;
 		}
 
 		// Use _writeRow($row, null, $XF) to set XF format without setting height
 		if ($height != null) {
-			$miyRw = $height * 20;  // row height
+			$miyRw = $height * 20; // row height
 		} else {
-			$miyRw = 0xff;		  // default row height is 256
+			$miyRw = 0xff; // default row height is 256
 		}
 
 		// Set the options flags. fUnsynced is used to show that the font and row
@@ -1219,9 +1219,9 @@ 
 		}
 		$grbit |= 0x0100;
 
-		$header   = pack("vv",	   $record, $length);
-		$data	 = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
-									 $irwMac,$reserved, $grbit, $ixfe);
+		$header = pack("vv", $record, $length);
+		$data = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
+									 $irwMac, $reserved, $grbit, $ixfe);
 		$this->_append($header.$data);
 	}
 
@@ -1250,47 +1250,47 @@ 
 	 */
 	private function _writeWindow2()
 	{
-		$record		 = 0x023E;	 // Record identifier
+		$record		 = 0x023E; // Record identifier
 		$length		 = 0x0012;
 
-		$grbit		  = 0x00B6;	 // Option flags
-		$rwTop		  = 0x0000;	 // Top row visible in window
-		$colLeft		= 0x0000;	 // Leftmost column visible in window
+		$grbit		  = 0x00B6; // Option flags
+		$rwTop		  = 0x0000; // Top row visible in window
+		$colLeft		= 0x0000; // Leftmost column visible in window
 
 
 		// The options flags that comprise $grbit
-		$fDspFmla	   = 0;					 // 0 - bit
+		$fDspFmla	   = 0; // 0 - bit
 		$fDspGrid	   = $this->_phpSheet->getShowGridlines() ? 1 : 0; // 1
 		$fDspRwCol	  = $this->_phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
-		$fFrozen		= $this->_phpSheet->getFreezePane() ? 1 : 0;		// 3
-		$fDspZeros	  = 1;					 // 4
-		$fDefaultHdr	= 1;					 // 5
+		$fFrozen		= $this->_phpSheet->getFreezePane() ? 1 : 0; // 3
+		$fDspZeros	  = 1; // 4
+		$fDefaultHdr	= 1; // 5
 		$fArabic		= $this->_phpSheet->getRightToLeft() ? 1 : 0; // 6
-		$fDspGuts	   = $this->_outline_on;	// 7
-		$fFrozenNoSplit = 0;					 // 0 - bit
+		$fDspGuts	   = $this->_outline_on; // 7
+		$fFrozenNoSplit = 0; // 0 - bit
 		// no support in PHPExcel for selected sheet, therefore sheet is only selected if it is the active sheet
 		$fSelected	  = ($this->_phpSheet === $this->_phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
-		$fPaged		 = 1;					 // 2
+		$fPaged		 = 1; // 2
 
 		$grbit			 = $fDspFmla;
-		$grbit			|= $fDspGrid	   << 1;
-		$grbit			|= $fDspRwCol	  << 2;
-		$grbit			|= $fFrozen		<< 3;
-		$grbit			|= $fDspZeros	  << 4;
-		$grbit			|= $fDefaultHdr	<< 5;
-		$grbit			|= $fArabic		<< 6;
-		$grbit			|= $fDspGuts	   << 7;
+		$grbit			|= $fDspGrid << 1;
+		$grbit			|= $fDspRwCol << 2;
+		$grbit			|= $fFrozen << 3;
+		$grbit			|= $fDspZeros << 4;
+		$grbit			|= $fDefaultHdr << 5;
+		$grbit			|= $fArabic << 6;
+		$grbit			|= $fDspGuts << 7;
 		$grbit			|= $fFrozenNoSplit << 8;
-		$grbit			|= $fSelected	  << 9;
-		$grbit			|= $fPaged		 << 10;
+		$grbit			|= $fSelected << 9;
+		$grbit			|= $fPaged << 10;
 
-		$header  = pack("vv",   $record, $length);
-		$data	= pack("vvv", $grbit, $rwTop, $colLeft);
+		$header = pack("vv", $record, $length);
+		$data = pack("vvv", $grbit, $rwTop, $colLeft);
 
 		// FIXME !!!
-		$rgbHdr	   = 0x0040; // Row/column heading and gridline color index
+		$rgbHdr = 0x0040; // Row/column heading and gridline color index
 		$zoom_factor_page_break = 0x0000;
-		$zoom_factor_normal	 = 0x0000;
+		$zoom_factor_normal = 0x0000;
 		$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
 
 		$this->_append($header.$data);
@@ -1310,12 +1310,12 @@ 
 		// convert to twips
 		$defaultRowHeight = (int) 20 * $defaultRowHeight;
 
-		$record   = 0x0225;	  // Record identifier
-		$length   = 0x0004;	  // Number of bytes to follow
+		$record   = 0x0225; // Record identifier
+		$length   = 0x0004; // Number of bytes to follow
 
 		$header   = pack("vv", $record, $length);
-		$data	 = pack("vv",  1, $defaultRowHeight);
-		$this->_append($header . $data);
+		$data = pack("vv", 1, $defaultRowHeight);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1325,12 +1325,12 @@ 
 	{
 		$defaultColWidth = 8;
 
-		$record   = 0x0055;	  // Record identifier
-		$length   = 0x0002;	  // Number of bytes to follow
+		$record   = 0x0055; // Record identifier
+		$length   = 0x0002; // Number of bytes to follow
 
 		$header = pack("vv", $record, $length);
 		$data = pack("v", $defaultColWidth);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1375,19 +1375,19 @@ 
 		} else {
 			$level = 0;
 		}
-		$record   = 0x007D;		  // Record identifier
-		$length   = 0x000C;		  // Number of bytes to follow
+		$record   = 0x007D; // Record identifier
+		$length   = 0x000C; // Number of bytes to follow
 
-		$coldx   *= 256;			 // Convert to units of 1/256 of a char
+		$coldx   *= 256; // Convert to units of 1/256 of a char
 
 		$ixfe	 = $xfIndex;
-		$reserved = 0x0000;			// Reserved
+		$reserved = 0x0000; // Reserved
 
 		$level = max(0, min($level, 7));
 		$grbit |= $level << 8;
 
-		$header   = pack("vv",	 $record, $length);
-		$data	 = pack("vvvvvv", $colFirst, $colLast, $coldx,
+		$header = pack("vv", $record, $length);
+		$data = pack("vvvvvv", $colFirst, $colLast, $coldx,
 								   $ixfe, $grbit, $reserved);
 		$this->_append($header.$data);
 	}
@@ -1418,25 +1418,25 @@ 
 
 		// make sure we are not out of bounds
 		$colFirst = min($colFirst, 255);
-		$colLast  = min($colLast,  255);
+		$colLast  = min($colLast, 255);
 
 		$rwFirst = min($rwFirst, 65535);
-		$rwLast  = min($rwLast,  65535);
+		$rwLast  = min($rwLast, 65535);
 
-		$record   = 0x001D;				  // Record identifier
-		$length   = 0x000F;				  // Number of bytes to follow
+		$record   = 0x001D; // Record identifier
+		$length   = 0x000F; // Number of bytes to follow
 
-		$pnn	  = $this->_active_pane;	 // Pane position
-		$rwAct	= $rwFirst;				// Active row
-		$colAct   = $colFirst;			   // Active column
-		$irefAct  = 0;					   // Active cell ref
-		$cref	 = 1;					   // Number of refs
+		$pnn	  = $this->_active_pane; // Pane position
+		$rwAct	= $rwFirst; // Active row
+		$colAct   = $colFirst; // Active column
+		$irefAct  = 0; // Active cell ref
+		$cref	 = 1; // Number of refs
 
-		if (!isset($rwLast)) {
-			$rwLast   = $rwFirst;	   // Last  row in reference
+		if ( ! isset($rwLast)) {
+			$rwLast   = $rwFirst; // Last  row in reference
 		}
-		if (!isset($colLast)) {
-			$colLast  = $colFirst;	  // Last  col in reference
+		if ( ! isset($colLast)) {
+			$colLast  = $colFirst; // Last  col in reference
 		}
 
 		// Swap last row/col for first row/col as necessary
@@ -1448,12 +1448,12 @@ 
 			list($colFirst, $colLast) = array($colLast, $colFirst);
 		}
 
-		$header   = pack("vv",		 $record, $length);
-		$data	 = pack("CvvvvvvCC",  $pnn, $rwAct, $colAct,
+		$header = pack("vv", $record, $length);
+		$data = pack("CvvvvvvCC", $pnn, $rwAct, $colAct,
 									   $irefAct, $cref,
 									   $rwFirst, $rwLast,
 									   $colFirst, $colLast);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1498,10 +1498,10 @@ 
 
 			// flush record if we have reached limit for number of merged cells, or reached final merged cell
 			if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
-				$recordData = pack('v', $j) . $recordData;
+				$recordData = pack('v', $j).$recordData;
 				$length = strlen($recordData);
 				$header = pack('vv', $record, $length);
-				$this->_append($header . $recordData);
+				$this->_append($header.$recordData);
 
 				// initialize for next record, if any
 				$recordData = '';
@@ -1515,7 +1515,7 @@ 
 	 */
 	private function _writeSheetLayout()
 	{
-		if (!$this->_phpSheet->isTabColorSet()) {
+		if ( ! $this->_phpSheet->isTabColorSet()) {
 			return;
 		}
 
@@ -1534,7 +1534,7 @@ 
 
 		$record = 0x0862; // Record identifier
 		$header = pack('vv', $record, $length);
-		$this->_append($header . $recordData);
+		$this->_append($header.$recordData);
 	}
 
 	/**
@@ -1546,21 +1546,21 @@ 
 		$record = 0x0867;
 
 		// prepare options
-		$options  =   (int) !$this->_phpSheet->getProtection()->getObjects()
-					| (int) !$this->_phpSheet->getProtection()->getScenarios()           << 1
-					| (int) !$this->_phpSheet->getProtection()->getFormatCells()         << 2
-					| (int) !$this->_phpSheet->getProtection()->getFormatColumns()       << 3
-					| (int) !$this->_phpSheet->getProtection()->getFormatRows()          << 4
-					| (int) !$this->_phpSheet->getProtection()->getInsertColumns()       << 5
-					| (int) !$this->_phpSheet->getProtection()->getInsertRows()          << 6
-					| (int) !$this->_phpSheet->getProtection()->getInsertHyperlinks()    << 7
-					| (int) !$this->_phpSheet->getProtection()->getDeleteColumns()       << 8
-					| (int) !$this->_phpSheet->getProtection()->getDeleteRows()          << 9
-					| (int) !$this->_phpSheet->getProtection()->getSelectLockedCells()   << 10
-					| (int) !$this->_phpSheet->getProtection()->getSort()                << 11
-					| (int) !$this->_phpSheet->getProtection()->getAutoFilter()          << 12
-					| (int) !$this->_phpSheet->getProtection()->getPivotTables()         << 13
-					| (int) !$this->_phpSheet->getProtection()->getSelectUnlockedCells() << 14 ;
+		$options = (int) ! $this->_phpSheet->getProtection()->getObjects()
+					| (int) ! $this->_phpSheet->getProtection()->getScenarios() << 1
+					| (int) ! $this->_phpSheet->getProtection()->getFormatCells() << 2
+					| (int) ! $this->_phpSheet->getProtection()->getFormatColumns() << 3
+					| (int) ! $this->_phpSheet->getProtection()->getFormatRows() << 4
+					| (int) ! $this->_phpSheet->getProtection()->getInsertColumns() << 5
+					| (int) ! $this->_phpSheet->getProtection()->getInsertRows() << 6
+					| (int) ! $this->_phpSheet->getProtection()->getInsertHyperlinks() << 7
+					| (int) ! $this->_phpSheet->getProtection()->getDeleteColumns() << 8
+					| (int) ! $this->_phpSheet->getProtection()->getDeleteRows() << 9
+					| (int) ! $this->_phpSheet->getProtection()->getSelectLockedCells() << 10
+					| (int) ! $this->_phpSheet->getProtection()->getSort() << 11
+					| (int) ! $this->_phpSheet->getProtection()->getAutoFilter() << 12
+					| (int) ! $this->_phpSheet->getProtection()->getPivotTables() << 13
+					| (int) ! $this->_phpSheet->getProtection()->getSelectUnlockedCells() << 14;
 
 		// record data
 		$recordData = pack(
@@ -1578,7 +1578,7 @@ 
 		$length = strlen($recordData);
 		$header = pack('vv', $record, $length);
 
-		$this->_append($header . $recordData);
+		$this->_append($header.$recordData);
 	}
 
 	/**
@@ -1619,13 +1619,13 @@ 
 				hexdec($password)
 			);
 
-			$recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
+			$recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p'.md5($recordData));
 
 			$length = strlen($recordData);
 
-			$record = 0x0868;		// Record identifier
+			$record = 0x0868; // Record identifier
 			$header = pack("vv", $record, $length);
-			$this->_append($header . $recordData);
+			$this->_append($header.$recordData);
 		}
 	}
 
@@ -1643,12 +1643,12 @@ 
 	 */
 	private function _writeExterncount($count)
 	{
-		$record = 0x0016;		  // Record identifier
-		$length = 0x0002;		  // Number of bytes to follow
+		$record = 0x0016; // Record identifier
+		$length = 0x0002; // Number of bytes to follow
 
 		$header = pack("vv", $record, $length);
-		$data   = pack("v",  $count);
-		$this->_append($header . $data);
+		$data   = pack("v", $count);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1661,25 +1661,25 @@ 
 	 */
 	private function _writeExternsheet($sheetname)
 	{
-		$record	= 0x0017;		 // Record identifier
+		$record = 0x0017; // Record identifier
 
 		// References to the current sheet are encoded differently to references to
 		// external sheets.
 		//
 		if ($this->_phpSheet->getTitle() == $sheetname) {
 			$sheetname = '';
-			$length	= 0x02;  // The following 2 bytes
-			$cch	   = 1;	 // The following byte
-			$rgch	  = 0x02;  // Self reference
+			$length	= 0x02; // The following 2 bytes
+			$cch	   = 1; // The following byte
+			$rgch	  = 0x02; // Self reference
 		} else {
 			$length	= 0x02 + strlen($sheetname);
 			$cch	   = strlen($sheetname);
-			$rgch	  = 0x03;  // Reference to a sheet in the current workbook
+			$rgch	  = 0x03; // Reference to a sheet in the current workbook
 		}
 
-		$header = pack("vv",  $record, $length);
+		$header = pack("vv", $record, $length);
 		$data   = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
+		$this->_append($header.$data.$sheetname);
 	}
 
 	/**
@@ -1709,24 +1709,24 @@ 
 		} else {
 			$pnnAct = null;
 		}
-		$record  = 0x0041;	   // Record identifier
-		$length  = 0x000A;	   // Number of bytes to follow
+		$record  = 0x0041; // Record identifier
+		$length  = 0x000A; // Number of bytes to follow
 
 		// Code specific to frozen or thawed panes.
 		if ($this->_phpSheet->getFreezePane()) {
 			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
+			if ( ! isset($rwTop)) {
 				$rwTop   = $y;
 			}
-			if (!isset($colLeft)) {
+			if ( ! isset($colLeft)) {
 				$colLeft = $x;
 			}
 		} else {
 			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
+			if ( ! isset($rwTop)) {
 				$rwTop   = 0;
 			}
-			if (!isset($colLeft)) {
+			if ( ! isset($colLeft)) {
 				$colLeft = 0;
 			}
 
@@ -1735,15 +1735,15 @@ 
 			// The default column width is 8.43
 			// The following slope and intersection values were interpolated.
 			//
-			$y = 20*$y + 255;
-			$x = 113.879*$x + 390;
+			$y = 20 * $y + 255;
+			$x = 113.879 * $x + 390;
 		}
 
 
 		// Determine which pane should be active. There is also the undocumented
 		// option to override this should it be necessary: may be removed later.
 		//
-		if (!isset($pnnAct)) {
+		if ( ! isset($pnnAct)) {
 			if ($x != 0 && $y != 0) {
 				$pnnAct = 0; // Bottom right
 			}
@@ -1760,9 +1760,9 @@ 
 
 		$this->_active_pane = $pnnAct; // Used in _writeSelection
 
-		$header	 = pack("vv",	$record, $length);
+		$header	 = pack("vv", $record, $length);
 		$data	   = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1770,47 +1770,47 @@ 
 	 */
 	private function _writeSetup()
 	{
-		$record	   = 0x00A1;				  // Record identifier
-		$length	   = 0x0022;				  // Number of bytes to follow
+		$record	   = 0x00A1; // Record identifier
+		$length	   = 0x0022; // Number of bytes to follow
 
-		$iPaperSize   = $this->_phpSheet->getPageSetup()->getPaperSize();	// Paper size
+		$iPaperSize = $this->_phpSheet->getPageSetup()->getPaperSize(); // Paper size
 
 		$iScale = $this->_phpSheet->getPageSetup()->getScale() ?
-			$this->_phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
+			$this->_phpSheet->getPageSetup()->getScale() : 100; // Print scaling factor
 
-		$iPageStart   = 0x01;				 // Starting page number
-		$iFitWidth	= (int) $this->_phpSheet->getPageSetup()->getFitToWidth();	// Fit to number of pages wide
-		$iFitHeight	= (int) $this->_phpSheet->getPageSetup()->getFitToHeight();	// Fit to number of pages high
-		$grbit		= 0x00;				 // Option flags
-		$iRes		 = 0x0258;			   // Print resolution
-		$iVRes		= 0x0258;			   // Vertical print resolution
+		$iPageStart = 0x01; // Starting page number
+		$iFitWidth = (int) $this->_phpSheet->getPageSetup()->getFitToWidth(); // Fit to number of pages wide
+		$iFitHeight = (int) $this->_phpSheet->getPageSetup()->getFitToHeight(); // Fit to number of pages high
+		$grbit		= 0x00; // Option flags
+		$iRes		 = 0x0258; // Print resolution
+		$iVRes		= 0x0258; // Vertical print resolution
 
-		$numHdr	   = $this->_phpSheet->getPageMargins()->getHeader();  // Header Margin
+		$numHdr	   = $this->_phpSheet->getPageMargins()->getHeader(); // Header Margin
 
-		$numFtr	   = $this->_phpSheet->getPageMargins()->getFooter();   // Footer Margin
-		$iCopies	  = 0x01;				 // Number of copies
+		$numFtr	   = $this->_phpSheet->getPageMargins()->getFooter(); // Footer Margin
+		$iCopies	  = 0x01; // Number of copies
 
-		$fLeftToRight = 0x0;					 // Print over then down
+		$fLeftToRight = 0x0; // Print over then down
 
 		// Page orientation
 		$fLandscape = ($this->_phpSheet->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
 			0x0 : 0x1;
 
-		$fNoPls	   = 0x0;					 // Setup not read from printer
-		$fNoColor	 = 0x0;					 // Print black and white
-		$fDraft	   = 0x0;					 // Print draft quality
-		$fNotes	   = 0x0;					 // Print notes
-		$fNoOrient	= 0x0;					 // Orientation not set
-		$fUsePage	 = 0x0;					 // Use custom starting page
+		$fNoPls	   = 0x0; // Setup not read from printer
+		$fNoColor	 = 0x0; // Print black and white
+		$fDraft	   = 0x0; // Print draft quality
+		$fNotes	   = 0x0; // Print notes
+		$fNoOrient	= 0x0; // Orientation not set
+		$fUsePage	 = 0x0; // Use custom starting page
 
 		$grbit		   = $fLeftToRight;
-		$grbit		  |= $fLandscape	<< 1;
-		$grbit		  |= $fNoPls		<< 2;
-		$grbit		  |= $fNoColor	  << 3;
-		$grbit		  |= $fDraft		<< 4;
-		$grbit		  |= $fNotes		<< 5;
-		$grbit		  |= $fNoOrient	 << 6;
-		$grbit		  |= $fUsePage	  << 7;
+		$grbit		  |= $fLandscape << 1;
+		$grbit		  |= $fNoPls << 2;
+		$grbit		  |= $fNoColor << 3;
+		$grbit		  |= $fDraft << 4;
+		$grbit		  |= $fNotes << 5;
+		$grbit		  |= $fNoOrient << 6;
+		$grbit		  |= $fUsePage << 7;
 
 		$numHdr = pack("d", $numHdr);
 		$numFtr = pack("d", $numFtr);
@@ -1830,7 +1830,7 @@ 
 								   $iVRes);
 		$data2  = $numHdr.$numFtr;
 		$data3  = pack("v", $iCopies);
-		$this->_append($header . $data1 . $data2 . $data3);
+		$this->_append($header.$data1.$data2.$data3);
 	}
 
 	/**
@@ -1838,7 +1838,7 @@ 
 	 */
 	private function _writeHeader()
 	{
-		$record  = 0x0014;			   // Record identifier
+		$record = 0x0014; // Record identifier
 
 		/* removing for now
 		// need to fix character count (multibyte!)
@@ -1852,9 +1852,9 @@ 
 		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
 		$length = strlen($recordData);
 
-		$header   = pack("vv", $record, $length);
+		$header = pack("vv", $record, $length);
 
-		$this->_append($header . $recordData);
+		$this->_append($header.$recordData);
 	}
 
 	/**
@@ -1862,7 +1862,7 @@ 
 	 */
 	private function _writeFooter()
 	{
-		$record  = 0x0015;			   // Record identifier
+		$record = 0x0015; // Record identifier
 
 		/* removing for now
 		// need to fix character count (multibyte!)
@@ -1878,7 +1878,7 @@ 
 
 		$header	= pack("vv", $record, $length);
 
-		$this->_append($header . $recordData);
+		$this->_append($header.$recordData);
 	}
 
 	/**
@@ -1888,13 +1888,13 @@ 
 	 */
 	private function _writeHcenter()
 	{
-		$record   = 0x0083;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
+		$record   = 0x0083; // Record identifier
+		$length   = 0x0002; // Bytes to follow
 
-		$fHCenter = $this->_phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;	 // Horizontal centering
+		$fHCenter = $this->_phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0; // Horizontal centering
 
 		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fHCenter);
+		$data	  = pack("v", $fHCenter);
 
 		$this->_append($header.$data);
 	}
@@ -1904,14 +1904,14 @@ 
 	 */
 	private function _writeVcenter()
 	{
-		$record   = 0x0084;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
+		$record   = 0x0084; // Record identifier
+		$length   = 0x0002; // Bytes to follow
 
-		$fVCenter = $this->_phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;	 // Horizontal centering
+		$fVCenter = $this->_phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0; // Horizontal centering
 
 		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fVCenter);
-		$this->_append($header . $data);
+		$data	  = pack("v", $fVCenter);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1919,18 +1919,18 @@ 
 	 */
 	private function _writeMarginLeft()
 	{
-		$record  = 0x0026;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
+		$record  = 0x0026; // Record identifier
+		$length  = 0x0008; // Bytes to follow
 
-		$margin  = $this->_phpSheet->getPageMargins()->getLeft();	 // Margin in inches
+		$margin  = $this->_phpSheet->getPageMargins()->getLeft(); // Margin in inches
 
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
+		$header	= pack("vv", $record, $length);
+		$data	  = pack("d", $margin);
 		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1938,18 +1938,18 @@ 
 	 */
 	private function _writeMarginRight()
 	{
-		$record  = 0x0027;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
+		$record  = 0x0027; // Record identifier
+		$length  = 0x0008; // Bytes to follow
 
-		$margin  = $this->_phpSheet->getPageMargins()->getRight();	 // Margin in inches
+		$margin  = $this->_phpSheet->getPageMargins()->getRight(); // Margin in inches
 
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
+		$header	= pack("vv", $record, $length);
+		$data	  = pack("d", $margin);
 		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1957,18 +1957,18 @@ 
 	 */
 	private function _writeMarginTop()
 	{
-		$record  = 0x0028;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
+		$record  = 0x0028; // Record identifier
+		$length  = 0x0008; // Bytes to follow
 
-		$margin  = $this->_phpSheet->getPageMargins()->getTop();	 // Margin in inches
+		$margin  = $this->_phpSheet->getPageMargins()->getTop(); // Margin in inches
 
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
+		$header	= pack("vv", $record, $length);
+		$data	  = pack("d", $margin);
 		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1976,18 +1976,18 @@ 
 	 */
 	private function _writeMarginBottom()
 	{
-		$record  = 0x0029;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
+		$record  = 0x0029; // Record identifier
+		$length  = 0x0008; // Bytes to follow
 
-		$margin  = $this->_phpSheet->getPageMargins()->getBottom();	 // Margin in inches
+		$margin  = $this->_phpSheet->getPageMargins()->getBottom(); // Margin in inches
 
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
+		$header	= pack("vv", $record, $length);
+		$data	  = pack("d", $margin);
 		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1995,14 +1995,14 @@ 
 	 */
 	private function _writePrintHeaders()
 	{
-		$record	  = 0x002a;				   // Record identifier
-		$length	  = 0x0002;				   // Bytes to follow
+		$record	  = 0x002a; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 
-		$fPrintRwCol = $this->_print_headers;	 // Boolean flag
+		$fPrintRwCol = $this->_print_headers; // Boolean flag
 
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v", $fPrintRwCol);
-		$this->_append($header . $data);
+		$header = pack("vv", $record, $length);
+		$data = pack("v", $fPrintRwCol);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2011,14 +2011,14 @@ 
 	 */
 	private function _writePrintGridlines()
 	{
-		$record	  = 0x002b;					// Record identifier
-		$length	  = 0x0002;					// Bytes to follow
+		$record	  = 0x002b; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 
-		$fPrintGrid  = $this->_phpSheet->getPrintGridlines() ? 1 : 0;	// Boolean flag
+		$fPrintGrid = $this->_phpSheet->getPrintGridlines() ? 1 : 0; // Boolean flag
 
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v", $fPrintGrid);
-		$this->_append($header . $data);
+		$header = pack("vv", $record, $length);
+		$data = pack("v", $fPrintGrid);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2027,14 +2027,14 @@ 
 	 */
 	private function _writeGridset()
 	{
-		$record	  = 0x0082;						// Record identifier
-		$length	  = 0x0002;						// Bytes to follow
+		$record	  = 0x0082; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 
-		$fGridSet	= !$this->_phpSheet->getPrintGridlines();	 // Boolean flag
+		$fGridSet	= ! $this->_phpSheet->getPrintGridlines(); // Boolean flag
 
-		$header	  = pack("vv",  $record, $length);
-		$data		= pack("v",   $fGridSet);
-		$this->_append($header . $data);
+		$header	  = pack("vv", $record, $length);
+		$data = pack("v", $fGridSet);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2046,11 +2046,11 @@ 
 	 */
 	private  function _writeGuts()
 	{
-		$record	  = 0x0080;   // Record identifier
-		$length	  = 0x0008;   // Bytes to follow
+		$record	  = 0x0080; // Record identifier
+		$length	  = 0x0008; // Bytes to follow
 
-		$dxRwGut	 = 0x0000;   // Size of row gutter
-		$dxColGut	= 0x0000;   // Size of col gutter
+		$dxRwGut	 = 0x0000; // Size of row gutter
+		$dxColGut	= 0x0000; // Size of col gutter
 
 		// determine maximum row outline level
 		$maxRowOutlineLevel = 0;
@@ -2058,7 +2058,7 @@ 
 			$maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
 		}
 
-		$col_level   = 0;
+		$col_level = 0;
 
 		// Calculate the maximum column outline level. The equivalent calculation
 		// for the row outline level is carried out in _writeRow().
@@ -2078,8 +2078,8 @@ 
 			++$col_level;
 		}
 
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
+		$header = pack("vv", $record, $length);
+		$data = pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
 
 		$this->_append($header.$data);
 	}
@@ -2090,15 +2090,15 @@ 
 	 */
 	private function _writeWsbool()
 	{
-		$record	  = 0x0081;   // Record identifier
-		$length	  = 0x0002;   // Bytes to follow
+		$record	  = 0x0081; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 		$grbit	   = 0x0000;
 
 		// The only option that is of interest is the flag for fit to page. So we
 		// set all the options in one go.
 		//
 		// Set the option flags
-		$grbit |= 0x0001;						   // Auto page breaks visible
+		$grbit |= 0x0001; // Auto page breaks visible
 		if ($this->_outline_style) {
 			$grbit |= 0x0020; // Auto outline styles
 		}
@@ -2115,9 +2115,9 @@ 
 			$grbit |= 0x0400; // Outline symbols displayed
 		}
 
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $grbit);
-		$this->_append($header . $data);
+		$header = pack("vv", $record, $length);
+		$data = pack("v", $grbit);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2153,7 +2153,7 @@ 
 		}
 
 		//horizontal page breaks
-		if (!empty($hbreaks)) {
+		if ( ! empty($hbreaks)) {
 
 			// Sort and filter array of page breaks
 			sort($hbreaks, SORT_NUMERIC);
@@ -2161,23 +2161,23 @@ 
 				array_shift($hbreaks);
 			}
 
-			$record  = 0x001b;			   // Record identifier
-			$cbrk	= count($hbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
+			$record  = 0x001b; // Record identifier
+			$cbrk = count($hbreaks); // Number of page breaks
+			$length  = 2 + 6 * $cbrk; // Bytes to follow
 
 			$header  = pack("vv", $record, $length);
-			$data	= pack("v",  $cbrk);
+			$data = pack("v", $cbrk);
 
 			// Append each page break
 			foreach ($hbreaks as $hbreak) {
 				$data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
 			}
 
-			$this->_append($header . $data);
+			$this->_append($header.$data);
 		}
 
 		// vertical page breaks
-		if (!empty($vbreaks)) {
+		if ( ! empty($vbreaks)) {
 
 			// 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
 			// It is slightly higher in Excel 97/200, approx. 1026
@@ -2189,19 +2189,19 @@ 
 				array_shift($vbreaks);
 			}
 
-			$record  = 0x001a;			   // Record identifier
-			$cbrk	= count($vbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
+			$record  = 0x001a; // Record identifier
+			$cbrk = count($vbreaks); // Number of page breaks
+			$length  = 2 + 6 * $cbrk; // Bytes to follow
 
-			$header  = pack("vv",  $record, $length);
-			$data	= pack("v",   $cbrk);
+			$header  = pack("vv", $record, $length);
+			$data = pack("v", $cbrk);
 
 			// Append each page break
 			foreach ($vbreaks as $vbreak) {
 				$data .= pack("vvv", $vbreak, 0x0000, 0xffff);
 			}
 
-			$this->_append($header . $data);
+			$this->_append($header.$data);
 		}
 	}
 
@@ -2211,17 +2211,17 @@ 
 	private function _writeProtect()
 	{
 		// Exit unless sheet protection has been specified
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
+		if ( ! $this->_phpSheet->getProtection()->getSheet()) {
 			return;
 		}
 
-		$record	  = 0x0012;			 // Record identifier
-		$length	  = 0x0002;			 // Bytes to follow
+		$record	  = 0x0012; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 
-		$fLock	   = 1;	// Worksheet is protected
+		$fLock	   = 1; // Worksheet is protected
 
 		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $fLock);
+		$data = pack("v", $fLock);
 
 		$this->_append($header.$data);
 	}
@@ -2232,12 +2232,12 @@ 
 	private function _writeScenProtect()
 	{
 		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
+		if ( ! $this->_phpSheet->getProtection()->getSheet()) {
 			return;
 		}
 
 		// Exit if scenarios are not protected
-		if (!$this->_phpSheet->getProtection()->getScenarios()) {
+		if ( ! $this->_phpSheet->getProtection()->getScenarios()) {
 			return;
 		}
 
@@ -2247,7 +2247,7 @@ 
 		$header = pack('vv', $record, $length);
 		$data = pack('v', 1);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2256,12 +2256,12 @@ 
 	private function _writeObjectProtect()
 	{
 		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
+		if ( ! $this->_phpSheet->getProtection()->getSheet()) {
 			return;
 		}
 
 		// Exit if objects are not protected
-		if (!$this->_phpSheet->getProtection()->getObjects()) {
+		if ( ! $this->_phpSheet->getProtection()->getObjects()) {
 			return;
 		}
 
@@ -2271,7 +2271,7 @@ 
 		$header = pack('vv', $record, $length);
 		$data = pack('v', 1);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2280,19 +2280,19 @@ 
 	private function _writePassword()
 	{
 		// Exit unless sheet protection and password have been specified
-		if (!$this->_phpSheet->getProtection()->getSheet() || !$this->_phpSheet->getProtection()->getPassword()) {
+		if ( ! $this->_phpSheet->getProtection()->getSheet() || ! $this->_phpSheet->getProtection()->getPassword()) {
 			return;
 		}
 
-		$record	  = 0x0013;			   // Record identifier
-		$length	  = 0x0002;			   // Bytes to follow
+		$record	  = 0x0013; // Record identifier
+		$length	  = 0x0002; // Bytes to follow
 
-		$wPassword   = hexdec($this->_phpSheet->getProtection()->getPassword());	 // Encoded password
+		$wPassword = hexdec($this->_phpSheet->getProtection()->getPassword()); // Encoded password
 
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $wPassword);
+		$header = pack("vv", $record, $length);
+		$data = pack("v", $wPassword);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2326,7 +2326,7 @@ 
 		$env		 = 0x01;
 		$lcb		 = $size;
 
-		$header	  = pack("vvvvV", $record, $length, $cf, $env, $lcb);
+		$header = pack("vvvvV", $record, $length, $cf, $env, $lcb);
 		$this->_append($header.$data);
 	}
 
@@ -2384,8 +2384,8 @@ 
 	function _positionImage($col_start, $row_start, $x1, $y1, $width, $height)
 	{
 		// 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 >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
@@ -2395,8 +2395,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 >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
@@ -2416,21 +2416,21 @@ 
 		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
 			return;
 		}
-		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
+		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) == 0) {
 			return;
 		}
 		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) == 0) {
 			return;
 		}
-		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)   == 0) {
+		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) == 0) {
 			return;
 		}
 
 		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)   *  256;
-		$x2 = $width  / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)	 *  256; // Distance to bottom of object
+		$x1 = $x1 / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) * 1024;
+		$y1 = $y1 / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) * 256;
+		$x2 = $width / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+		$y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) * 256; // Distance to bottom of object
 
 		$this->_writeObjPicture($col_start, $x1,
 								 $row_start, $y1,
@@ -2451,39 +2451,39 @@ 
 	 * @param integer $rwB  Row containing bottom right corner of object
 	 * @param integer $dyB  Distance from bottom of cell
 	 */
-	private function _writeObjPicture($colL,$dxL,$rwT,$dyT,$colR,$dxR,$rwB,$dyB)
+	private function _writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB)
 	{
-		$record	  = 0x005d;   // Record identifier
-		$length	  = 0x003c;   // Bytes to follow
-
-		$cObj		= 0x0001;   // Count of objects in file (set to 1)
-		$OT		  = 0x0008;   // Object type. 8 = Picture
-		$id		  = 0x0001;   // Object ID
-		$grbit	   = 0x0614;   // Option flags
-
-		$cbMacro	 = 0x0000;   // Length of FMLA structure
-		$Reserved1   = 0x0000;   // Reserved
-		$Reserved2   = 0x0000;   // Reserved
-
-		$icvBack	 = 0x09;	 // Background colour
-		$icvFore	 = 0x09;	 // Foreground colour
-		$fls		 = 0x00;	 // Fill pattern
-		$fAuto	   = 0x00;	 // Automatic fill
-		$icv		 = 0x08;	 // Line colour
-		$lns		 = 0xff;	 // Line style
-		$lnw		 = 0x01;	 // Line weight
-		$fAutoB	  = 0x00;	 // Automatic border
-		$frs		 = 0x0000;   // Frame style
-		$cf		  = 0x0009;   // Image format, 9 = bitmap
-		$Reserved3   = 0x0000;   // Reserved
-		$cbPictFmla  = 0x0000;   // Length of FMLA structure
-		$Reserved4   = 0x0000;   // Reserved
-		$grbit2	  = 0x0001;   // Option flags
-		$Reserved5   = 0x0000;   // Reserved
+		$record	  = 0x005d; // Record identifier
+		$length	  = 0x003c; // Bytes to follow
+
+		$cObj		= 0x0001; // Count of objects in file (set to 1)
+		$OT		  = 0x0008; // Object type. 8 = Picture
+		$id		  = 0x0001; // Object ID
+		$grbit	   = 0x0614; // Option flags
+
+		$cbMacro	 = 0x0000; // Length of FMLA structure
+		$Reserved1   = 0x0000; // Reserved
+		$Reserved2   = 0x0000; // Reserved
+
+		$icvBack	 = 0x09; // Background colour
+		$icvFore	 = 0x09; // Foreground colour
+		$fls		 = 0x00; // Fill pattern
+		$fAuto	   = 0x00; // Automatic fill
+		$icv		 = 0x08; // Line colour
+		$lns		 = 0xff; // Line style
+		$lnw		 = 0x01; // Line weight
+		$fAutoB = 0x00; // Automatic border
+		$frs		 = 0x0000; // Frame style
+		$cf		  = 0x0009; // Image format, 9 = bitmap
+		$Reserved3   = 0x0000; // Reserved
+		$cbPictFmla  = 0x0000; // Length of FMLA structure
+		$Reserved4   = 0x0000; // Reserved
+		$grbit2 = 0x0001; // Option flags
+		$Reserved5   = 0x0000; // Reserved
 
 
 		$header	  = pack("vv", $record, $length);
-		$data		= pack("V", $cObj);
+		$data = pack("V", $cObj);
 		$data	   .= pack("v", $OT);
 		$data	   .= pack("v", $id);
 		$data	   .= pack("v", $grbit);
@@ -2514,7 +2514,7 @@ 
 		$data	   .= pack("v", $grbit2);
 		$data	   .= pack("V", $Reserved5);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2529,16 +2529,16 @@ 
 		$height = imagesy($image);
 
 		$data = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		for ($j=$height; $j--; ) {
-			for ($i=0; $i < $width; ++$i) {
+		for ($j = $height; $j--;) {
+			for ($i = 0; $i < $width; ++$i) {
 				$color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
 				foreach (array("red", "green", "blue") as $key) {
 					$color[$key] = $color[$key] + round((255 - $color[$key]) * $color["alpha"] / 127);
 				}
-				$data .= chr($color["blue"]) . chr($color["green"]) . chr($color["red"]);
+				$data .= chr($color["blue"]).chr($color["green"]).chr($color["red"]);
 			}
-			if (3*$width % 4) {
-				$data .= str_repeat("\x00", 4 - 3*$width % 4);
+			if (3 * $width % 4) {
+				$data .= str_repeat("\x00", 4 - 3 * $width % 4);
 			}
 		}
 
@@ -2557,8 +2557,8 @@ 
 	function _processBitmap($bitmap)
 	{
 		// Open file.
-		$bmp_fd = @fopen($bitmap,"rb");
-		if (!$bmp_fd) {
+		$bmp_fd = @fopen($bitmap, "rb");
+		if ( ! $bmp_fd) {
 			throw new Exception("Couldn't import $bitmap");
 		}
 
@@ -2582,7 +2582,7 @@ 
 		// Read and remove the bitmap size. This is more reliable than reading
 		// the data size at offset 0x22.
 		//
-		$size_array   = unpack("Vsa", substr($data, 0, 4));
+		$size_array = unpack("Vsa", substr($data, 0, 4));
 		$size   = $size_array['sa'];
 		$data   = substr($data, 4);
 		$size  -= 0x36; // Subtract size of bitmap header.
@@ -2626,8 +2626,8 @@ 
 		$data = substr($data, 20);
 
 		// Add the BITMAPCOREHEADER data
-		$header  = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		$data	= $header . $data;
+		$header = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
+		$data = $header.$data;
 
 		return (array($width, $height, $size, $data));
 	}
@@ -2643,12 +2643,12 @@ 
 			return;
 		}
 
-		$record	  = 0x00A0;			   // Record identifier
-		$length	  = 0x0004;			   // Bytes to follow
+		$record	  = 0x00A0; // Record identifier
+		$length	  = 0x0004; // Bytes to follow
 
 		$header	  = pack("vv", $record, $length);
-		$data		= pack("vv", $this->_phpSheet->getSheetView()->getZoomScale(), 100);
-		$this->_append($header . $data);
+		$data = pack("vv", $this->_phpSheet->getSheetView()->getZoomScale(), 100);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -2689,16 +2689,16 @@ 
 			$nm = count($spOffsets) - 1; // number of shapes excluding first shape
 			for ($i = 1; $i <= $nm; ++$i) {
 				// MSODRAWING record
-				$record = 0x00EC;			// Record identifier
+				$record = 0x00EC; // Record identifier
 
 				// chunk of Escher stream for one shape
 
-				$dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
+				$dataChunk = substr($data, $spOffsets[$i - 1], $spOffsets[$i] - $spOffsets[$i - 1]);
 
 				$length = strlen($dataChunk);
 				$header = pack("vv", $record, $length);
 
-				$this->_append($header . $dataChunk);
+				$this->_append($header.$dataChunk);
 
 				// OBJ record
 				$record = 0x005D; // record identifier
@@ -2725,7 +2725,7 @@ 
 
 				$length = strlen($objData);
 				$header = pack('vv', $record, $length);
-				$this->_append($header . $objData);
+				$this->_append($header.$objData);
 			}
 		}
 	}
@@ -2739,24 +2739,24 @@ 
 		$dataValidationCollection = $this->_phpSheet->getDataValidationCollection();
 
 		// Write data validations?
-		if (!empty($dataValidationCollection)) {
+		if ( ! empty($dataValidationCollection)) {
 
 			// DATAVALIDATIONS record
-			$record = 0x01B2;	  // Record identifier
-			$length	  = 0x0012;	  // Bytes to follow
+			$record = 0x01B2; // Record identifier
+			$length	  = 0x0012; // Bytes to follow
 
-			$grbit  = 0x0000;	   // Prompt box at cell, no cached validity data at DV records
-			$horPos	  = 0x00000000;  // Horizontal position of prompt box, if fixed position
-			$verPos	  = 0x00000000;  // Vertical position of prompt box, if fixed position
-			$objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
+			$grbit  = 0x0000; // Prompt box at cell, no cached validity data at DV records
+			$horPos	  = 0x00000000; // Horizontal position of prompt box, if fixed position
+			$verPos	  = 0x00000000; // Vertical position of prompt box, if fixed position
+			$objId  = 0xFFFFFFFF; // Object identifier of drop down arrow object, or -1 if not visible
 
 			$header	  = pack('vv', $record, $length);
-			$data		= pack('vVVVV', $grbit, $horPos, $verPos, $objId,
+			$data = pack('vVVVV', $grbit, $horPos, $verPos, $objId,
 										 count($dataValidationCollection));
 			$this->_append($header.$data);
 
 			// DATAVALIDATION records
-			$record = 0x01BE;			  // Record identifier
+			$record = 0x01BE; // Record identifier
 
 			foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
 				// initialize record data
@@ -2768,36 +2768,36 @@ 
 				// data type
 				$type = $dataValidation->getType();
 				switch ($type) {
-					case PHPExcel_Cell_DataValidation::TYPE_NONE:		$type = 0x00;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_WHOLE:		$type = 0x01;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DECIMAL:	$type = 0x02;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_LIST:		$type = 0x03;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DATE:		$type = 0x04;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TIME:		$type = 0x05;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:	$type = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:		$type = 0x07;	break;
+					case PHPExcel_Cell_DataValidation::TYPE_NONE:		$type = 0x00; break;
+					case PHPExcel_Cell_DataValidation::TYPE_WHOLE:		$type = 0x01; break;
+					case PHPExcel_Cell_DataValidation::TYPE_DECIMAL:	$type = 0x02; break;
+					case PHPExcel_Cell_DataValidation::TYPE_LIST:		$type = 0x03; break;
+					case PHPExcel_Cell_DataValidation::TYPE_DATE:		$type = 0x04; break;
+					case PHPExcel_Cell_DataValidation::TYPE_TIME:		$type = 0x05; break;
+					case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:	$type = 0x06; break;
+					case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:		$type = 0x07; break;
 				}
 				$options |= $type << 0;
 
 				// error style
 				$errorStyle = $dataValidation->getType();
 				switch ($errorStyle) {
-					case PHPExcel_Cell_DataValidation::STYLE_STOP:			$errorStyle = 0x00;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_WARNING:		$errorStyle = 0x01;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:	$errorStyle = 0x02;		break;
+					case PHPExcel_Cell_DataValidation::STYLE_STOP:			$errorStyle = 0x00; break;
+					case PHPExcel_Cell_DataValidation::STYLE_WARNING:		$errorStyle = 0x01; break;
+					case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:	$errorStyle = 0x02; break;
 				}
 				$options |= $errorStyle << 4;
 
 				// explicit formula?
 				if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
-					$options |= 0x01				<< 7;
+					$options |= 0x01 << 7;
 				}
 
 				// empty cells allowed
 				$options |= $dataValidation->getAllowBlank() << 8;
 
 				// show drop down
-				$options |= (!$dataValidation->getShowDropDown()) << 9;
+				$options |= ( ! $dataValidation->getShowDropDown()) << 9;
 
 				// show input message
 				$options |= $dataValidation->getShowInputMessage() << 18;
@@ -2808,18 +2808,18 @@ 
 				// condition operator
 				$operator = $dataValidation->getOperator();
 				switch ($operator) {
-					case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02				;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07	;	break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06; break;
+					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07; break;
 				}
 				$options |= $operator << 20;
 
-				$data		= pack('V', $options);
+				$data = pack('V', $options);
 
 				// prompt title
 				$promptTitle = $dataValidation->getPromptTitle() !== '' ?
@@ -2851,7 +2851,7 @@ 
 					$formula1 = $this->_parser->toReversePolish();
 					$sz1 = strlen($formula1);
 
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					$sz1 = 0;
 					$formula1 = '';
 				}
@@ -2868,7 +2868,7 @@ 
 					$formula2 = $this->_parser->toReversePolish();
 					$sz2 = strlen($formula2);
 
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					$sz2 = 0;
 					$formula2 = '';
 				}
@@ -2882,7 +2882,7 @@ 
 				$length = strlen($data);
 			$header = pack("vv", $record, $length);
 
-				$this->_append($header . $data);
+				$this->_append($header.$data);
 			}
 		}
 	}

Braces +4 added lines, -3 removed lines

@@ -261,7 +261,9 @@ 
 		$this->_lastColumnIndex		= PHPExcel_Cell::columnIndexFromString($maxC);
 
 //		if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
-		if ($this->_lastColumnIndex > 255) $this->_lastColumnIndex = 255;
+		if ($this->_lastColumnIndex > 255) {
+			$this->_lastColumnIndex = 255;
+		}
 
 		$this->_countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
 	}
@@ -426,8 +428,7 @@ 
 					// FONT Index
 					if ($element instanceof PHPExcel_RichText_Run) {
 						$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
-					}
-					else {
+					} else {
 						$str_fontidx = 0;
 					}
 					$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);

app/View/Helper/ExcelHelper.php

Doc Comments +6 added lines

@@ -30,6 +30,9 @@ 
          return true; 
     } 
      
+    /**
+     * @param string $title
+     */
     function _title($title) { 
         $this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
     } 
@@ -71,6 +74,9 @@ 
         } 
     } 
              
+    /**
+     * @param string $title
+     */
     function _output($title, $type = 'Excel5') { 
 		if ($type == 'Excel5') {
 			header("Content-type: application/vnd.ms-excel");  

Indentation +46 added lines, -46 removed lines

@@ -6,47 +6,47 @@ 
 class ExcelHelper extends AppHelper { 
      
 	var $objPHPExcel;
-    var $writer; 
-    var $sheet; 
-    var $data; 
-    var $blacklist = array(); 
+	var $writer; 
+	var $sheet; 
+	var $data; 
+	var $blacklist = array(); 
      
-    public function excelHelper() {
+	public function excelHelper() {
 	$this->log('run this'); 
 		$this->objPHPExcel = new PHPExcel();
        
-        //$this->objPHPExcel->getActiveSheet() = $this->objPHPExcel->getActiveSheet(); 
-    } 
+		//$this->objPHPExcel->getActiveSheet() = $this->objPHPExcel->getActiveSheet(); 
+	} 
                   
-    function generate($data, $title = 'Report') { 
-         $this->data = $data; 
+	function generate($data, $title = 'Report') { 
+		 $this->data = $data; 
 
 
 
-         $this->_title($title); 
+		 $this->_title($title); 
 //         $this->_headers(); 
 //         $this->_rows(); 
-         $this->_output($title); 
-         return true; 
-    } 
+		 $this->_output($title); 
+		 return true; 
+	} 
      
-    function _title($title) { 
-        $this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
-    } 
+	function _title($title) { 
+		$this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
+	} 
 
-    function _headers() { 
-        $i=0; 
+	function _headers() { 
+		$i=0; 
 
 		$this->log($this->data);
 
-        foreach ($this->data[0] as $field => $value) { 
-            if (!in_array($field,$this->blacklist)) { 
+		foreach ($this->data[0] as $field => $value) { 
+			if (!in_array($field,$this->blacklist)) { 
 	
-                $columnName = Inflector::humanize($field); 
-                $this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
+				$columnName = Inflector::humanize($field); 
+				$this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
 
-            } 
-        } 
+			} 
+		} 
 		/**
         $this->objPHPExcel->getActiveSheet()->getStyle('A4')->getFont()->setBold(true); 
         $this->objPHPExcel->getActiveSheet()->getStyle('A4')->getFill()->setFillType(PHPExcel_Style_Fill::FILL_SOLID); 
@@ -55,42 +55,42 @@ 
         for ($j=1; $j<$i; $j++) { 
             $this->objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($j))->setAutoSize(true); 
         } 
-        ***/
-    } 
+		 ***/
+	} 
          
-    function _rows() { 
-        $i=5; 
-        foreach ($this->data as $row) { 
-            $j=0; 
-            foreach ($row as $field => $value) { 
-                if(!in_array($field,$this->blacklist)) { 
-                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
-                } 
-            } 
-            $i++; 
-        } 
-    } 
+	function _rows() { 
+		$i=5; 
+		foreach ($this->data as $row) { 
+			$j=0; 
+			foreach ($row as $field => $value) { 
+				if(!in_array($field,$this->blacklist)) { 
+					$this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
+				} 
+			} 
+			$i++; 
+		} 
+	} 
              
-    function _output($title, $type = 'Excel5') { 
+	function _output($title, $type = 'Excel5') { 
 		if ($type == 'Excel5') {
 			header("Content-type: application/vnd.ms-excel");  
-	        header('Content-Disposition: attachment;filename="'.$title.'.xls"'); 
-	        header('Cache-Control: max-age=0'); 
+			header('Content-Disposition: attachment;filename="'.$title.'.xls"'); 
+			header('Cache-Control: max-age=0'); 
 			$this->writer = PHPExcel_IOFactory::createWriter($this->objPHPExcel, 'Excel5');
 			
 			
 		} else if ($type == 'CSV') {
 			header("Content-type: text/csv");  
-	        header('Content-Disposition: attachment;filename="'.$title.'.csv"'); 
-	        header('Cache-Control: max-age=0'); 
+			header('Content-Disposition: attachment;filename="'.$title.'.csv"'); 
+			header('Cache-Control: max-age=0'); 
 			$this->writer = PHPExcel_IOFactory::createWriter($this->objPHPExcel, 'CSV');
 	        
 		}
 		
 		
-        //$this->writer->setTempDir(TMP); 
-        $this->writer->save('php://output'); 
-    } 
+		//$this->writer->setTempDir(TMP); 
+		$this->writer->save('php://output'); 
+	} 
 }
 
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once(APP . 'Vendor' . DS . 'PHPExcel' . DS . 'IOFactory.php');
-include_once(APP . 'Vendor' . DS . 'PHPExcel' . DS . 'PHPExcel.php');
+include_once(APP.'Vendor'.DS.'PHPExcel'.DS.'IOFactory.php');
+include_once(APP.'Vendor'.DS.'PHPExcel'.DS.'PHPExcel.php');
 
 class ExcelHelper extends AppHelper { 
      
@@ -35,12 +35,12 @@ 
     } 
 
     function _headers() { 
-        $i=0; 
+        $i = 0; 
 
 		$this->log($this->data);
 
         foreach ($this->data[0] as $field => $value) { 
-            if (!in_array($field,$this->blacklist)) { 
+            if ( ! in_array($field, $this->blacklist)) { 
 	
                 $columnName = Inflector::humanize($field); 
                 $this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
@@ -59,12 +59,12 @@ 
     } 
          
     function _rows() { 
-        $i=5; 
+        $i = 5; 
         foreach ($this->data as $row) { 
-            $j=0; 
+            $j = 0; 
             foreach ($row as $field => $value) { 
-                if(!in_array($field,$this->blacklist)) { 
-                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
+                if ( ! in_array($field, $this->blacklist)) { 
+                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++, $i, $value); 
                 } 
             } 
             $i++; 

app/webroot/plugins/cacheresource.mysql.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      * @param  string          $name       template name
      * @param  string          $cache_id   cache id
      * @param  string          $compile_id compile id
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     * @return integer timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
     {

Indentation +119 added lines, -119 removed lines

@@ -26,133 +26,133 @@
  */
 class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
 {
-    // PDO instance
-    protected $db;
-    protected $fetch;
-    protected $fetchTimestamp;
-    protected $save;
+	// PDO instance
+	protected $db;
+	protected $fetch;
+	protected $fetchTimestamp;
+	protected $save;
 
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
-        $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+	public function __construct()
+	{
+		try {
+			$this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
+		} catch (PDOException $e) {
+			throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+		}
+		$this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
+		$this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
+		$this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
             VALUES  (:id, :name, :cache_id, :compile_id, :content)');
-    }
+	}
 
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param  string  $id         unique cache content identifier
-     * @param  string  $name       template name
-     * @param  string  $cache_id   cache id
-     * @param  string  $compile_id compile id
-     * @param  string  $content    cached content
-     * @param  integer $mtime      cache modification timestamp (epoch)
-     * @return void
-     */
-    protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
-    {
-        $this->fetch->execute(array('id' => $id));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $content = $row['content'];
-            $mtime = strtotime($row['modified']);
-        } else {
-            $content = null;
-            $mtime = null;
-        }
-    }
+	/**
+	 * fetch cached content and its modification time from data source
+	 *
+	 * @param  string  $id         unique cache content identifier
+	 * @param  string  $name       template name
+	 * @param  string  $cache_id   cache id
+	 * @param  string  $compile_id compile id
+	 * @param  string  $content    cached content
+	 * @param  integer $mtime      cache modification timestamp (epoch)
+	 * @return void
+	 */
+	protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
+	{
+		$this->fetch->execute(array('id' => $id));
+		$row = $this->fetch->fetch();
+		$this->fetch->closeCursor();
+		if ($row) {
+			$content = $row['content'];
+			$mtime = strtotime($row['modified']);
+		} else {
+			$content = null;
+			$mtime = null;
+		}
+	}
 
-    /**
-     * Fetch cached content's modification timestamp from data source
-     *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
-     * @param  string          $id         unique cache content identifier
-     * @param  string          $name       template name
-     * @param  string          $cache_id   cache id
-     * @param  string          $compile_id compile id
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-    {
-        $this->fetchTimestamp->execute(array('id' => $id));
-        $mtime = strtotime($this->fetchTimestamp->fetchColumn());
-        $this->fetchTimestamp->closeCursor();
+	/**
+	 * Fetch cached content's modification timestamp from data source
+	 *
+	 * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
+	 * @param  string          $id         unique cache content identifier
+	 * @param  string          $name       template name
+	 * @param  string          $cache_id   cache id
+	 * @param  string          $compile_id compile id
+	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+	 */
+	protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+	{
+		$this->fetchTimestamp->execute(array('id' => $id));
+		$mtime = strtotime($this->fetchTimestamp->fetchColumn());
+		$this->fetchTimestamp->closeCursor();
 
-        return $mtime;
-    }
+		return $mtime;
+	}
 
-    /**
-     * Save content to cache
-     *
-     * @param  string       $id         unique cache content identifier
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param  string       $content    content to cache
-     * @return boolean      success
-     */
-    protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
-    {
-        $this->save->execute(array(
-            'id' => $id,
-            'name' => $name,
-            'cache_id' => $cache_id,
-            'compile_id' => $compile_id,
-            'content' => $content,
-        ));
+	/**
+	 * Save content to cache
+	 *
+	 * @param  string       $id         unique cache content identifier
+	 * @param  string       $name       template name
+	 * @param  string       $cache_id   cache id
+	 * @param  string       $compile_id compile id
+	 * @param  integer|null $exp_time   seconds till expiration time in seconds or null
+	 * @param  string       $content    content to cache
+	 * @return boolean      success
+	 */
+	protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
+	{
+		$this->save->execute(array(
+			'id' => $id,
+			'name' => $name,
+			'cache_id' => $cache_id,
+			'compile_id' => $compile_id,
+			'content' => $content,
+		));
 
-        return !!$this->save->rowCount();
-    }
+		return !!$this->save->rowCount();
+	}
 
-    /**
-     * Delete content from cache
-     *
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration or null
-     * @return integer      number of deleted caches
-     */
-    protected function delete($name, $cache_id, $compile_id, $exp_time)
-    {
-        // delete the whole cache
-        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-            // returning the number of deleted caches would require a second query to count them
-            $query = $this->db->query('TRUNCATE TABLE output_cache');
+	/**
+	 * Delete content from cache
+	 *
+	 * @param  string       $name       template name
+	 * @param  string       $cache_id   cache id
+	 * @param  string       $compile_id compile id
+	 * @param  integer|null $exp_time   seconds till expiration or null
+	 * @return integer      number of deleted caches
+	 */
+	protected function delete($name, $cache_id, $compile_id, $exp_time)
+	{
+		// delete the whole cache
+		if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
+			// returning the number of deleted caches would require a second query to count them
+			$query = $this->db->query('TRUNCATE TABLE output_cache');
 
-            return -1;
-        }
-        // build the filter
-        $where = array();
-        // equal test name
-        if ($name !== null) {
-            $where[] = 'name = ' . $this->db->quote($name);
-        }
-        // equal test compile_id
-        if ($compile_id !== null) {
-            $where[] = 'compile_id = ' . $this->db->quote($compile_id);
-        }
-        // range test expiration time
-        if ($exp_time !== null) {
-            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
-        }
-        // equal test cache_id and match sub-groups
-        if ($cache_id !== null) {
-            $where[] = '(cache_id = '. $this->db->quote($cache_id)
-                . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
-        }
-        // run delete query
-        $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
+			return -1;
+		}
+		// build the filter
+		$where = array();
+		// equal test name
+		if ($name !== null) {
+			$where[] = 'name = ' . $this->db->quote($name);
+		}
+		// equal test compile_id
+		if ($compile_id !== null) {
+			$where[] = 'compile_id = ' . $this->db->quote($compile_id);
+		}
+		// range test expiration time
+		if ($exp_time !== null) {
+			$where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+		}
+		// equal test cache_id and match sub-groups
+		if ($cache_id !== null) {
+			$where[] = '(cache_id = '. $this->db->quote($cache_id)
+				. ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
+		}
+		// run delete query
+		$query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
 
-        return $query->rowCount();
-    }
+		return $query->rowCount();
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
         try {
             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
         } catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+            throw new SmartyException('Mysql Resource failed: '.$e->getMessage());
         }
         $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
         $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
@@ -110,7 +110,7 @@ 
             'content' => $content,
         ));
 
-        return !!$this->save->rowCount();
+        return ! ! $this->save->rowCount();
     }
 
     /**
@@ -135,23 +135,23 @@ 
         $where = array();
         // equal test name
         if ($name !== null) {
-            $where[] = 'name = ' . $this->db->quote($name);
+            $where[] = 'name = '.$this->db->quote($name);
         }
         // equal test compile_id
         if ($compile_id !== null) {
-            $where[] = 'compile_id = ' . $this->db->quote($compile_id);
+            $where[] = 'compile_id = '.$this->db->quote($compile_id);
         }
         // range test expiration time
         if ($exp_time !== null) {
-            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL '.intval($exp_time).' SECOND)';
         }
         // equal test cache_id and match sub-groups
         if ($cache_id !== null) {
-            $where[] = '(cache_id = '. $this->db->quote($cache_id)
-                . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
+            $where[] = '(cache_id = '.$this->db->quote($cache_id)
+                . ' OR cache_id LIKE '.$this->db->quote($cache_id.'|%').')';
         }
         // run delete query
-        $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
+        $query = $this->db->query('DELETE FROM output_cache WHERE '.join(' AND ', $where));
 
         return $query->rowCount();
     }

lib/Cake/basics.php

Doc Comments +9 added lines, -9 removed lines

@@ -456,7 +456,7 @@ 
  *   all files in app/tmp/cache/views will be deleted
  * @param string $type Directory in tmp/cache defaults to view directory
  * @param string $ext The file extension you are deleting
- * @return true if files found and deleted false otherwise
+ * @return boolean if files found and deleted false otherwise
  */
 	function clearCache($params = null, $type = 'views', $ext = '.php') {
 		if (is_string($params) || $params === null) {
@@ -547,7 +547,7 @@ 
  *
  * @param string $singular Text to translate
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return mixed translated string
+ * @return null|string translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__
  */
 	function __($singular, $args = null) {
@@ -577,7 +577,7 @@ 
  * @param string $plural Plural text
  * @param integer $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return mixed plural form of translated string
+ * @return null|string plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
  */
 	function __n($singular, $plural, $count, $args = null) {
@@ -605,7 +605,7 @@ 
  * @param string $domain Domain
  * @param string $msg String to translate
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
  */
 	function __d($domain, $msg, $args = null) {
@@ -636,7 +636,7 @@ 
  * @param string $plural Plural
  * @param integer $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @return null|string form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
  */
 	function __dn($domain, $singular, $plural, $count, $args = null) {
@@ -678,7 +678,7 @@ 
  * @param string $msg Message to translate
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
  */
 	function __dc($domain, $msg, $category, $args = null) {
@@ -724,7 +724,7 @@ 
  * @param integer $count Count
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @return null|string form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
  */
 	function __dcn($domain, $singular, $plural, $count, $category, $args = null) {
@@ -762,7 +762,7 @@ 
  * @param string $msg String to translate
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
  */
 	function __c($msg, $category, $args = null) {
@@ -805,7 +805,7 @@ 
  * Searches include path for files.
  *
  * @param string $file File to look for
- * @return Full path to file if exists, otherwise false
+ * @return string|false path to file if exists, otherwise false
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#fileExistsInPath
  */
 	function fileExistsInPath($file) {

Indentation +14 added lines, -14 removed lines

@@ -844,18 +844,18 @@
 
 
 function receber_data($data, $dia = true, $mes = true, $ano = true, $hora = false, $minuto = false, $segundo = false) {
-    if ($hora || $minuto || $segundo) {
-        $data = explode(' ', $data);
-        $_hora = $data[1];
-        $data = $data[0];
-
-        $_hora = explode(':', $_hora);
-        $_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
-    }
-    $recebe = explode('-', $data);
-    if (isset($recebe[2]) && isset($recebe[1])) {
-        $data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
-    }
-
-    return $data . (isset($_hora) ? ' ' . $_hora : '');
+	if ($hora || $minuto || $segundo) {
+		$data = explode(' ', $data);
+		$_hora = $data[1];
+		$data = $data[0];
+
+		$_hora = explode(':', $_hora);
+		$_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
+	}
+	$recebe = explode('-', $data);
+	if (isset($recebe[2]) && isset($recebe[1])) {
+		$data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
+	}
+
+	return $data . (isset($_hora) ? ' ' . $_hora : '');
 }

Spacing +63 added lines, -63 removed lines

@@ -29,7 +29,7 @@ 
 	define('MONTH', 2592000);
 	define('YEAR', 31536000);
 
-if (!function_exists('config')) {
+if ( ! function_exists('config')) {
 
 /**
  * Loads configuration files. Receives a set of configuration files
@@ -46,8 +46,8 @@ 
 		$count = count($args);
 		$included = 0;
 		foreach ($args as $arg) {
-			if (file_exists(APP . 'Config' . DS . $arg . '.php')) {
-				include_once APP . 'Config' . DS . $arg . '.php';
+			if (file_exists(APP.'Config'.DS.$arg.'.php')) {
+				include_once APP.'Config'.DS.$arg.'.php';
 				$included++;
 			}
 		}
@@ -56,7 +56,7 @@ 
 
 }
 
-if (!function_exists('debug')) {
+if ( ! function_exists('debug')) {
 
 /**
  * Prints out debug information about given variable.
@@ -120,7 +120,7 @@ 
 
 }
 
-if (!function_exists('sortByKey')) {
+if ( ! function_exists('sortByKey')) {
 
 /**
  * Sorts given $array by key $sortBy.
@@ -133,7 +133,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#sortByKey
  */
 	function sortByKey(&$array, $sortBy, $order = 'asc', $type = SORT_NUMERIC) {
-		if (!is_array($array)) {
+		if ( ! is_array($array)) {
 			return null;
 		}
 
@@ -155,7 +155,7 @@ 
 
 }
 
-if (!function_exists('h')) {
+if ( ! function_exists('h')) {
 
 /**
  * Convenience method for htmlspecialchars.
@@ -177,9 +177,9 @@ 
 			return $texts;
 		} elseif (is_object($text)) {
 			if (method_exists($text, '__toString')) {
-				$text = (string)$text;
+				$text = (string) $text;
 			} else {
-				$text = '(object)' . get_class($text);
+				$text = '(object)'.get_class($text);
 			}
 		} elseif (is_bool($text)) {
 			return $text;
@@ -200,7 +200,7 @@ 
 
 }
 
-if (!function_exists('pluginSplit')) {
+if ( ! function_exists('pluginSplit')) {
 
 /**
  * Splits a dot syntax plugin name into its plugin and class name.
@@ -227,7 +227,7 @@ 
 
 }
 
-if (!function_exists('pr')) {
+if ( ! function_exists('pr')) {
 
 /**
  * print_r() convenience function
@@ -252,7 +252,7 @@ 
 
 }
 
-if (!function_exists('am')) {
+if ( ! function_exists('am')) {
 
 /**
  * Merge a group of arrays
@@ -268,7 +268,7 @@ 
 		$r = array();
 		$args = func_get_args();
 		foreach ($args as $a) {
-			if (!is_array($a)) {
+			if ( ! is_array($a)) {
 				$a = array($a);
 			}
 			$r = array_merge($r, $a);
@@ -278,7 +278,7 @@ 
 
 }
 
-if (!function_exists('env')) {
+if ( ! function_exists('env')) {
 
 /**
  * Gets an environment variable from available sources, and provides emulation
@@ -293,7 +293,7 @@ 
 	function env($key) {
 		if ($key === 'HTTPS') {
 			if (isset($_SERVER['HTTPS'])) {
-				return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+				return ( ! empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 			}
 			return (strpos(env('SCRIPT_URI'), 'https://') === 0);
 		}
@@ -329,7 +329,7 @@ 
 				$name = env('SCRIPT_NAME');
 				$filename = env('SCRIPT_FILENAME');
 				$offset = 0;
-				if (!strpos($name, '.php')) {
+				if ( ! strpos($name, '.php')) {
 					$offset = 4;
 				}
 				return substr($filename, 0, -(strlen($name) + $offset));
@@ -343,9 +343,9 @@ 
 				$count = count($parts);
 
 				if ($count === 1) {
-					return '.' . $host;
+					return '.'.$host;
 				} elseif ($count === 2) {
-					return '.' . $host;
+					return '.'.$host;
 				} elseif ($count === 3) {
 					$gTLD = array(
 						'aero',
@@ -371,18 +371,18 @@ 
 						'xxx'
 					);
 					if (in_array($parts[1], $gTLD)) {
-						return '.' . $host;
+						return '.'.$host;
 					}
 				}
 				array_shift($parts);
-				return '.' . implode('.', $parts);
+				return '.'.implode('.', $parts);
 		}
 		return null;
 	}
 
 }
 
-if (!function_exists('cache')) {
+if ( ! function_exists('cache')) {
 
 /**
  * Reads/writes temporary data to cache files or session.
@@ -400,19 +400,19 @@ 
 		}
 		$now = time();
 
-		if (!is_numeric($expires)) {
+		if ( ! is_numeric($expires)) {
 			$expires = strtotime($expires, $now);
 		}
 
 		switch (strtolower($target)) {
 			case 'cache':
-				$filename = CACHE . $path;
+				$filename = CACHE.$path;
 				break;
 			case 'public':
-				$filename = WWW_ROOT . $path;
+				$filename = WWW_ROOT.$path;
 				break;
 			case 'tmp':
-				$filename = TMP . $path;
+				$filename = TMP.$path;
 				break;
 		}
 		$timediff = $expires - $now;
@@ -446,7 +446,7 @@ 
 
 }
 
-if (!function_exists('clearCache')) {
+if ( ! function_exists('clearCache')) {
 
 /**
  * Used to delete files in the cache directories, or clear contents of cache directories
@@ -461,22 +461,22 @@ 
 	function clearCache($params = null, $type = 'views', $ext = '.php') {
 		if (is_string($params) || $params === null) {
 			$params = preg_replace('/\/\//', '/', $params);
-			$cache = CACHE . $type . DS . $params;
+			$cache = CACHE.$type.DS.$params;
 
-			if (is_file($cache . $ext)) {
+			if (is_file($cache.$ext)) {
 				//@codingStandardsIgnoreStart
-				@unlink($cache . $ext);
+				@unlink($cache.$ext);
 				//@codingStandardsIgnoreEnd
 				return true;
 			} elseif (is_dir($cache)) {
-				$files = glob($cache . '*');
+				$files = glob($cache.'*');
 
 				if ($files === false) {
 					return false;
 				}
 
 				foreach ($files as $file) {
-					if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+					if (is_file($file) && strrpos($file, DS.'empty') !== strlen($file) - 6) {
 						//@codingStandardsIgnoreStart
 						@unlink($file);
 						//@codingStandardsIgnoreEnd
@@ -485,8 +485,8 @@ 
 				return true;
 			}
 			$cache = array(
-				CACHE . $type . DS . '*' . $params . $ext,
-				CACHE . $type . DS . '*' . $params . '_*' . $ext
+				CACHE.$type.DS.'*'.$params.$ext,
+				CACHE.$type.DS.'*'.$params.'_*'.$ext
 			);
 			$files = array();
 			while ($search = array_shift($cache)) {
@@ -499,7 +499,7 @@ 
 				return false;
 			}
 			foreach ($files as $file) {
-				if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+				if (is_file($file) && strrpos($file, DS.'empty') !== strlen($file) - 6) {
 					//@codingStandardsIgnoreStart
 					@unlink($file);
 					//@codingStandardsIgnoreEnd
@@ -518,7 +518,7 @@ 
 
 }
 
-if (!function_exists('stripslashes_deep')) {
+if ( ! function_exists('stripslashes_deep')) {
 
 /**
  * Recursively strips slashes from all values in an array
@@ -540,7 +540,7 @@ 
 
 }
 
-if (!function_exists('__')) {
+if ( ! function_exists('__')) {
 
 /**
  * Returns a translated string if one is found; Otherwise, the submitted message.
@@ -551,7 +551,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__
  */
 	function __($singular, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 
@@ -559,7 +559,7 @@ 
 		$translated = I18n::translate($singular);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 1);
 		}
 		return vsprintf($translated, $args);
@@ -567,7 +567,7 @@ 
 
 }
 
-if (!function_exists('__n')) {
+if ( ! function_exists('__n')) {
 
 /**
  * Returns correct plural form of message identified by $singular and $plural for count $count.
@@ -581,7 +581,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
  */
 	function __n($singular, $plural, $count, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 
@@ -589,7 +589,7 @@ 
 		$translated = I18n::translate($singular, $plural, null, 6, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 3);
 		}
 		return vsprintf($translated, $args);
@@ -597,7 +597,7 @@ 
 
 }
 
-if (!function_exists('__d')) {
+if ( ! function_exists('__d')) {
 
 /**
  * Allows you to override the current domain for a single message lookup.
@@ -609,14 +609,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
  */
 	function __d($domain, $msg, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 2);
 		}
 		return vsprintf($translated, $args);
@@ -624,7 +624,7 @@ 
 
 }
 
-if (!function_exists('__dn')) {
+if ( ! function_exists('__dn')) {
 
 /**
  * Allows you to override the current domain for a single plural message lookup.
@@ -640,14 +640,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
  */
 	function __dn($domain, $singular, $plural, $count, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, 6, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 4);
 		}
 		return vsprintf($translated, $args);
@@ -655,7 +655,7 @@ 
 
 }
 
-if (!function_exists('__dc')) {
+if ( ! function_exists('__dc')) {
 
 /**
  * Allows you to override the current domain for a single message lookup.
@@ -682,14 +682,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
  */
 	function __dc($domain, $msg, $category, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain, $category);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 3);
 		}
 		return vsprintf($translated, $args);
@@ -697,7 +697,7 @@ 
 
 }
 
-if (!function_exists('__dcn')) {
+if ( ! function_exists('__dcn')) {
 
 /**
  * Allows you to override the current domain for a single plural message lookup.
@@ -728,14 +728,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
  */
 	function __dcn($domain, $singular, $plural, $count, $category, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, $category, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 5);
 		}
 		return vsprintf($translated, $args);
@@ -743,7 +743,7 @@ 
 
 }
 
-if (!function_exists('__c')) {
+if ( ! function_exists('__c')) {
 
 /**
  * The category argument allows a specific category of the locale settings to be used for fetching a message.
@@ -766,14 +766,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
  */
 	function __c($msg, $category, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, null, $category);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 2);
 		}
 		return vsprintf($translated, $args);
@@ -781,7 +781,7 @@ 
 
 }
 
-if (!function_exists('LogError')) {
+if ( ! function_exists('LogError')) {
 
 /**
  * Shortcut to Log::write.
@@ -799,7 +799,7 @@ 
 
 }
 
-if (!function_exists('fileExistsInPath')) {
+if ( ! function_exists('fileExistsInPath')) {
 
 /**
  * Searches include path for files.
@@ -811,7 +811,7 @@ 
 	function fileExistsInPath($file) {
 		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 		foreach ($paths as $path) {
-			$fullPath = $path . DS . $file;
+			$fullPath = $path.DS.$file;
 
 			if (file_exists($fullPath)) {
 				return $fullPath;
@@ -824,7 +824,7 @@ 
 
 }
 
-if (!function_exists('convertSlash')) {
+if ( ! function_exists('convertSlash')) {
 
 /**
  * Convert forward slashes to underscores and removes first and last underscores in a string
@@ -850,12 +850,12 @@ 
         $data = $data[0];
 
         $_hora = explode(':', $_hora);
-        $_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
+        $_hora = ($hora ? $_hora[0] : '').($minuto ? ($hora ? ':' : '').$_hora[1] : '').($segundo ? ($hora || $minuto ? ':' : '').$_hora[2] : '');
     }
     $recebe = explode('-', $data);
     if (isset($recebe[2]) && isset($recebe[1])) {
-        $data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
+        $data = ($dia ? $recebe[2] : '').($mes ? ($dia ? '/' : '').$recebe[1] : '').($ano ? ($mes || $dia ? '/' : '').$recebe[0] : '');
     }
 
-    return $data . (isset($_hora) ? ' ' . $_hora : '');
+    return $data.(isset($_hora) ? ' '.$_hora : '');
 }

lib/Cake/bootstrap.php

Doc Comments +5 added lines, -5 removed lines

@@ -214,7 +214,7 @@ 
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or false if $needle is not found.
+ * @return string|false The portion of $haystack, or false if $needle is not found.
  */
 	function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::stristr($haystack, $needle, $part);
@@ -268,7 +268,7 @@ 
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrchr($haystack, $needle, $part);
@@ -288,7 +288,7 @@ 
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrichr($haystack, $needle, $part);
@@ -345,7 +345,7 @@ 
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|false The portion of $haystack, or true if $needle is not found.
  */
 	function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strstr($haystack, $needle, $part);
@@ -424,7 +424,7 @@ 
  * @param string $str The string being encoded
  * @param string $charset specifies the name of the character set in which str is represented in.
  *    The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding.
+ * @param string $transferEncoding specifies the scheme of MIME encoding.
  *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
  * @param string $linefeed specifies the EOL (end-of-line) marker with which
  *    mb_encode_mimeheader() performs line-folding

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Basic CakePHP functionality.
- *
- * Handles loading of core files needed on every request
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake
- * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * Basic CakePHP functionality.
+	 *
+	 * Handles loading of core files needed on every request
+	 *
+	 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+	 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 *
+	 * Licensed under The MIT License
+	 * For full copyright and license information, please see the LICENSE.txt
+	 * Redistributions of files must retain the above copyright notice.
+	 *
+	 * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 * @link          http://cakephp.org CakePHP(tm) Project
+	 * @package       Cake
+	 * @since         CakePHP(tm) v 0.2.9
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 define('TIME_START', microtime(true));
 

Spacing +50 added lines, -50 removed lines

@@ -20,124 +20,124 @@ 
 
 define('TIME_START', microtime(true));
 
-if (!defined('E_DEPRECATED')) {
+if ( ! defined('E_DEPRECATED')) {
 	define('E_DEPRECATED', 8192);
 }
 
-if (!defined('E_USER_DEPRECATED')) {
+if ( ! defined('E_USER_DEPRECATED')) {
 	define('E_USER_DEPRECATED', E_USER_NOTICE);
 }
 error_reporting(E_ALL & ~E_DEPRECATED);
 
-if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+if ( ! defined('CAKE_CORE_INCLUDE_PATH')) {
 	define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(__FILE__)));
 }
 
-if (!defined('CORE_PATH')) {
-	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+if ( ! defined('CORE_PATH')) {
+	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH.DS);
 }
 
-if (!defined('WEBROOT_DIR')) {
+if ( ! defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', 'webroot');
 }
 
 /**
  * Path to the cake directory.
  */
-	define('CAKE', CORE_PATH . 'Cake' . DS);
+	define('CAKE', CORE_PATH.'Cake'.DS);
 
 /**
  * Path to the application's directory.
  */
-if (!defined('APP')) {
-	define('APP', ROOT . DS . APP_DIR . DS);
+if ( ! defined('APP')) {
+	define('APP', ROOT.DS.APP_DIR.DS);
 }
 
 /**
  * Path to the application's libs directory.
  */
-	define('APPLIBS', APP . 'Lib' . DS);
+	define('APPLIBS', APP.'Lib'.DS);
 
 /**
  * Path to the public CSS directory.
  */
-if (!defined('CSS')) {
-	define('CSS', WWW_ROOT . 'css' . DS);
+if ( ! defined('CSS')) {
+	define('CSS', WWW_ROOT.'css'.DS);
 }
 
 /**
  * Path to the public JavaScript directory.
  */
-if (!defined('JS')) {
-	define('JS', WWW_ROOT . 'js' . DS);
+if ( ! defined('JS')) {
+	define('JS', WWW_ROOT.'js'.DS);
 }
 
 /**
  * Path to the public images directory.
  */
-if (!defined('IMAGES')) {
-	define('IMAGES', WWW_ROOT . 'img' . DS);
+if ( ! defined('IMAGES')) {
+	define('IMAGES', WWW_ROOT.'img'.DS);
 }
 
 /**
  * Path to the tests directory.
  */
-if (!defined('TESTS')) {
-	define('TESTS', APP . 'Test' . DS);
+if ( ! defined('TESTS')) {
+	define('TESTS', APP.'Test'.DS);
 }
 
 /**
  * Path to the temporary files directory.
  */
-if (!defined('TMP')) {
-	define('TMP', APP . 'tmp' . DS);
+if ( ! defined('TMP')) {
+	define('TMP', APP.'tmp'.DS);
 }
 
 /**
  * Path to the logs directory.
  */
-if (!defined('LOGS')) {
-	define('LOGS', TMP . 'logs' . DS);
+if ( ! defined('LOGS')) {
+	define('LOGS', TMP.'logs'.DS);
 }
 
 /**
  * Path to the cache files directory. It can be shared between hosts in a multi-server setup.
  */
-if (!defined('CACHE')) {
-	define('CACHE', TMP . 'cache' . DS);
+if ( ! defined('CACHE')) {
+	define('CACHE', TMP.'cache'.DS);
 }
 
 /**
  * Path to the vendors directory.
  */
-if (!defined('VENDORS')) {
-	define('VENDORS', ROOT . DS . 'vendors' . DS);
+if ( ! defined('VENDORS')) {
+	define('VENDORS', ROOT.DS.'vendors'.DS);
 }
 
 /**
  * Web path to the public images directory.
  */
-if (!defined('IMAGES_URL')) {
+if ( ! defined('IMAGES_URL')) {
 	define('IMAGES_URL', 'img/');
 }
 
 /**
  * Web path to the CSS files directory.
  */
-if (!defined('CSS_URL')) {
+if ( ! defined('CSS_URL')) {
 	define('CSS_URL', 'css/');
 }
 
 /**
  * Web path to the js files directory.
  */
-if (!defined('JS_URL')) {
+if ( ! defined('JS_URL')) {
 	define('JS_URL', 'js/');
 }
 
-require CAKE . 'basics.php';
-require CAKE . 'Core' . DS . 'App.php';
-require CAKE . 'Error' . DS . 'exceptions.php';
+require CAKE.'basics.php';
+require CAKE.'Core'.DS.'App.php';
+require CAKE.'Error'.DS.'exceptions.php';
 
 spl_autoload_register(array('App', 'load'));
 
@@ -151,7 +151,7 @@ 
 /**
  * Full URL prefix
  */
-if (!defined('FULL_BASE_URL')) {
+if ( ! defined('FULL_BASE_URL')) {
 	$s = null;
 	if (env('HTTPS')) {
 		$s = 's';
@@ -160,7 +160,7 @@ 
 	$httpHost = env('HTTP_HOST');
 
 	if (isset($httpHost)) {
-		define('FULL_BASE_URL', 'http' . $s . '://' . $httpHost);
+		define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
 		Configure::write('App.fullBaseUrl', FULL_BASE_URL);
 	}
 	unset($httpHost, $s);
@@ -176,15 +176,15 @@ 
 
 if (function_exists('mb_internal_encoding')) {
 	$encoding = Configure::read('App.encoding');
-	if (!empty($encoding)) {
+	if ( ! empty($encoding)) {
 		mb_internal_encoding($encoding);
 	}
-	if (!empty($encoding) && function_exists('mb_regex_encoding')) {
+	if ( ! empty($encoding) && function_exists('mb_regex_encoding')) {
 		mb_regex_encoding($encoding);
 	}
 }
 
-if (!function_exists('mb_stripos')) {
+if ( ! function_exists('mb_stripos')) {
 
 /**
  * Find position of first occurrence of a case-insensitive string.
@@ -202,7 +202,7 @@ 
 
 }
 
-if (!function_exists('mb_stristr')) {
+if ( ! function_exists('mb_stristr')) {
 
 /**
  * Finds first occurrence of a string within another, case insensitive.
@@ -222,7 +222,7 @@ 
 
 }
 
-if (!function_exists('mb_strlen')) {
+if ( ! function_exists('mb_strlen')) {
 
 /**
  * Get string length.
@@ -238,7 +238,7 @@ 
 
 }
 
-if (!function_exists('mb_strpos')) {
+if ( ! function_exists('mb_strpos')) {
 
 /**
  * Find position of first occurrence of a string.
@@ -256,7 +256,7 @@ 
 
 }
 
-if (!function_exists('mb_strrchr')) {
+if ( ! function_exists('mb_strrchr')) {
 
 /**
  * Finds the last occurrence of a character in a string within another.
@@ -276,7 +276,7 @@ 
 
 }
 
-if (!function_exists('mb_strrichr')) {
+if ( ! function_exists('mb_strrichr')) {
 
 /**
  * Finds the last occurrence of a character in a string within another, case insensitive.
@@ -296,7 +296,7 @@ 
 
 }
 
-if (!function_exists('mb_strripos')) {
+if ( ! function_exists('mb_strripos')) {
 
 /**
  * Finds position of last occurrence of a string within another, case insensitive
@@ -314,7 +314,7 @@ 
 
 }
 
-if (!function_exists('mb_strrpos')) {
+if ( ! function_exists('mb_strrpos')) {
 
 /**
  * Find position of last occurrence of a string in a string.
@@ -333,7 +333,7 @@ 
 
 }
 
-if (!function_exists('mb_strstr')) {
+if ( ! function_exists('mb_strstr')) {
 
 /**
  * Finds first occurrence of a string within another
@@ -353,7 +353,7 @@ 
 
 }
 
-if (!function_exists('mb_strtolower')) {
+if ( ! function_exists('mb_strtolower')) {
 
 /**
  * Make a string lowercase
@@ -368,7 +368,7 @@ 
 
 }
 
-if (!function_exists('mb_strtoupper')) {
+if ( ! function_exists('mb_strtoupper')) {
 
 /**
  * Make a string uppercase
@@ -383,7 +383,7 @@ 
 
 }
 
-if (!function_exists('mb_substr_count')) {
+if ( ! function_exists('mb_substr_count')) {
 
 /**
  * Count the number of substring occurrences
@@ -399,7 +399,7 @@ 
 
 }
 
-if (!function_exists('mb_substr')) {
+if ( ! function_exists('mb_substr')) {
 
 /**
  * Get part of string
@@ -416,7 +416,7 @@ 
 
 }
 
-if (!function_exists('mb_encode_mimeheader')) {
+if ( ! function_exists('mb_encode_mimeheader')) {
 
 /**
  * Encode string for MIME header

lib/Cake/Cache/CacheEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
  * to decide whether actually delete the keys or just simulate it to achieve
  * the same result.
  *
- * @param string $groups name of the group to be cleared
+ * @param string $group name of the group to be cleared
  * @return boolean
  */
 	public function clearGroup($group) {
@@ -161,7 +161,7 @@ 
  * Generates a safe key for use with cache engine storage engines.
  *
  * @param string $key the key passed over
- * @return mixed string $key or false
+ * @return false|string string $key or false
  */
 	public function key($key) {
 		if (empty($key)) {

Spacing +4 added lines, -4 removed lines

@@ -52,11 +52,11 @@ 
 			'groups' => array()
 		);
 		$this->settings = $settings;
-		if (!empty($this->settings['groups'])) {
+		if ( ! empty($this->settings['groups'])) {
 			sort($this->settings['groups']);
 			$this->_groupPrefix = str_repeat('%s_', count($this->settings['groups']));
 		}
-		if (!is_numeric($this->settings['duration'])) {
+		if ( ! is_numeric($this->settings['duration'])) {
 			$this->settings['duration'] = strtotime($this->settings['duration']) - time();
 		}
 		return true;
@@ -169,12 +169,12 @@ 
 		}
 
 		$prefix = '';
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$prefix = vsprintf($this->_groupPrefix, $this->groups());
 		}
 
 		$key = preg_replace('/[\s]+/', '_', strtolower(trim(str_replace(array(DS, '/', '.'), '_', strval($key)))));
-		return $prefix . $key;
+		return $prefix.$key;
 	}
 
 }

lib/Cake/Cache/Engine/FileEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
  * Write data for key into cache
  *
  * @param string $key Identifier for the data
- * @param mixed $data Data to be cached
+ * @param string $data Data to be cached
  * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was successfully cached, false on failure
  */
@@ -391,7 +391,7 @@ 
  * Generates a safe key for use with cache engine storage engines.
  *
  * @param string $key the key passed over
- * @return mixed string $key or false
+ * @return false|string string $key or false
  */
 	public function key($key) {
 		if (empty($key)) {

Spacing +25 added lines, -25 removed lines

@@ -84,7 +84,7 @@ 
 		if (substr($this->settings['path'], -1) !== DS) {
 			$this->settings['path'] .= DS;
 		}
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$this->_groupPrefix = str_replace('_', DS, $this->_groupPrefix);
 		}
 		return $this->_active();
@@ -109,7 +109,7 @@ 
  * @return boolean True if the data was successfully cached, false on failure
  */
 	public function write($key, $data, $duration) {
-		if ($data === '' || !$this->_init) {
+		if ($data === '' || ! $this->_init) {
 			return false;
 		}
 
@@ -123,7 +123,7 @@ 
 			$lineBreak = "\r\n";
 		}
 
-		if (!empty($this->settings['serialize'])) {
+		if ( ! empty($this->settings['serialize'])) {
 			if ($this->settings['isWindows']) {
 				$data = str_replace('\\', '\\\\\\\\', serialize($data));
 			} else {
@@ -132,7 +132,7 @@ 
 		}
 
 		$expires = time() + $duration;
-		$contents = $expires . $lineBreak . $data . $lineBreak;
+		$contents = $expires.$lineBreak.$data.$lineBreak;
 
 		if ($this->settings['lock']) {
 			$this->_File->flock(LOCK_EX);
@@ -155,7 +155,7 @@ 
  * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
  */
 	public function read($key) {
-		if (!$this->_init || $this->_setKey($key) === false) {
+		if ( ! $this->_init || $this->_setKey($key) === false) {
 			return false;
 		}
 
@@ -187,11 +187,11 @@ 
 
 		$data = trim($data);
 
-		if ($data !== '' && !empty($this->settings['serialize'])) {
+		if ($data !== '' && ! empty($this->settings['serialize'])) {
 			if ($this->settings['isWindows']) {
 				$data = str_replace('\\\\\\\\', '\\', $data);
 			}
-			$data = unserialize((string)$data);
+			$data = unserialize((string) $data);
 		}
 		return $data;
 	}
@@ -203,7 +203,7 @@ 
  * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
-		if ($this->_setKey($key) === false || !$this->_init) {
+		if ($this->_setKey($key) === false || ! $this->_init) {
 			return false;
 		}
 		$path = $this->_File->getRealPath();
@@ -221,7 +221,7 @@ 
  * @return boolean True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
-		if (!$this->_init) {
+		if ( ! $this->_init) {
 			return false;
 		}
 		$this->_File = null;
@@ -242,8 +242,8 @@ 
 				continue;
 			}
 
-			$path = $path->getRealPath() . DS;
-			if (!in_array($path, $cleared)) {
+			$path = $path->getRealPath().DS;
+			if ( ! in_array($path, $cleared)) {
 				$this->_clearDirectory($path, $now, $threshold);
 				$cleared[] = $path;
 			}
@@ -262,7 +262,7 @@ 
 	protected function _clearDirectory($path, $now, $threshold) {
 		$prefixLength = strlen($this->settings['prefix']);
 
-		if (!is_dir($path)) {
+		if ( ! is_dir($path)) {
 			return;
 		}
 
@@ -271,11 +271,11 @@ 
 			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
 				continue;
 			}
-			$filePath = $path . $entry;
-			if (!file_exists($filePath) || is_dir($filePath)) {
+			$filePath = $path.$entry;
+			if ( ! file_exists($filePath) || is_dir($filePath)) {
 				continue;
 			}
-			$file = new SplFileObject($path . $entry, 'r');
+			$file = new SplFileObject($path.$entry, 'r');
 
 			if ($threshold) {
 				$mtime = $file->getMTime();
@@ -283,7 +283,7 @@ 
 				if ($mtime > $threshold) {
 					continue;
 				}
-				$expires = (int)$file->current();
+				$expires = (int) $file->current();
 
 				if ($expires > $now) {
 					continue;
@@ -334,17 +334,17 @@ 
  */
 	protected function _setKey($key, $createKey = false) {
 		$groups = null;
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$groups = vsprintf($this->_groupPrefix, $this->groups());
 		}
-		$dir = $this->settings['path'] . $groups;
+		$dir = $this->settings['path'].$groups;
 
-		if (!is_dir($dir)) {
+		if ( ! is_dir($dir)) {
 			mkdir($dir, 0775, true);
 		}
-		$path = new SplFileInfo($dir . $key);
+		$path = new SplFileInfo($dir.$key);
 
-		if (!$createKey && !$path->isFile()) {
+		if ( ! $createKey && ! $path->isFile()) {
 			return false;
 		}
 		if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
@@ -357,7 +357,7 @@ 
 			}
 			unset($path);
 
-			if (!$exists && !chmod($this->_File->getPathname(), (int)$this->settings['mask'])) {
+			if ( ! $exists && ! chmod($this->_File->getPathname(), (int) $this->settings['mask'])) {
 				trigger_error(__d(
 					'cake_dev', 'Could not apply permission mask "%s" on cache file "%s"',
 					array($this->_File->getPathname(), $this->settings['mask'])), E_USER_WARNING);
@@ -375,11 +375,11 @@ 
 		$dir = new SplFileInfo($this->settings['path']);
 		if (Configure::read('debug')) {
 			$path = $dir->getPathname();
-			if (!is_dir($path)) {
+			if ( ! is_dir($path)) {
 				mkdir($path, 0775, true);
 			}
 		}
-		if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
+		if ($this->_init && ! ($dir->isDir() && $dir->isWritable())) {
 			$this->_init = false;
 			trigger_error(__d('cake_dev', '%s is not writable', $this->settings['path']), E_USER_WARNING);
 			return false;
@@ -412,7 +412,7 @@ 
 		$directoryIterator = new RecursiveDirectoryIterator($this->settings['path']);
 		$contents = new RecursiveIteratorIterator($directoryIterator, RecursiveIteratorIterator::CHILD_FIRST);
 		foreach ($contents as $object) {
-			$containsGroup = strpos($object->getPathName(), DS . $group . DS) !== false;
+			$containsGroup = strpos($object->getPathName(), DS.$group.DS) !== false;
 			$hasPrefix = true;
 			if (strlen($this->settings['prefix']) !== 0) {
 				$hasPrefix = strpos($object->getBaseName(), $this->settings['prefix']) === 0;

lib/Cake/Cache/Engine/RedisEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
  *
  * @param string $key Identifier for the data
  * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
+ * @return integer incremented value, false otherwise
  * @throws CacheException when you try to increment with compress = true
  */
 	public function increment($key, $offset = 1) {
@@ -145,7 +145,7 @@ 
  *
  * @param string $key Identifier for the data
  * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
+ * @return integer decremented value, false otherwise
  * @throws CacheException when you try to decrement with compress = true
  */
 	public function decrement($key, $offset = 1) {

Indentation +15 added lines, -15 removed lines

@@ -1,20 +1,20 @@
 <?php
 /**
- * Redis storage engine for cache
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Cache.Engine
- * @since         CakePHP(tm) v 2.2
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * Redis storage engine for cache
+	 *
+	 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+	 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 *
+	 * Licensed under The MIT License
+	 * For full copyright and license information, please see the LICENSE.txt
+	 * Redistributions of files must retain the above copyright notice.
+	 *
+	 * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 * @link          http://cakephp.org CakePHP(tm) Project
+	 * @package       Cake.Cache.Engine
+	 * @since         CakePHP(tm) v 2.2
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 /**
  * Redis storage engine for cache.

Spacing +12 added lines, -12 removed lines

@@ -52,7 +52,7 @@ 
  * @return boolean True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
-		if (!class_exists('Redis')) {
+		if ( ! class_exists('Redis')) {
 			return false;
 		}
 		parent::init(array_merge(array(
@@ -101,7 +101,7 @@ 
  * @return boolean True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
-		if (!is_int($value)) {
+		if ( ! is_int($value)) {
 			$value = serialize($value);
 		}
 		if ($duration === 0) {
@@ -120,7 +120,7 @@ 
 	public function read($key) {
 		$value = $this->_Redis->get($key);
 		if (ctype_digit($value)) {
-			$value = (int)$value;
+			$value = (int) $value;
 		}
 		if ($value !== false && is_string($value)) {
 			$value = unserialize($value);
@@ -137,7 +137,7 @@ 
  * @throws CacheException when you try to increment with compress = true
  */
 	public function increment($key, $offset = 1) {
-		return (int)$this->_Redis->incrBy($key, $offset);
+		return (int) $this->_Redis->incrBy($key, $offset);
 	}
 
 /**
@@ -149,7 +149,7 @@ 
  * @throws CacheException when you try to decrement with compress = true
  */
 	public function decrement($key, $offset = 1) {
-		return (int)$this->_Redis->decrBy($key, $offset);
+		return (int) $this->_Redis->decrBy($key, $offset);
 	}
 
 /**
@@ -172,7 +172,7 @@ 
 		if ($check) {
 			return true;
 		}
-		$keys = $this->_Redis->getKeys($this->settings['prefix'] . '*');
+		$keys = $this->_Redis->getKeys($this->settings['prefix'].'*');
 		$this->_Redis->del($keys);
 
 		return true;
@@ -188,12 +188,12 @@ 
 	public function groups() {
 		$result = array();
 		foreach ($this->settings['groups'] as $group) {
-			$value = $this->_Redis->get($this->settings['prefix'] . $group);
-			if (!$value) {
+			$value = $this->_Redis->get($this->settings['prefix'].$group);
+			if ( ! $value) {
 				$value = 1;
-				$this->_Redis->set($this->settings['prefix'] . $group, $value);
+				$this->_Redis->set($this->settings['prefix'].$group, $value);
 			}
-			$result[] = $group . $value;
+			$result[] = $group.$value;
 		}
 		return $result;
 	}
@@ -205,14 +205,14 @@ 
  * @return boolean success
  */
 	public function clearGroup($group) {
-		return (bool)$this->_Redis->incr($this->settings['prefix'] . $group);
+		return (bool) $this->_Redis->incr($this->settings['prefix'].$group);
 	}
 
 /**
  * Disconnects from the redis server
  */
 	public function __destruct() {
-		if (!$this->settings['persistent']) {
+		if ( ! $this->settings['persistent']) {
 			$this->_Redis->close();
 		}
 	}