reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php

Indentation +14 added lines, -14 removed lines

@@ -35,27 +35,27 @@
  */
 class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		$this->_cellCache[$pCoord] = $cell;
 		return $cell;
 	}	//	function addCacheData()
 
 
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	/**
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		//	Check if the entry that has been requested actually exists
 		if (!isset($this->_cellCache[$pCoord])) {

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
      */
 	public function getCacheData($pCoord) {
 		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+		if ( ! isset($this->_cellCache[$pCoord])) {
 			//	Return null if requested entry doesn't exist in cache
 			return null;
 		}
@@ -78,7 +78,7 @@ 
 		parent::copyCellCollection($parent);
 
 		$newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
+		foreach ($this->_cellCache as $k => &$cell) {
 			$newCollection[$k] = clone $cell;
 			$newCollection[$k]->attach($parent);
 		}
@@ -94,7 +94,7 @@ 
 	 */
 	public function unsetWorksheetCells() {
 		//	Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-		foreach($this->_cellCache as $k => &$cell) {
+		foreach ($this->_cellCache as $k => &$cell) {
 			$cell->detach();
 			$this->_cellCache[$k] = null;
 		}

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php

Indentation +20 added lines, -20 removed lines

@@ -35,13 +35,13 @@ 
  */
 class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
@@ -53,14 +53,14 @@ 
 	}	//	function _storeData()
 
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
 			$this->_storeData();
@@ -74,13 +74,13 @@ 
 	}	//	function addCacheData()
 
 
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	/**
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			return $this->_currentObject;

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 		$this->_storeData();
 
 		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+		if ( ! isset($this->_cellCache[$pCoord])) {
 			//	Return null if requested entry doesn't exist in cache
 			return null;
 		}
@@ -110,7 +110,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php

Indentation +20 added lines, -20 removed lines

@@ -35,13 +35,13 @@ 
  */
 class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
@@ -53,14 +53,14 @@ 
 	}	//	function _storeData()
 
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
 			$this->_storeData();
@@ -74,13 +74,13 @@ 
 	}	//	function addCacheData()
 
 
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	/**
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			return $this->_currentObject;

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 		$this->_storeData();
 
 		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+		if ( ! isset($this->_cellCache[$pCoord])) {
 			//	Return null if requested entry doesn't exist in cache
 			return null;
 		}
@@ -110,7 +110,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php

Indentation +26 added lines, -26 removed lines

@@ -49,13 +49,13 @@ 
 	 */
 	private $_DBHandle = null;
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
@@ -68,14 +68,14 @@ 
 	}	//	function _storeData()
 
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
 			$this->_storeData();
@@ -89,13 +89,13 @@ 
 	}	//	function addCacheData()
 
 
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	/**
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			return $this->_currentObject;
@@ -148,12 +148,12 @@ 
 	}	//	function isDataSet()
 
 
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
+	/**
+	 * Delete a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to delete
+	 * @throws	Exception
+	 */
 	public function deleteCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			$this->_currentObject->detach();

Spacing +12 added lines, -12 removed lines

@@ -60,7 +60,7 @@ 
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
 
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
+			if ( ! $this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
 				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 			$this->_currentCellIsDirty = false;
 		}
@@ -103,7 +103,7 @@ 
 		$this->_storeData();
 
 		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+		$cellResultSet = $this->_DBHandle->query($query, SQLITE_ASSOC);
 		if ($cellResultSet === false) {
 			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 		} elseif ($cellResultSet->numRows() == 0) {
@@ -137,7 +137,7 @@ 
 
 		//	Check if the requested entry exists in the cache
 		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+		$cellResultSet = $this->_DBHandle->query($query, SQLITE_ASSOC);
 		if ($cellResultSet === false) {
 			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 		} elseif ($cellResultSet->numRows() == 0) {
@@ -162,7 +162,7 @@ 
 
 		//	Check if the requested entry exists in the cache
 		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
+		if ( ! $this->_DBHandle->queryExec($query))
 			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 
 		$this->_currentCellIsDirty = false;
@@ -176,12 +176,12 @@ 
 	 */
 	public function getCellList() {
 		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
+		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query, SQLITE_ASSOC);
 		if ($cellIdsResult === false)
 			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 
 		$cellKeys = array();
-		foreach($cellIdsResult as $row) {
+		foreach ($cellIdsResult as $row) {
 			$cellKeys[] = $row['id'];
 		}
 
@@ -197,8 +197,8 @@ 
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+		$tableName = str_replace('.', '_', $this->_getUniqueID());
+		if ( ! $this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
 													AS SELECT * FROM kvp_'.$this->_TableName))
 			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 
@@ -213,7 +213,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}
@@ -233,13 +233,13 @@ 
 	public function __construct(PHPExcel_Worksheet $parent) {
 		parent::__construct($parent);
 		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+			$this->_TableName = str_replace('.', '_', $this->_getUniqueID());
 			$_DBName = ':memory:';
 
 			$this->_DBHandle = new SQLiteDatabase($_DBName);
 			if ($this->_DBHandle === false)
 				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
+			if ( ! $this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
 				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
 		}
 	}	//	function __construct()
@@ -260,7 +260,7 @@ 
 	 * @return	boolean
 	 */
 	public static function cacheMethodIsAvailable() {
-		if (!function_exists('sqlite_open')) {
+		if ( ! function_exists('sqlite_open')) {
 			return false;
 		}
 

Braces +18 added lines, -12 removed lines

@@ -60,8 +60,9 @@ 
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
 
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')")) {
+							throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			}
 			$this->_currentCellIsDirty = false;
 		}
 		$this->_currentObjectID = $this->_currentObject = null;
@@ -162,8 +163,9 @@ 
 
 		//	Check if the requested entry exists in the cache
 		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		if (!$this->_DBHandle->queryExec($query)) {
+					throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		}
 
 		$this->_currentCellIsDirty = false;
 	}	//	function deleteCacheData()
@@ -177,8 +179,9 @@ 
 	public function getCellList() {
 		$query = "SELECT id FROM kvp_".$this->_TableName;
 		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-		if ($cellIdsResult === false)
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		if ($cellIdsResult === false) {
+					throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		}
 
 		$cellKeys = array();
 		foreach($cellIdsResult as $row) {
@@ -199,8 +202,9 @@ 
 		//	Get a new id for the new table name
 		$tableName = str_replace('.','_',$this->_getUniqueID());
 		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-													AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+													AS SELECT * FROM kvp_'.$this->_TableName)) {
+					throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		}
 
 		//	Copy the existing cell cache file
 		$this->_TableName = $tableName;
@@ -237,10 +241,12 @@ 
 			$_DBName = ':memory:';
 
 			$this->_DBHandle = new SQLiteDatabase($_DBName);
-			if ($this->_DBHandle === false)
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			if ($this->_DBHandle === false) {
+							throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			}
+			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+							throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			}
 		}
 	}	//	function __construct()
 

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
      *
      * @param	string			$pCoord		Coordinate address of the cell to update
      * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
+	 * @return	PHPExcel_Cell
      * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php

Indentation +26 added lines, -26 removed lines

@@ -49,13 +49,13 @@ 
 	 */
 	private $_DBHandle = null;
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
@@ -72,14 +72,14 @@ 
 	}	//	function _storeData()
 
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
 			$this->_storeData();
@@ -93,13 +93,13 @@ 
 	}	//	function addCacheData()
 
 
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	/**
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			return $this->_currentObject;
@@ -151,12 +151,12 @@ 
 	}	//	function isDataSet()
 
 
-    /**
-     *	Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
+	/**
+	 *	Delete a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to delete
+	 * @throws	Exception
+	 */
 	public function deleteCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			$this->_currentObject->detach();

Spacing +9 added lines, -9 removed lines

@@ -61,8 +61,8 @@ 
 			$this->_currentObject->detach();
 
 			$query = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-			$query->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-			$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
+			$query->bindValue('id', $this->_currentObjectID, SQLITE3_TEXT);
+			$query->bindValue('data', serialize($this->_currentObject), SQLITE3_BLOB);
 			$result = $query->execute();
 			if ($result === false)
 				throw new Exception($this->_DBHandle->lastErrorMsg());
@@ -201,8 +201,8 @@ 
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+		$tableName = str_replace('.', '_', $this->_getUniqueID());
+		if ( ! $this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
 		                                       AS SELECT * FROM kvp_'.$this->_TableName))
 			throw new Exception($this->_DBHandle->lastErrorMsg());
 
@@ -217,7 +217,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}
@@ -237,13 +237,13 @@ 
 	public function __construct(PHPExcel_Worksheet $parent) {
 		parent::__construct($parent);
 		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+			$this->_TableName = str_replace('.', '_', $this->_getUniqueID());
 			$_DBName = ':memory:';
 
 			$this->_DBHandle = new SQLite3($_DBName);
 			if ($this->_DBHandle === false)
 				throw new Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
+			if ( ! $this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
 				throw new Exception($this->_DBHandle->lastErrorMsg());
 		}
 	}	//	function __construct()
@@ -253,7 +253,7 @@ 
 	 * Destroy this cell collection
 	 */
 	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
+		if ( ! is_null($this->_DBHandle)) {
 			$this->_DBHandle->close();
 		}
 		$this->_DBHandle = null;
@@ -267,7 +267,7 @@ 
 	 * @return	boolean
 	 */
 	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3')) {
+		if ( ! class_exists('SQLite3')) {
 			return false;
 		}
 

Braces +18 added lines, -12 removed lines

@@ -64,8 +64,9 @@ 
 			$query->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
 			$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
 			$result = $query->execute();
-			if ($result === false)
-				throw new Exception($this->_DBHandle->lastErrorMsg());
+			if ($result === false) {
+							throw new Exception($this->_DBHandle->lastErrorMsg());
+			}
 			$this->_currentCellIsDirty = false;
 		}
 		$this->_currentObjectID = $this->_currentObject = null;
@@ -166,8 +167,9 @@ 
 		//	Check if the requested entry exists in the cache
 		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
 		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new Exception($this->_DBHandle->lastErrorMsg());
+		if ($result === false) {
+					throw new Exception($this->_DBHandle->lastErrorMsg());
+		}
 
 		$this->_currentCellIsDirty = false;
 	}	//	function deleteCacheData()
@@ -181,8 +183,9 @@ 
 	public function getCellList() {
 		$query = "SELECT id FROM kvp_".$this->_TableName;
 		$cellIdsResult = $this->_DBHandle->query($query);
-		if ($cellIdsResult === false)
-			throw new Exception($this->_DBHandle->lastErrorMsg());
+		if ($cellIdsResult === false) {
+					throw new Exception($this->_DBHandle->lastErrorMsg());
+		}
 
 		$cellKeys = array();
 		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
@@ -203,8 +206,9 @@ 
 		//	Get a new id for the new table name
 		$tableName = str_replace('.','_',$this->_getUniqueID());
 		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new Exception($this->_DBHandle->lastErrorMsg());
+		                                       AS SELECT * FROM kvp_'.$this->_TableName)) {
+					throw new Exception($this->_DBHandle->lastErrorMsg());
+		}
 
 		//	Copy the existing cell cache file
 		$this->_TableName = $tableName;
@@ -241,10 +245,12 @@ 
 			$_DBName = ':memory:';
 
 			$this->_DBHandle = new SQLite3($_DBName);
-			if ($this->_DBHandle === false)
-				throw new Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new Exception($this->_DBHandle->lastErrorMsg());
+			if ($this->_DBHandle === false) {
+							throw new Exception($this->_DBHandle->lastErrorMsg());
+			}
+			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+							throw new Exception($this->_DBHandle->lastErrorMsg());
+			}
 		}
 	}	//	function __construct()
 

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
      *
      * @param	string			$pCoord		Coordinate address of the cell to update
      * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
+	 * @return	PHPExcel_Cell
      * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {

app/Vendor/PHPExcel/PHPExcel/Calculation/Database.php

Spacing +67 added lines, -67 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -64,15 +64,15 @@ 
 	 * @return	string|NULL
 	 *
 	 */
-	private static function __fieldExtract($database,$field) {
+	private static function __fieldExtract($database, $field) {
 		$field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
-		$fieldNames = array_map('strtoupper',array_shift($database));
+		$fieldNames = array_map('strtoupper', array_shift($database));
 
 		if (is_numeric($field)) {
 			$keys = array_keys($fieldNames);
-			return $keys[$field-1];
+			return $keys[$field - 1];
 		}
-		$key = array_search($field,$fieldNames);
+		$key = array_search($field, $fieldNames);
 		return ($key) ? $key : NULL;
 	}
 
@@ -95,53 +95,53 @@ 
 	 * @return	array of mixed
 	 *
 	 */
-	private static function __filter($database,$criteria) {
+	private static function __filter($database, $criteria) {
 		$fieldNames = array_shift($database);
 		$criteriaNames = array_shift($criteria);
 
 		//	Convert the criteria into a set of AND/OR conditions with [:placeholders]
 		$testConditions = $testValues = array();
 		$testConditionsCount = 0;
-		foreach($criteriaNames as $key => $criteriaName) {
+		foreach ($criteriaNames as $key => $criteriaName) {
 			$testCondition = array();
 			$testConditionCount = 0;
-			foreach($criteria as $row => $criterion) {
+			foreach ($criteria as $row => $criterion) {
 				if ($criterion[$key] > '') {
 					$testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::_ifCondition($criterion[$key]);
 					$testConditionCount++;
 				}
 			}
 			if ($testConditionCount > 1) {
-				$testConditions[] = 'OR('.implode(',',$testCondition).')';
+				$testConditions[] = 'OR('.implode(',', $testCondition).')';
 				$testConditionsCount++;
-			} elseif($testConditionCount == 1) {
+			} elseif ($testConditionCount == 1) {
 				$testConditions[] = $testCondition[0];
 				$testConditionsCount++;
 			}
 		}
 
 		if ($testConditionsCount > 1) {
-			$testConditionSet = 'AND('.implode(',',$testConditions).')';
-		} elseif($testConditionsCount == 1) {
+			$testConditionSet = 'AND('.implode(',', $testConditions).')';
+		} elseif ($testConditionsCount == 1) {
 			$testConditionSet = $testConditions[0];
 		}
 
 		//	Loop through each row of the database
-		foreach($database as $dataRow => $dataValues) {
+		foreach ($database as $dataRow => $dataValues) {
 			//	Substitute actual values from the database row for our [:placeholders]
 			$testConditionList = $testConditionSet;
-			foreach($criteriaNames as $key => $criteriaName) {
-				$k = array_search($criteriaName,$fieldNames);
+			foreach ($criteriaNames as $key => $criteriaName) {
+				$k = array_search($criteriaName, $fieldNames);
 				if (isset($dataValues[$k])) {
 					$dataValue = $dataValues[$k];
 					$dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::_wrapResult(strtoupper($dataValue)) : $dataValue;
-					$testConditionList = str_replace('[:'.$criteriaName.']',$dataValue,$testConditionList);
+					$testConditionList = str_replace('[:'.$criteriaName.']', $dataValue, $testConditionList);
 				}
 			}
 			//	evaluate the criteria against the row data
 			$result = PHPExcel_Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
 			//	If the row failed to meet the criteria, remove it from the database
-			if (!$result) {
+			if ( ! $result) {
 				unset($database[$dataRow]);
 			}
 		}
@@ -177,16 +177,16 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DAVERAGE($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DAVERAGE($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -229,17 +229,17 @@ 
 	 *			database that match the criteria.
 	 *
 	 */
-	public static function DCOUNT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DCOUNT($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -278,17 +278,17 @@ 
 	 *			database that match the criteria.
 	 *
 	 */
-	public static function DCOUNTA($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DCOUNTA($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -325,17 +325,17 @@ 
 	 * @return	mixed
 	 *
 	 */
-	public static function DGET($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DGET($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -376,17 +376,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DMAX($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DMAX($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -423,17 +423,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DMIN($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DMIN($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -469,17 +469,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DPRODUCT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DPRODUCT($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -516,17 +516,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DSTDEV($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DSTDEV($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -563,17 +563,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DSTDEVP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DSTDEVP($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -609,17 +609,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DSUM($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DSUM($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -656,17 +656,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DVAR($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DVAR($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 
@@ -703,17 +703,17 @@ 
 	 * @return	float
 	 *
 	 */
-	public static function DVARP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+	public static function DVARP($database, $field, $criteria) {
+		$field = self::__fieldExtract($database, $field);
 		if (is_null($field)) {
 			return NULL;
 		}
 
 		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+		$database = self::__filter($database, $criteria);
 		//	extract an array of values for the requested column
 		$colData = array();
-		foreach($database as $row) {
+		foreach ($database as $row) {
 			$colData[] = $row[$field];
 		}
 

app/Vendor/PHPExcel/PHPExcel/Calculation/FormulaToken.php

Spacing +15 added lines, -15 removed lines

@@ -59,30 +59,30 @@ 
  */
 class PHPExcel_Calculation_FormulaToken {
 	/* Token types */
-	const TOKEN_TYPE_NOOP					= 'Noop';
-	const TOKEN_TYPE_OPERAND				= 'Operand';
+	const TOKEN_TYPE_NOOP = 'Noop';
+	const TOKEN_TYPE_OPERAND = 'Operand';
 	const TOKEN_TYPE_FUNCTION				= 'Function';
 	const TOKEN_TYPE_SUBEXPRESSION			= 'Subexpression';
 	const TOKEN_TYPE_ARGUMENT				= 'Argument';
 	const TOKEN_TYPE_OPERATORPREFIX			= 'OperatorPrefix';
 	const TOKEN_TYPE_OPERATORINFIX			= 'OperatorInfix';
 	const TOKEN_TYPE_OPERATORPOSTFIX		= 'OperatorPostfix';
-	const TOKEN_TYPE_WHITESPACE				= 'Whitespace';
-	const TOKEN_TYPE_UNKNOWN				= 'Unknown';
+	const TOKEN_TYPE_WHITESPACE = 'Whitespace';
+	const TOKEN_TYPE_UNKNOWN = 'Unknown';
 
 	/* Token subtypes */
-	const TOKEN_SUBTYPE_NOTHING				= 'Nothing';
-	const TOKEN_SUBTYPE_START				= 'Start';
+	const TOKEN_SUBTYPE_NOTHING = 'Nothing';
+	const TOKEN_SUBTYPE_START = 'Start';
 	const TOKEN_SUBTYPE_STOP				= 'Stop';
 	const TOKEN_SUBTYPE_TEXT				= 'Text';
-	const TOKEN_SUBTYPE_NUMBER				= 'Number';
-	const TOKEN_SUBTYPE_LOGICAL				= 'Logical';
+	const TOKEN_SUBTYPE_NUMBER = 'Number';
+	const TOKEN_SUBTYPE_LOGICAL = 'Logical';
 	const TOKEN_SUBTYPE_ERROR				= 'Error';
 	const TOKEN_SUBTYPE_RANGE				= 'Range';
-	const TOKEN_SUBTYPE_MATH				= 'Math';
-	const TOKEN_SUBTYPE_CONCATENATION		= 'Concatenation';
-	const TOKEN_SUBTYPE_INTERSECTION		= 'Intersection';
-	const TOKEN_SUBTYPE_UNION				= 'Union';
+	const TOKEN_SUBTYPE_MATH = 'Math';
+	const TOKEN_SUBTYPE_CONCATENATION = 'Concatenation';
+	const TOKEN_SUBTYPE_INTERSECTION = 'Intersection';
+	const TOKEN_SUBTYPE_UNION = 'Union';
 
 	/**
 	 * Value
@@ -115,9 +115,9 @@ 
     public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
     {
     	// Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
+    	$this->_value = $pValue;
+    	$this->_tokenType = $pTokenType;
+    	$this->_tokenSubType = $pTokenSubType;
     }
 
     /**

Indentation +68 added lines, -68 removed lines

@@ -105,72 +105,72 @@
 	 */
 	private $_tokenSubType;
 
-    /**
-     * Create a new PHPExcel_Calculation_FormulaToken
-     *
-     * @param string	$pValue
-     * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
-     * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
-     */
-    public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
-    {
-    	// Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
-    }
-
-    /**
-     * Get Value
-     *
-     * @return string
-     */
-    public function getValue() {
-    	return $this->_value;
-    }
-
-    /**
-     * Set Value
-     *
-     * @param string	$value
-     */
-    public function setValue($value) {
-    	$this->_value = $value;
-    }
-
-    /**
-     * Get Token Type (represented by TOKEN_TYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenType() {
-    	return $this->_tokenType;
-    }
-
-    /**
-     * Set Token Type
-     *
-     * @param string	$value
-     */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
-    	$this->_tokenType = $value;
-    }
-
-    /**
-     * Get Token SubType (represented by TOKEN_SUBTYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenSubType() {
-    	return $this->_tokenSubType;
-    }
-
-    /**
-     * Set Token SubType
-     *
-     * @param string	$value
-     */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-    	$this->_tokenSubType = $value;
-    }
+	/**
+	 * Create a new PHPExcel_Calculation_FormulaToken
+	 *
+	 * @param string	$pValue
+	 * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
+	 * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
+	 */
+	public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
+	{
+		// Initialise values
+		$this->_value				= $pValue;
+		$this->_tokenType			= $pTokenType;
+		$this->_tokenSubType 		= $pTokenSubType;
+	}
+
+	/**
+	 * Get Value
+	 *
+	 * @return string
+	 */
+	public function getValue() {
+		return $this->_value;
+	}
+
+	/**
+	 * Set Value
+	 *
+	 * @param string	$value
+	 */
+	public function setValue($value) {
+		$this->_value = $value;
+	}
+
+	/**
+	 * Get Token Type (represented by TOKEN_TYPE_*)
+	 *
+	 * @return string
+	 */
+	public function getTokenType() {
+		return $this->_tokenType;
+	}
+
+	/**
+	 * Set Token Type
+	 *
+	 * @param string	$value
+	 */
+	public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
+		$this->_tokenType = $value;
+	}
+
+	/**
+	 * Get Token SubType (represented by TOKEN_SUBTYPE_*)
+	 *
+	 * @return string
+	 */
+	public function getTokenSubType() {
+		return $this->_tokenSubType;
+	}
+
+	/**
+	 * Set Token SubType
+	 *
+	 * @param string	$value
+	 */
+	public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+		$this->_tokenSubType = $value;
+	}
 }

app/Vendor/PHPExcel/PHPExcel/Calculation/Function.php

Spacing +9 added lines, -9 removed lines

@@ -35,16 +35,16 @@ 
  */
 class PHPExcel_Calculation_Function {
 	/* Function categories */
-	const CATEGORY_CUBE						= 'Cube';
+	const CATEGORY_CUBE = 'Cube';
 	const CATEGORY_DATABASE					= 'Database';
-	const CATEGORY_DATE_AND_TIME			= 'Date and Time';
+	const CATEGORY_DATE_AND_TIME = 'Date and Time';
 	const CATEGORY_ENGINEERING				= 'Engineering';
 	const CATEGORY_FINANCIAL				= 'Financial';
 	const CATEGORY_INFORMATION				= 'Information';
-	const CATEGORY_LOGICAL					= 'Logical';
-	const CATEGORY_LOOKUP_AND_REFERENCE		= 'Lookup and Reference';
+	const CATEGORY_LOGICAL = 'Logical';
+	const CATEGORY_LOOKUP_AND_REFERENCE = 'Lookup and Reference';
 	const CATEGORY_MATH_AND_TRIG			= 'Math and Trig';
-	const CATEGORY_STATISTICAL				= 'Statistical';
+	const CATEGORY_STATISTICAL = 'Statistical';
 	const CATEGORY_TEXT_AND_DATA			= 'Text and Data';
 
 	/**
@@ -80,9 +80,9 @@ 
     {
     	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
     		// Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
+    		$this->_category = $pCategory;
+    		$this->_excelName = $pExcelName;
+    		$this->_phpExcelName = $pPHPExcelName;
     	} else {
     		throw new Exception("Invalid parameters passed.");
     	}
@@ -104,7 +104,7 @@ 
      * @throws 	Exception
      */
     public function setCategory($value = null) {
-    	if (!is_null($value)) {
+    	if ( ! is_null($value)) {
     		$this->_category = $value;
     	} else {
     		throw new Exception("Invalid parameter passed.");

Indentation +72 added lines, -72 removed lines

@@ -68,82 +68,82 @@
 	 */
 	private $_phpExcelName;
 
-    /**
-     * Create a new PHPExcel_Calculation_Function
-     *
-     * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
-     * @param 	string		$pExcelName		Excel function name
-     * @param 	string		$pPHPExcelName	PHPExcel function mapping
-     * @throws 	Exception
-     */
-    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
-    {
-    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
-    		// Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
-    	} else {
-    		throw new Exception("Invalid parameters passed.");
-    	}
-    }
+	/**
+	 * Create a new PHPExcel_Calculation_Function
+	 *
+	 * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
+	 * @param 	string		$pExcelName		Excel function name
+	 * @param 	string		$pPHPExcelName	PHPExcel function mapping
+	 * @throws 	Exception
+	 */
+	public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
+	{
+		if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
+			// Initialise values
+			$this->_category 		= $pCategory;
+			$this->_excelName 		= $pExcelName;
+			$this->_phpExcelName 	= $pPHPExcelName;
+		} else {
+			throw new Exception("Invalid parameters passed.");
+		}
+	}
 
-    /**
-     * Get Category (represented by CATEGORY_*)
-     *
-     * @return string
-     */
-    public function getCategory() {
-    	return $this->_category;
-    }
+	/**
+	 * Get Category (represented by CATEGORY_*)
+	 *
+	 * @return string
+	 */
+	public function getCategory() {
+		return $this->_category;
+	}
 
-    /**
-     * Set Category (represented by CATEGORY_*)
-     *
-     * @param 	string		$value
-     * @throws 	Exception
-     */
-    public function setCategory($value = null) {
-    	if (!is_null($value)) {
-    		$this->_category = $value;
-    	} else {
-    		throw new Exception("Invalid parameter passed.");
-    	}
-    }
+	/**
+	 * Set Category (represented by CATEGORY_*)
+	 *
+	 * @param 	string		$value
+	 * @throws 	Exception
+	 */
+	public function setCategory($value = null) {
+		if (!is_null($value)) {
+			$this->_category = $value;
+		} else {
+			throw new Exception("Invalid parameter passed.");
+		}
+	}
 
-    /**
-     * Get Excel name
-     *
-     * @return string
-     */
-    public function getExcelName() {
-    	return $this->_excelName;
-    }
+	/**
+	 * Get Excel name
+	 *
+	 * @return string
+	 */
+	public function getExcelName() {
+		return $this->_excelName;
+	}
 
-    /**
-     * Set Excel name
-     *
-     * @param string	$value
-     */
-    public function setExcelName($value) {
-    	$this->_excelName = $value;
-    }
+	/**
+	 * Set Excel name
+	 *
+	 * @param string	$value
+	 */
+	public function setExcelName($value) {
+		$this->_excelName = $value;
+	}
 
-    /**
-     * Get PHPExcel name
-     *
-     * @return string
-     */
-    public function getPHPExcelName() {
-    	return $this->_phpExcelName;
-    }
+	/**
+	 * Get PHPExcel name
+	 *
+	 * @return string
+	 */
+	public function getPHPExcelName() {
+		return $this->_phpExcelName;
+	}
 
-    /**
-     * Set PHPExcel name
-     *
-     * @param string	$value
-     */
-    public function setPHPExcelName($value) {
-    	$this->_phpExcelName = $value;
-    }
+	/**
+	 * Set PHPExcel name
+	 *
+	 * @param string	$value
+	 */
+	public function setPHPExcelName($value) {
+		$this->_phpExcelName = $value;
+	}
 }

app/Vendor/PHPExcel/PHPExcel/Calculation/Functions.php

Spacing +70 added lines, -71 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -59,13 +59,13 @@ 
 class PHPExcel_Calculation_Functions {
 
 	/** constants */
-	const COMPATIBILITY_EXCEL		= 'Excel';
+	const COMPATIBILITY_EXCEL = 'Excel';
 	const COMPATIBILITY_GNUMERIC	= 'Gnumeric';
-	const COMPATIBILITY_OPENOFFICE	= 'OpenOfficeCalc';
+	const COMPATIBILITY_OPENOFFICE = 'OpenOfficeCalc';
 
 	const RETURNDATE_PHP_NUMERIC	= 'P';
 	const RETURNDATE_PHP_OBJECT		= 'O';
-	const RETURNDATE_EXCEL			= 'E';
+	const RETURNDATE_EXCEL = 'E';
 
 
 	/**
@@ -74,7 +74,7 @@ 
 	 * @access	private
 	 * @var string
 	 */
-	protected static $compatibilityMode	= self::COMPATIBILITY_EXCEL;
+	protected static $compatibilityMode = self::COMPATIBILITY_EXCEL;
 
 	/**
 	 * Data Type to use when returning date values
@@ -82,7 +82,7 @@ 
 	 * @access	private
 	 * @var string
 	 */
-	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
+	protected static $ReturnDateType = self::RETURNDATE_EXCEL;
 
 	/**
 	 * List of error codes
@@ -90,7 +90,7 @@ 
 	 * @access	private
 	 * @var array
 	 */
-	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
+	protected static $_errorCodes = array('null'				=> '#NULL!',
 											 'divisionbyzero'	=> '#DIV/0!',
 											 'value'			=> '#VALUE!',
 											 'reference'		=> '#REF!',
@@ -292,29 +292,29 @@ 
 
 
 	public static function isMatrixValue($idx) {
-		return ((substr_count($idx,'.') <= 1) || (preg_match('/\.[A-Z]/',$idx) > 0));
+		return ((substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0));
 	}
 
 
 	public static function isValue($idx) {
-		return (substr_count($idx,'.') == 0);
+		return (substr_count($idx, '.') == 0);
 	}
 
 
 	public static function isCellValue($idx) {
-		return (substr_count($idx,'.') > 1);
+		return (substr_count($idx, '.') > 1);
 	}
 
 
 	public static function _ifCondition($condition) {
-		$condition	= PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		if (!in_array($condition{0},array('>', '<', '='))) {
-			if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
+		$condition = PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+		if ( ! in_array($condition{0},array('>', '<', '='))) {
+			if ( ! is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
 			return '='.$condition;
 		} else {
-			preg_match('/([<>=]+)(.*)/',$condition,$matches);
-			list(,$operator,$operand) = $matches;
-			if (!is_numeric($operand)) { $operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
+			preg_match('/([<>=]+)(.*)/', $condition, $matches);
+			list(,$operator, $operand) = $matches;
+			if ( ! is_numeric($operand)) { $operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
 			return $operator.$operand;
 		}
 	}	//	function _ifCondition()
@@ -327,10 +327,10 @@ 
 	 * @return	boolean
 	 */
 	public static function ERROR_TYPE($value = '') {
-		$value	= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
 		$i = 1;
-		foreach(self::$_errorCodes as $errorCode) {
+		foreach (self::$_errorCodes as $errorCode) {
 			if ($value === $errorCode) {
 				return $i;
 			}
@@ -347,8 +347,8 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_BLANK($value = NULL) {
-		if (!is_null($value)) {
-			$value	= self::flattenSingleValue($value);
+		if ( ! is_null($value)) {
+			$value = self::flattenSingleValue($value);
 		}
 
 		return is_null($value);
@@ -362,9 +362,9 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_ERR($value = '') {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
-		return self::IS_ERROR($value) && (!self::IS_NA($value));
+		return self::IS_ERROR($value) && ( ! self::IS_NA($value));
 	}	//	function IS_ERR()
 
 
@@ -375,9 +375,9 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_ERROR($value = '') {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
-		if (!is_string($value))
+		if ( ! is_string($value))
 			return false;
 		return in_array($value, array_values(self::$_errorCodes));
 	}	//	function IS_ERROR()
@@ -390,7 +390,7 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_NA($value = '') {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
 		return ($value === self::NA());
 	}	//	function IS_NA()
@@ -407,7 +407,7 @@ 
 
 		if ($value === NULL)
 			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+		if ((is_bool($value)) || ((is_string($value)) && ( ! is_numeric($value))))
 			return self::VALUE();
 		return ($value % 2 == 0);
 	}	//	function IS_EVEN()
@@ -424,7 +424,7 @@ 
 
 		if ($value === NULL)
 			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+		if ((is_bool($value)) || ((is_string($value)) && ( ! is_numeric($value))))
 			return self::VALUE();
 		return (abs($value) % 2 == 1);
 	}	//	function IS_ODD()
@@ -437,7 +437,7 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_NUMBER($value = NULL) {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
 		if (is_string($value)) {
 			return False;
@@ -453,7 +453,7 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_LOGICAL($value = NULL) {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
 		return is_bool($value);
 	}	//	function IS_LOGICAL()
@@ -466,9 +466,9 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_TEXT($value = NULL) {
-		$value		= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
-		return (is_string($value) && !self::IS_ERROR($value));
+		return (is_string($value) && ! self::IS_ERROR($value));
 	}	//	function IS_TEXT()
 
 
@@ -479,7 +479,7 @@ 
 	 * @return	boolean
 	 */
 	public static function IS_NONTEXT($value = NULL) {
-		return !self::IS_TEXT($value);
+		return ! self::IS_TEXT($value);
 	}	//	function IS_NONTEXT()
 
 
@@ -548,7 +548,7 @@ 
 	 *		Array or Matrix		64
 	 */
 	public static function TYPE($value = NULL) {
-		$value	= self::flattenArrayIndexed($value);
+		$value = self::flattenArrayIndexed($value);
 		if (is_array($value) && (count($value) > 1)) {
 			$a = array_keys($value);
 			$a = array_pop($a);
@@ -559,20 +559,20 @@ 
 			} elseif (self::isMatrixValue($a)) {
 				return 64;
 			}
-		} elseif(empty($value)) {
+		} elseif (empty($value)) {
 			//	Empty Cell
 			return 1;
 		}
-		$value	= self::flattenSingleValue($value);
+		$value = self::flattenSingleValue($value);
 
 		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
 				return 1;
-		} elseif(is_bool($value)) {
+		} elseif (is_bool($value)) {
 				return 4;
-		} elseif(is_array($value)) {
+		} elseif (is_array($value)) {
 				return 64;
 				break;
-		} elseif(is_string($value)) {
+		} elseif (is_string($value)) {
 			//	Errors
 			if ((strlen($value) > 0) && ($value{0} == '#')) {
 				return 16;
@@ -590,7 +590,7 @@ 
 	 * @return	array	Flattened array
 	 */
 	public static function flattenArray($array) {
-		if (!is_array($array)) {
+		if ( ! is_array($array)) {
 			return (array) $array;
 		}
 
@@ -622,7 +622,7 @@ 
 	 * @return	array	Flattened array
 	 */
 	public static function flattenArrayIndexed($array) {
-		if (!is_array($array)) {
+		if ( ! is_array($array)) {
 			return (array) $array;
 		}
 
@@ -669,27 +669,27 @@ 
 //	These functions aren't available in Windows implementations of PHP prior to version 5.3.0
 //	So we test if they do exist for this version of PHP/operating platform; and if not we create them
 //
-if (!function_exists('acosh')) {
+if ( ! function_exists('acosh')) {
 	function acosh($x) {
 		return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
 	}	//	function acosh()
 }
 
-if (!function_exists('asinh')) {
+if ( ! function_exists('asinh')) {
 	function asinh($x) {
 		return log($x + sqrt(1 + $x * $x));
 	}	//	function asinh()
 }
 
-if (!function_exists('atanh')) {
+if ( ! function_exists('atanh')) {
 	function atanh($x) {
 		return (log(1 + $x) - log(1 - $x)) / 2;
 	}	//	function atanh()
 }
 
-if (!function_exists('money_format')) {
+if ( ! function_exists('money_format')) {
 	function money_format($format, $number) {
-		$regex = array( '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
+		$regex = array('/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
 						 '(?:\.([0-9]+))?([in%])/'
 					  );
 		$regex = implode('', $regex);
@@ -698,19 +698,19 @@ 
 		}
 		$locale = localeconv();
 		$number = floatval($number);
-		if (!preg_match($regex, $format, $fmatch)) {
+		if ( ! preg_match($regex, $format, $fmatch)) {
 			trigger_error("No format specified or invalid format", E_USER_WARNING);
 			return $number;
 		}
-		$flags = array( 'fillchar'	=> preg_match('/\=(.)/', $fmatch[1], $match) ? $match[1] : ' ',
+		$flags = array('fillchar'	=> preg_match('/\=(.)/', $fmatch[1], $match) ? $match[1] : ' ',
 						'nogroup'	=> preg_match('/\^/', $fmatch[1]) > 0,
 						'usesignal'	=> preg_match('/\+|\(/', $fmatch[1], $match) ? $match[0] : '+',
 						'nosimbol'	=> preg_match('/\!/', $fmatch[1]) > 0,
 						'isleft'	=> preg_match('/\-/', $fmatch[1]) > 0
 					  );
-		$width	= trim($fmatch[2]) ? (int)$fmatch[2] : 0;
-		$left	= trim($fmatch[3]) ? (int)$fmatch[3] : 0;
-		$right	= trim($fmatch[4]) ? (int)$fmatch[4] : $locale['int_frac_digits'];
+		$width	= trim($fmatch[2]) ? (int) $fmatch[2] : 0;
+		$left = trim($fmatch[3]) ? (int) $fmatch[3] : 0;
+		$right	= trim($fmatch[4]) ? (int) $fmatch[4] : $locale['int_frac_digits'];
 		$conversion = $fmatch[5];
 		$positive = true;
 		if ($number < 0) {
@@ -719,7 +719,7 @@ 
 		}
 		$letter = $positive ? 'p' : 'n';
 		$prefix = $suffix = $cprefix = $csuffix = $signal = '';
-		if (!$positive) {
+		if ( ! $positive) {
 			$signal = $locale['negative_sign'];
 			switch (true) {
 				case $locale['n_sign_posn'] == 0 || $flags['usesignal'] == '(':
@@ -740,23 +740,22 @@ 
 					break;
 			}
 		}
-		if (!$flags['nosimbol']) {
+		if ( ! $flags['nosimbol']) {
 			$currency = $cprefix;
 			$currency .= ($conversion == 'i' ? $locale['int_curr_symbol'] : $locale['currency_symbol']);
 			$currency .= $csuffix;
-			$currency = iconv('ISO-8859-1','UTF-8',$currency);
+			$currency = iconv('ISO-8859-1', 'UTF-8', $currency);
 		} else {
 			$currency = '';
 		}
 		$space = $locale["{$letter}_sep_by_space"] ? ' ' : '';
 
-		if (!isset($locale['mon_decimal_point']) || empty($locale['mon_decimal_point'])) {
-			$locale['mon_decimal_point'] = (!isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
-											$locale['decimal_point'] :
-											'.';
+		if ( ! isset($locale['mon_decimal_point']) || empty($locale['mon_decimal_point'])) {
+			$locale['mon_decimal_point'] = ( ! isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
+											$locale['decimal_point'] : '.';
 		}
 
-		$number = number_format($number, $right, $locale['mon_decimal_point'], $flags['nogroup'] ? '' : $locale['mon_thousands_sep'] );
+		$number = number_format($number, $right, $locale['mon_decimal_point'], $flags['nogroup'] ? '' : $locale['mon_thousands_sep']);
 		$number = explode($locale['mon_decimal_point'], $number);
 
 		$n = strlen($prefix) + strlen($currency);
@@ -764,14 +763,14 @@ 
 			if ($flags['isleft']) {
 				$number[0] .= str_repeat($flags['fillchar'], $left - $n);
 			} else {
-				$number[0] = str_repeat($flags['fillchar'], $left - $n) . $number[0];
+				$number[0] = str_repeat($flags['fillchar'], $left - $n).$number[0];
 			}
 		}
 		$number = implode($locale['mon_decimal_point'], $number);
 		if ($locale["{$letter}_cs_precedes"]) {
-			$number = $prefix . $currency . $space . $number . $suffix;
+			$number = $prefix.$currency.$space.$number.$suffix;
 		} else {
-			$number = $prefix . $number . $space . $currency . $suffix;
+			$number = $prefix.$number.$space.$currency.$suffix;
 		}
 		if ($width > 0) {
 			$number = str_pad($number, $width, $flags['fillchar'], $flags['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT);
@@ -786,25 +785,25 @@ 
 //	Strangely, PHP doesn't have a mb_str_replace multibyte function
 //	As we'll only ever use this function with UTF-8 characters, we can simply "hard-code" the character set
 //
-if ((!function_exists('mb_str_replace')) &&
+if (( ! function_exists('mb_str_replace')) &&
 	(function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
 	function mb_str_replace($search, $replace, $subject) {
-		if(is_array($subject)) {
+		if (is_array($subject)) {
 			$ret = array();
-			foreach($subject as $key => $val) {
+			foreach ($subject as $key => $val) {
 				$ret[$key] = mb_str_replace($search, $replace, $val);
 			}
 			return $ret;
 		}
 
-		foreach((array) $search as $key => $s) {
-			if($s == '') {
+		foreach ((array) $search as $key => $s) {
+			if ($s == '') {
 				continue;
 			}
-			$r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
+			$r = ! is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
 			$pos = mb_strpos($subject, $s, 0, 'UTF-8');
-			while($pos !== false) {
-				$subject = mb_substr($subject, 0, $pos, 'UTF-8') . $r . mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
+			while ($pos !== false) {
+				$subject = mb_substr($subject, 0, $pos, 'UTF-8').$r.mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
 				$pos = mb_strpos($subject, $s, $pos + mb_strlen($r, 'UTF-8'), 'UTF-8');
 			}
 		}

Braces +15 added lines, -10 removed lines

@@ -377,8 +377,9 @@ 
 	public static function IS_ERROR($value = '') {
 		$value		= self::flattenSingleValue($value);
 
-		if (!is_string($value))
-			return false;
+		if (!is_string($value)) {
+					return false;
+		}
 		return in_array($value, array_values(self::$_errorCodes));
 	}	//	function IS_ERROR()
 
@@ -405,10 +406,12 @@ 
 	public static function IS_EVEN($value = NULL) {
 		$value = self::flattenSingleValue($value);
 
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
+		if ($value === NULL) {
+					return self::NAME();
+		}
+		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+					return self::VALUE();
+		}
 		return ($value % 2 == 0);
 	}	//	function IS_EVEN()
 
@@ -422,10 +425,12 @@ 
 	public static function IS_ODD($value = NULL) {
 		$value = self::flattenSingleValue($value);
 
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
+		if ($value === NULL) {
+					return self::NAME();
+		}
+		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+					return self::VALUE();
+		}
 		return (abs($value) % 2 == 1);
 	}	//	function IS_ODD()
 

Doc Comments +8 added lines, -2 removed lines

@@ -400,7 +400,7 @@ 
 	 * IS_EVEN
 	 *
 	 * @param	mixed	$value	Value to check
-	 * @return	boolean
+	 * @return	string|boolean
 	 */
 	public static function IS_EVEN($value = NULL) {
 		$value = self::flattenSingleValue($value);
@@ -417,7 +417,7 @@ 
 	 * IS_ODD
 	 *
 	 * @param	mixed	$value	Value to check
-	 * @return	boolean
+	 * @return	string|boolean
 	 */
 	public static function IS_ODD($value = NULL) {
 		$value = self::flattenSingleValue($value);
@@ -688,6 +688,12 @@ 
 }
 
 if (!function_exists('money_format')) {
+
+	/**
+	 * @param string $format
+	 *
+	 * @return string
+	 */
 	function money_format($format, $number) {
 		$regex = array( '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
 						 '(?:\.([0-9]+))?([in%])/'