pradosoft / prado

framework/Data/Common/Oracle/TOracleTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 class TOracleTableColumn extends TDbTableColumn
 {
 	private static $types=array(
-		'numeric' => array( 'numeric' )
+		'numeric' => array('numeric')
 //		'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'),
 //		'boolean' => array('boolean'),
 //		'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric')
@@ -36,7 +36,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		$columns = array();
+		$columns=array();
 		foreach($fields as $field)
 		{
 			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+				$columns[]=$field;
 		}
 		return parent::getSearchExpression($columns, $keywords);
 	}
@@ -44,9 +44,9 @@ 
 	 */
 	protected function isSearchableColumn($column)
 	{
-		$type = strtolower($column->getDbType());
-		return $type === 'character varying' || $type === 'varchar' ||
-				$type === 'character' || $type === 'char' || $type === 'text';
+		$type=strtolower($column->getDbType());
+		return $type==='character varying' || $type==='varchar' ||
+				$type==='character' || $type==='char' || $type==='text';
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	{
 		$conditions=array();
 		foreach($words as $word)
-			$conditions[] = $column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+			$conditions[]=$column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
 		return '('.implode(' AND ', $conditions).')';
 	}
 

framework/Data/Common/TDbCommandBuilder.php

Spacing +80 added lines, -80 removed lines

@@ -88,10 +88,10 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? (int)$limit : -1;
-		$offset = $offset!==null ? (int)$offset : -1;
-		$limitStr = $limit >= 0 ? ' LIMIT '.$limit : '';
-		$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+		$limit=$limit!==null ? (int) $limit : -1;
+		$offset=$offset!==null ? (int) $offset : -1;
+		$limitStr=$limit >= 0 ? ' LIMIT '.$limit : '';
+		$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 		return $sql.$limitStr.$offsetStr;
 	}
 
@@ -105,18 +105,18 @@ 
 		$orders=array();
 		foreach($ordering as $name => $direction)
 		{
-			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			$direction=strtolower($direction)=='desc' ? 'DESC' : 'ASC';
+			if(false!==strpos($name, '(') && false!==strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
-				$key = $name;
+				$key=$name;
 			} else {
 				// key is a column
-				$key = $this->getTableInfo()->getColumn($name)->getColumnName();
+				$key=$this->getTableInfo()->getColumn($name)->getColumnName();
 			}
-			$orders[] = $key.' '.$direction;
+			$orders[]=$key.' '.$direction;
 		}
 		if(count($orders) > 0)
-			$sql .= ' ORDER BY '.implode(', ', $orders);
+			$sql.=' ORDER BY '.implode(', ', $orders);
 		return $sql;
 	}
 
@@ -130,13 +130,13 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
-		$words = preg_split('/\s/u', $keywords);
-		$conditions = array();
+		if(strlen(trim($keywords))==0) return '';
+		$words=preg_split('/\s/u', $keywords);
+		$conditions=array();
 		foreach($fields as $field)
 		{
-			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
-			$conditions[] = $this->getSearchCondition($column, $words);
+			$column=$this->getTableInfo()->getColumn($field)->getColumnName();
+			$conditions[]=$this->getSearchCondition($column, $words);
 		}
 		return '('.implode(' OR ', $conditions).')';
 	}
@@ -150,7 +150,7 @@ 
 	{
 		$conditions=array();
 		foreach($words as $word)
-			$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+			$conditions[]=$column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
 		return '('.implode(' AND ', $conditions).')';
 	}
 
@@ -195,102 +195,102 @@ 
 	 */
 	public function getSelectFieldList($data='*') {
 		if(is_scalar($data)) {
-			$tmp = explode(',', $data);
-			$result = array();
+			$tmp=explode(',', $data);
+			$result=array();
 			foreach($tmp as $v)
-				$result[] = trim($v);
+				$result[]=trim($v);
 			return $result;
 		}
 
-		$bHasWildcard = false;
-		$result = array();
+		$bHasWildcard=false;
+		$result=array();
 		if(is_array($data) || $data instanceof Traversable) {
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			foreach($data as $key=>$value) {
 				if($key==='*' || $value==='*') {
-					$bHasWildcard = true;
+					$bHasWildcard=true;
 					continue;
 				}
 
 				if(strToUpper($key)==='NULL') {
-					$result[] = 'NULL';
+					$result[]='NULL';
 					continue;
 				}
 
 				if(strpos($key, '(')!==false && strpos($key, ')')!==false) {
-					$result[] = $key;
+					$result[]=$key;
 					continue;
 				}
 
 				if(stripos($key, 'AS')!==false) {
-					$result[] = $key;
+					$result[]=$key;
 					continue;
 				}
 
 				if(stripos($value, 'AS')!==false) {
-					$result[] = $value;
+					$result[]=$value;
 					continue;
 				}
 
-				$v = isset($columns[$value]);
-				$k = isset($columns[$key]);
+				$v=isset($columns[$value]);
+				$k=isset($columns[$key]);
 				if(is_integer($key) && $v) {
-					$key = $value;
-					$k = $v;
+					$key=$value;
+					$k=$v;
 				}
 
 				if(strToUpper($value)==='NULL') {
 					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+						$result[]='NULL AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[]='NULL'.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
 				if(strpos($value, '(')!==false && strpos($value, ')')!==false) {
 					if($k)
-						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+						$result[]=$value.' AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[]=$value.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
 				if($v && $key==$value) {
-					$result[] = $columns[$value]->getColumnName();
+					$result[]=$columns[$value]->getColumnName();
 					continue;
 				}
 
 				if($k && $value==null) {
-					$result[] = $columns[$key]->getColumnName();
+					$result[]=$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($key) && $v) {
-					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
+					$result[]=$columns[$value]->getColumnName().' AS '.$key;
 					continue;
 				}
 
 				if(is_numeric($value) && $k) {
-					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$value.' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($value) && $k) {
-					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$this->getDbConnection()->quoteString($value).' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(!$v && !$k && is_integer($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+					$result[]=is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value);
 					continue;
 				}
 
-				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value)) . ' AS ' . $key;
+				$result[]=(is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value)).' AS '.$key;
 			}
 		}
 
-		if($data===null || count($result) == 0 || $bHasWildcard)
-			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
+		if($data===null || count($result)==0 || $bHasWildcard)
+			$result=$result=array_merge($this->getTableInfo()->getColumnNames(), $result);
 
 		return $result;
 	}
@@ -304,21 +304,21 @@ 
 	 */
 	public function createFindCommand($where='1=1', $parameters=array(), $ordering=array(), $limit=-1, $offset=-1, $select='*')
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		$fields = implode(', ', $this -> getSelectFieldList($select));
-		$sql = "SELECT {$fields} FROM {$table}";
+		$table=$this->getTableInfo()->getTableFullName();
+		$fields=implode(', ', $this -> getSelectFieldList($select));
+		$sql="SELECT {$fields} FROM {$table}";
 		if(!empty($where))
-			$sql .= " WHERE {$where}";
+			$sql.=" WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
-	public function applyCriterias($sql, $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function applyCriterias($sql, $parameters=array(), $ordering=array(), $limit=-1, $offset=-1)
 	{
 		if(count($ordering) > 0)
-			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
-			$sql = $this->applyLimitOffset($sql, $limit, $offset);
-		$command = $this->createCommand($sql);
+			$sql=$this->applyOrdering($sql, $ordering);
+		if($limit >= 0 || $offset >= 0)
+			$sql=$this->applyLimitOffset($sql, $limit, $offset);
+		$command=$this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -329,7 +329,7 @@ 
 	 * @param array binding parameters.
 	 * @return TDbCommand count command.
 	 */
-	public function createCountCommand($where='1=1', $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function createCountCommand($where='1=1', $parameters=array(), $ordering=array(), $limit=-1, $offset=-1)
 	{
 		return $this->createFindCommand($where, $parameters, $ordering, $limit, $offset, 'COUNT(*)');
 	}
@@ -342,12 +342,12 @@ 
 	 * @param array delete parameters.
 	 * @return TDbCommand delete command.
 	 */
-	public function createDeleteCommand($where,$parameters=array())
+	public function createDeleteCommand($where, $parameters=array())
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("DELETE FROM {$table}".$where);
+		$table=$this->getTableInfo()->getTableFullName();
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("DELETE FROM {$table}".$where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -362,9 +362,9 @@ 
 	 */
 	public function createInsertCommand($data)
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		list($fields, $bindings) = $this->getInsertFieldBindings($data);
-		$command = $this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
+		$table=$this->getTableInfo()->getTableFullName();
+		list($fields, $bindings)=$this->getInsertFieldBindings($data);
+		$command=$this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
 		$this->bindColumnValues($command, $data);
 		return $command;
 	}
@@ -379,15 +379,15 @@ 
 	 */
 	public function createUpdateCommand($data, $where, $parameters=array())
 	{
-		$table = $this->getTableInfo()->getTableFullName();
+		$table=$this->getTableInfo()->getTableFullName();
 		if($this->hasIntegerKey($parameters))
-			$fields = implode(', ', $this->getColumnBindings($data, true));
+			$fields=implode(', ', $this->getColumnBindings($data, true));
 		else
-			$fields = implode(', ', $this->getColumnBindings($data));
+			$fields=implode(', ', $this->getColumnBindings($data));
 
-		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}".$where);
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("UPDATE {$table} SET {$fields}".$where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}
@@ -399,13 +399,13 @@ 
 	 */
 	protected function getInsertFieldBindings($values)
 	{
-		$fields = array(); $bindings=array();
+		$fields=array(); $bindings=array();
 		foreach(array_keys($values) as $name)
 		{
-			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = ':'.$name;
+			$fields[]=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=':'.$name;
 		}
-		return array(implode(', ',$fields), implode(', ', $bindings));
+		return array(implode(', ', $fields), implode(', ', $bindings));
 	}
 
 	/**
@@ -419,8 +419,8 @@ 
 		$bindings=array();
 		foreach(array_keys($values) as $name)
 		{
-			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = $position ? $column.' = ?' : $column.' = :'.$name;
+			$column=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=$position ? $column.' = ?' : $column.' = :'.$name;
 		}
 		return $bindings;
 	}
@@ -444,8 +444,8 @@ 
 	{
 		foreach($values as $name=>$value)
 		{
-			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
+			$column=$this->getTableInfo()->getColumn($name);
+			if($value===null && $column->getAllowNull())
 				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
 			else
 				$command->bindValue(':'.$name, $value, $column->getPdoType());
@@ -460,15 +460,15 @@ 
 	{
 		if($this->hasIntegerKey($values))
 		{
-			$values = array_values($values);
-			for($i = 0, $max=count($values); $i<$max; $i++)
-				$command->bindValue($i+1, $values[$i], $this->getPdoType($values[$i]));
+			$values=array_values($values);
+			for($i=0, $max=count($values); $i < $max; $i++)
+				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
 		}
 		else
 		{
 			foreach($values as $name=>$value)
 			{
-				$prop = $name[0]===':' ? $name : ':'.$name;
+				$prop=$name[0]===':' ? $name : ':'.$name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
 		}

Doc Comments +1 added lines, -2 removed lines

@@ -191,7 +191,6 @@ 
 	 * array('col1' => 'NULL', '*')
 	 * // SELECT `col1`, `col2`, `col3`, NULL AS `col1` FROM...
 	 * </code>
-	 * @param mixed $value
 	 * @return array of generated fields - use implode(', ', $selectfieldlist) to collapse field list for usage
 	 * @since 3.1.7
 	 * @todo add support for table aliasing
@@ -399,7 +398,7 @@ 
 	/**
 	 * Returns a list of insert field name and a list of binding names.
 	 * @param object array or object to be inserted.
-	 * @return array tuple ($fields, $bindings)
+	 * @return string[] tuple ($fields, $bindings)
 	 */
 	protected function getInsertFieldBindings($values)
 	{

Braces +1 added lines, -2 removed lines

@@ -467,8 +467,7 @@
 			$values = array_values($values);
 			for($i = 0, $max=count($values); $i<$max; $i++)
 				$command->bindValue($i+1, $values[$i], $this->getPdoType($values[$i]));
-		}
-		else
+		} else
 		{
 			foreach($values as $name=>$value)
 			{

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Spacing +19 added lines, -19 removed lines

@@ -31,7 +31,7 @@ 
 		{
 			if($column->hasSequence())
 			{
-				$command = $this->getDbConnection()->createCommand('SELECT @@Identity');
+				$command=$this->getDbConnection()->createCommand('SELECT @@Identity');
 				return intval($command->queryScalar());
 			}
 		}
@@ -79,12 +79,12 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
-		if ($limit > 0 && $offset <= 0) //just limit
-			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i',"\\1SELECT\\2 TOP $limit", $sql);
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
+		if($limit > 0 && $offset <= 0) //just limit
+			$sql=preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
 		else if($limit > 0 && $offset > 0)
-			$sql = $this->rewriteLimitOffsetSql($sql, $limit,$offset);
+			$sql=$this->rewriteLimitOffsetSql($sql, $limit, $offset);
 		return $sql;
 	}
 
@@ -98,13 +98,13 @@ 
 	 */
 	protected function rewriteLimitOffsetSql($sql, $limit, $offset)
 	{
-		$fetch = $limit+$offset;
-		$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i',"\\1SELECT\\2 TOP $fetch", $sql);
-		$ordering = $this->findOrdering($sql);
+		$fetch=$limit + $offset;
+		$sql=preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $fetch", $sql);
+		$ordering=$this->findOrdering($sql);
 
-		$orginalOrdering = $this->joinOrdering($ordering);
-		$reverseOrdering = $this->joinOrdering($this->reverseDirection($ordering));
-		$sql = "SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
+		$orginalOrdering=$this->joinOrdering($ordering);
+		$reverseOrdering=$this->joinOrdering($this->reverseDirection($ordering));
+		$sql="SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
 		return $sql;
 	}
 
@@ -121,9 +121,9 @@ 
 		$matches=array();
 		$ordering=array();
 		preg_match_all('/(ORDER BY)[\s"\[](.*)(ASC|DESC)?(?:[\s"\[]|$|COMPUTE|FOR)/i', $sql, $matches);
-		if(count($matches)>1 && count($matches[2]) > 0)
+		if(count($matches) > 1 && count($matches[2]) > 0)
 		{
-			$parts = explode(',', $matches[2][0]);
+			$parts=explode(',', $matches[2][0]);
 			foreach($parts as $part)
 			{
 				$subs=array();
@@ -131,12 +131,12 @@ 
 				{
 					if(count($subs) > 1 && count($subs[2]) > 0)
 					{
-						$ordering[$subs[1][0]] = $subs[2][0];
+						$ordering[$subs[1][0]]=$subs[2][0];
 					}
 					//else what?
 				}
 				else
-					$ordering[trim($part)] = 'ASC';
+					$ordering[trim($part)]='ASC';
 			}
 		}
 		return $ordering;
@@ -148,11 +148,11 @@ 
 	 */
 	protected function joinOrdering($orders)
 	{
-		if(count($orders)>0)
+		if(count($orders) > 0)
 		{
 			$str=array();
 			foreach($orders as $column => $direction)
-				$str[] = $column.' '.$direction;
+				$str[]=$column.' '.$direction;
 			return 'ORDER BY '.implode(', ', $str);
 		}
 	}
@@ -164,7 +164,7 @@ 
 	protected function reverseDirection($orders)
 	{
 		foreach($orders as $column => $direction)
-			$orders[$column] = strtolower(trim($direction))==='desc' ? 'ASC' : 'DESC';
+			$orders[$column]=strtolower(trim($direction))==='desc' ? 'ASC' : 'DESC';
 		return $orders;
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -138,8 +138,7 @@
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
 					//else what?
-				}
-				else
+				} else
 					$ordering[trim($part)] = 'ASC';
 			}
 		}

framework/Data/Common/Mysql/TMysqlTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
  */
 class TMysqlTableColumn extends TDbTableColumn
 {
-	private static $types = array(
+	private static $types=array(
 		'integer' => array('bit', 'tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint'),
 		'boolean' => array('boolean', 'bool'),
 		'float' => array('float', 'double', 'double precision', 'decimal', 'dec', 'numeric', 'fixed')
@@ -35,7 +35,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($this->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($this->getDbType())));
 		if($dbtype==='tinyint' && $this->getColumnSize()===1)
 			return 'boolean';
 		foreach(self::$types as $type => $dbtypes)

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
 		if($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT '.$limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			$limitStr=' LIMIT '.$limit;
+			$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
 		}
 		else

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 			$limitStr = ' LIMIT '.$limit;
 			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
-		}
-		else
+		} else
 			return $sql;
 	}
 }

framework/Data/Common/Sqlite/TSqliteTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @TODO add sqlite types.
 	 */
-	private static $types = array();
+	private static $types=array();
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
@@ -34,7 +34,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/ActiveRecord/TActiveRecord.php

Braces +7 added lines, -14 removed lines

@@ -425,14 +425,12 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		else if($this->_recordState===self::STATE_LOADED)
+		} else if($this->_recordState===self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
 				return true;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -455,8 +453,7 @@ 
 				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -723,8 +720,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -743,8 +739,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this,$property,$relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -827,8 +822,7 @@ 
 		{
 			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
 			return $this->getRelationHandler($property, $args);
-		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
+		} else if($findOne=strncasecmp($method,'findby',6)===0)
 			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
 		else if(strncasecmp($method,'findallby',9)===0)
 			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
@@ -894,8 +888,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();

Doc Comments +10 added lines, -2 removed lines

@@ -324,7 +324,7 @@ 
 	/**
 	 * Gets the current Db connection, the connection object is obtained from
 	 * the TActiveRecordManager if connection is currently null.
-	 * @return TDbConnection current db connection for this object.
+	 * @return \Prado\Data\TDbConnection current db connection for this object.
 	 */
 	public function getDbConnection()
 	{
@@ -511,6 +511,7 @@ 
 	 * Delete multiple records using a criteria.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records deleted.
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
@@ -577,6 +578,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
 	public function find($criteria,$parameters=array())
@@ -593,6 +595,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
 	public function findAll($criteria=null,$parameters=array())
@@ -706,6 +709,7 @@ 
 	 * Find the number of records.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function count($criteria=null,$parameters=array())
@@ -721,6 +725,7 @@ 
 	 * value equal to the $property value.
 	 * @param string relationship/property name corresponding to keys in $RELATION array.
 	 * @param array method call arguments.
+	 * @param string $name
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
 	protected function getRelationHandler($name,$args=array())
@@ -945,6 +950,7 @@ 
 	 * Raised before the record attempt to insert its data into the database.
 	 * To prevent the insert operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onInsert($param)
 	{
@@ -955,6 +961,7 @@ 
 	 * Raised before the record attempt to delete its data from the database.
 	 * To prevent the delete operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onDelete($param)
 	{
@@ -965,6 +972,7 @@ 
 	 * Raised before the record attempt to update its data in the database.
 	 * To prevent the update operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onUpdate($param)
 	{
@@ -1048,7 +1056,7 @@ 
     
     	/**
      	* Return record data as JSON
-     	* @return JSON
+     	* @return string
      	* @since 3.2.4
      	*/
     	public function toJSON(){

Indentation +20 added lines, -20 removed lines

@@ -1032,26 +1032,26 @@
 		return isset(self::$_relations[get_class($this)][strtolower($property)]);
 	}
 	
-        /**
-        * Return record data as array
-        * @return array of column name and column values
-        * @since 3.2.4
-        */
-        public function toArray(){
-        	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-            		$result[$columnName]=$this->getColumnValue($columnName);
-           	}
+		/**
+		 * Return record data as array
+		 * @return array of column name and column values
+		 * @since 3.2.4
+		 */
+		public function toArray(){
+			$result=array();
+			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+					$result[$columnName]=$this->getColumnValue($columnName);
+		   	}
         
-        	return $result;
-    	}
+			return $result;
+		}
     
-    	/**
-     	* Return record data as JSON
-     	* @return JSON
-     	* @since 3.2.4
-     	*/
-    	public function toJSON(){
-        	return json_encode($this->toArray());
-    	}
+		/**
+		 * Return record data as JSON
+		 * @return JSON
+		 * @since 3.2.4
+		 */
+		public function toJSON(){
+			return json_encode($this->toArray());
+		}
 }
\ No newline at end of file

Spacing +83 added lines, -83 removed lines

@@ -200,14 +200,14 @@ 
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	protected $_invalidFinderResult = null; // use protected so that serialization is fine
+	protected $_invalidFinderResult=null; // use protected so that serialization is fine
 
 	/**
 	 * Prevent __call() method creating __sleep() when serializing.
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0*\0_connection"));
+		return array_diff(parent::__sleep(), array("\0*\0_connection"));
 	}
 
 	/**
@@ -262,12 +262,12 @@ 
 	 * @param mixed property value.
 	 * @since 3.1.2
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
 		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
 			$this->$name=$value;
 		else
-			parent::__set($name,$value);
+			parent::__set($name, $value);
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 			$class=new ReflectionClass($className);
 			$relations=array();
 			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
-				$relations[strtolower($key)]=array($key,$value);
+				$relations[strtolower($key)]=array($key, $value);
 			self::$_relations[$className]=$relations;
 		}
 	}
@@ -310,7 +310,7 @@ 
 		if(!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
 		foreach($data as $name=>$value)
-			$this->setColumnValue($name,$value);
+			$this->setColumnValue($name, $value);
 	}
 
 
@@ -361,16 +361,16 @@ 
 	{
 		if($record===null || get_class($this)!==get_class($record))
 			return false;
-		$tableInfo = $this->getRecordTableInfo();
-		$pks = $tableInfo->getPrimaryKeys();
-		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
+		$tableInfo=$this->getRecordTableInfo();
+		$pks=$tableInfo->getPrimaryKeys();
+		$properties=count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
 		$equals=true;
 		foreach($properties as $prop)
 		{
 			if($strict)
-				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)===$record->getColumnValue($prop);
 			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)==$record->getColumnValue($prop);
 			if(!$equals)
 				return false;
 		}
@@ -388,10 +388,10 @@ 
 	 */
 	public static function finder($className=__CLASS__)
 	{
-		static $finders = array();
+		static $finders=array();
 		if(!isset($finders[$className]))
 		{
-			$f = Prado::createComponent($className);
+			$f=Prado::createComponent($className);
 			$finders[$className]=$f;
 		}
 		return $finders[$className];
@@ -421,14 +421,14 @@ 
 	 */
 	public function save()
 	{
-		$gateway = $this->getRecordGateway();
-		$param = new TActiveRecordChangeEventParameter();
+		$gateway=$this->getRecordGateway();
+		$param=new TActiveRecordChangeEventParameter();
 		if($this->_recordState===self::STATE_NEW)
 		{
 			$this->onInsert($param);
 			if($param->getIsValid() && $gateway->insert($this))
 			{
-				$this->_recordState = self::STATE_LOADED;
+				$this->_recordState=self::STATE_LOADED;
 				return true;
 			}
 		}
@@ -453,8 +453,8 @@ 
 	{
 		if($this->_recordState===self::STATE_LOADED)
 		{
-			$gateway = $this->getRecordGateway();
-			$param = new TActiveRecordChangeEventParameter();
+			$gateway=$this->getRecordGateway();
+			$param=new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
 			if($param->getIsValid() && $gateway->delete($this))
 			{
@@ -494,8 +494,8 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this,(array)$keys);
+			$keys=func_get_args();
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -515,8 +515,8 @@ 
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->deleteRecordsByCriteria($this, $criteria);
 	}
 
@@ -540,7 +540,7 @@ 
 	{
 		$result=array();
 		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+			$result[]=$this->populateObject($data);
 		return $result;
 	}
 
@@ -579,12 +579,12 @@ 
 	 * @param mixed parameter values.
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
-	public function find($criteria,$parameters=array())
+	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria);
+		$data=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -595,12 +595,12 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
-	public function findAll($criteria=null,$parameters=array())
+	public function findAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria,true);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
 
@@ -618,11 +618,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if($keys===null)
 			return null;
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$data = $this->getRecordGateway()->findRecordByPK($this,$keys);
+			$keys=func_get_args();
+		$data=$this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
 
@@ -646,8 +646,8 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this,(array)$keys);
+			$keys=func_get_args();
+		$result=$this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -659,12 +659,12 @@ 
 	 * @param array $parameters
 	 * @return TActiveRecord, null if no result is returned.
 	 */
-	public function findBySql($sql,$parameters=array())
+	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordBySql($this,$criteria);
+		$data=$this->getRecordGateway()->findRecordBySql($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -676,11 +676,11 @@ 
 	 * @param array $parameters
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllBySql($sql,$parameters=array())
+	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsBySql($this,$criteria);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsBySql($this, $criteria);
 		return $this->populateObjects($result);
 	}
 
@@ -696,9 +696,9 @@ 
 	 * @param array matching field values.
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllByIndex($criteria,$fields,$values)
+	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$result = $this->getRecordGateway()->findRecordsByIndex($this,$criteria,$fields,$values);
+		$result=$this->getRecordGateway()->findRecordsByIndex($this, $criteria, $fields, $values);
 		return $this->populateObjects($result);
 	}
 
@@ -708,12 +708,12 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		return $this->getRecordGateway()->countRecords($this,$criteria);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
 	/**
@@ -723,11 +723,11 @@ 
 	 * @param array method call arguments.
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
-	protected function getRelationHandler($name,$args=array())
+	protected function getRelationHandler($name, $args=array())
 	{
-		if(($context=$this->createRelationContext($name)) !== null)
+		if(($context=$this->createRelationContext($name))!==null)
 		{
-			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
+			$criteria=$this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
 		}
 		else
@@ -747,8 +747,8 @@ 
 	{
 		if(($definition=$this->getRecordRelation($name))!==null)
 		{
-			list($property, $relation) = $definition;
-			return new TActiveRecordRelationContext($this,$property,$relation);
+			list($property, $relation)=$definition;
+			return new TActiveRecordRelationContext($this, $property, $relation);
 		}
 		else
 			return null;
@@ -791,7 +791,7 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if( ($context=$this->createRelationContext($property)) !== null)
+		if(($context=$this->createRelationContext($property))!==null)
 			return $context->getRelationHandler()->fetchResultsInto($this);
 		else
 			return false;
@@ -826,31 +826,31 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if(strncasecmp($method,'with',4)===0)
+		$delete=false;
+		if(strncasecmp($method, 'with', 4)===0)
 		{
-			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
+			$property=$method[4]==='_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
 		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(strncasecmp($method,'findallby',9)===0)
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete=strncasecmp($method,'deleteby',8)===0)
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete=strncasecmp($method,'deleteallby',11)===0)
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		else if($findOne=strncasecmp($method, 'findby', 6)===0)
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(strncasecmp($method, 'findallby', 9)===0)
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=strncasecmp($method, 'deleteby', 8)===0)
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=strncasecmp($method, 'deleteallby', 11)===0)
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
-				throw new TActiveRecordException('ar_invalid_finder_method',$method);
+			if($this->getInvalidFinderResult()==TActiveRecordInvalidFinderResult::Exception)
+				throw new TActiveRecordException('ar_invalid_finder_method', $method);
 			else
 				return null;
 		}
 
-		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else
@@ -864,7 +864,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if($this->_invalidFinderResult!==null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -879,10 +879,10 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
+		if($value===null)
+			$this->_invalidFinderResult=null;
 		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
+			$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
 	}
 
 	/**
@@ -898,8 +898,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -993,7 +993,7 @@ 
 	 * @param mixed the corresponding column value
 	 * @since 3.1.1
 	 */
-	public function setColumnValue($columnName,$value)
+	public function setColumnValue($columnName, $value)
 	{
 		$className=get_class($this);
 		if(isset(self::$_columnMapping[$className][$columnName]))
@@ -1010,7 +1010,7 @@ 
 	{
 		$className=get_class($this);
 		$property=strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		return isset(self::$_relations[$className][$property]) ?self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1037,9 +1037,9 @@ 
         * @return array of column name and column values
         * @since 3.2.4
         */
-        public function toArray(){
+        public function toArray() {
         	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
             		$result[$columnName]=$this->getColumnValue($columnName);
            	}
         
@@ -1051,7 +1051,7 @@ 
      	* @return JSON
      	* @since 3.2.4
      	*/
-    	public function toJSON(){
+    	public function toJSON() {
         	return json_encode($this->toArray());
     	}
 }
\ No newline at end of file