pradosoft / prado

framework/Data/SqlMap/Configuration/TParameterProperty.php

Spacing +14 added lines, -14 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setDbType($value)
 	{
-		$this->_dbType = $value;
+		$this->_dbType=$value;
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_property = $value;
+		$this->_property=$value;
 	}
 
 	/**
@@ -130,19 +130,19 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = 'TParameterProperty';
-		if ($this->_typeHandler===null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_type===null) $exprops[] = "\0$cn\0_type";
-		if ($this->_column===null) $exprops[] = "\0$cn\0_column";
-		if ($this->_dbType===null) $exprops[] = "\0$cn\0_dbType";
-		if ($this->_property===null) $exprops[] = "\0$cn\0_property";
-		if ($this->_nullValue===null) $exprops[] = "\0$cn\0_nullValue";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn='TParameterProperty';
+		if($this->_typeHandler===null) $exprops[]="\0$cn\0_typeHandler";
+		if($this->_type===null) $exprops[]="\0$cn\0_type";
+		if($this->_column===null) $exprops[]="\0$cn\0_column";
+		if($this->_dbType===null) $exprops[]="\0$cn\0_dbType";
+		if($this->_property===null) $exprops[]="\0$cn\0_property";
+		if($this->_nullValue===null) $exprops[]="\0$cn\0_nullValue";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

framework/Data/SqlMap/Configuration/TResultMap.php

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
 			if($handler!==null)
@@ -165,7 +165,7 @@ 
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -179,18 +179,18 @@ 
 	 * @param array row data.
 	 * @return TResultMap result sub-map.
 	 */
-	public function resolveSubMap($registry,$row)
+	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator())!==null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry,$row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
 			if($subMap===null)
-				$subMap = $this;
-			else if($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry,$row);
+				$subMap=$this;
+			else if($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/Data/SqlMap/Configuration/TSimpleDynamicParser.php

Spacing +7 added lines, -7 removed lines

@@ -19,8 +19,8 @@ 
  */
 class TSimpleDynamicParser
 {
-	const PARAMETER_TOKEN_REGEXP = '/\$([^\$]+)\$/';
-	const DYNAMIC_TOKEN = '`!`';
+	const PARAMETER_TOKEN_REGEXP='/\$([^\$]+)\$/';
+	const DYNAMIC_TOKEN='`!`';
 
 	/**
 	 * Parse the sql text for dynamic place holders of the form $name$.
@@ -29,13 +29,13 @@ 
 	 */
 	public function parse($sqlText)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $matches[1][$i];
-			$sqlText = str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
+			$mappings[]=$matches[1][$i];
+			$sqlText=str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}

framework/Data/SqlMap/Configuration/TResultProperty.php

Spacing +42 added lines, -42 removed lines

@@ -46,8 +46,8 @@ 
 
 	private $_hostResultMapID='inplicit internal mapping';
 
-	const LIST_TYPE = 0;
-	const ARRAY_TYPE = 1;
+	const LIST_TYPE=0;
+	const ARRAY_TYPE=1;
 
 	/**
 	 * Gets the containing result map ID.
@@ -56,7 +56,7 @@ 
 	public function __construct($resultMap=null)
 	{
 		if($resultMap instanceof TResultMap)
-			$this->_hostResultMapID = $resultMap->getID();
+			$this->_hostResultMapID=$resultMap->getID();
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_propertyName = $value;
+		$this->_propertyName=$value;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_columnName = $value;
+		$this->_columnName=$value;
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 */
 	public function setResultMapping($value)
 	{
-		$this->_nestedResultMapName = $value;
+		$this->_nestedResultMapName=$value;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function setNestedResultMap($value)
 	{
-		$this->_nestedResultMap = $value;
+		$this->_nestedResultMap=$value;
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_valueType = $value;
+		$this->_valueType=$value;
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setLazyLoad($value)
 	{
-		$this->_isLazyLoad = TPropertyValue::ensureBoolean($value,false);
+		$this->_isLazyLoad=TPropertyValue::ensureBoolean($value, false);
 	}
 
 	/**
@@ -231,17 +231,17 @@ 
 	 * @param array result row
 	 * @return mixed property value.
 	 */
-	public function getPropertyValue($registry,$row)
+	public function getPropertyValue($registry, $row)
 	{
-		$value = null;
-		$index = $this->getColumnIndex();
-		$name = $this->getColumn();
+		$value=null;
+		$index=$this->getColumnIndex();
+		$name=$this->getColumn();
 		if($index > 0 && isset($row[$index]))
-			$value = $this->getTypedValue($registry,$row[$index]);
+			$value=$this->getTypedValue($registry, $row[$index]);
 		else if(isset($row[$name]))
-			$value = $this->getTypedValue($registry,$row[$name]);
+			$value=$this->getTypedValue($registry, $row[$name]);
 		if(($value===null) && ($this->getNullValue()!==null))
-			$value = $this->getTypedValue($registry,$this->getNullValue());
+			$value=$this->getTypedValue($registry, $this->getNullValue());
 		return $value;
 	}
 
@@ -250,9 +250,9 @@ 
 	 * @param mixed raw property value
 	 * @return mixed property value casted to specific type.
 	 */
-	protected function getTypedValue($registry,$value)
+	protected function getTypedValue($registry, $value)
 	{
-		if(($handler = $this->createTypeHandler($registry))!==null)
+		if(($handler=$this->createTypeHandler($registry))!==null)
 			return $handler->getResult($value);
 		else
 			return $registry->convertToType($this->getType(), $value);
@@ -268,7 +268,7 @@ 
 		$type=$this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $this->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -278,17 +278,17 @@ 
 	 */
 	protected function getPropertyValueType()
 	{
-		if(class_exists($type = $this->getType(), false)) //NO force autoloading
+		if(class_exists($type=$this->getType(), false)) //NO force autoloading
 		{
 			if($type==='TList')
 				return self::LIST_TYPE;
-			$class = new ReflectionClass($type);
+			$class=new ReflectionClass($type);
 			if($class->isSubclassOf('TList'))
 				return self::LIST_TYPE;
 			if($class->implementsInterface('ArrayAccess'))
 				return self::ARRAY_TYPE;
 		}
-		if(strtolower($type) == 'array')
+		if(strtolower($type)=='array')
 			return self::ARRAY_TYPE;
 	}
 
@@ -301,8 +301,8 @@ 
 	public function instanceOfListType($target)
 	{
 		if($this->getType()===null)
-			return  TPropertyAccess::get($target,$this->getProperty()) instanceof TList;
-		return $this->getPropertyValueType() == self::LIST_TYPE;
+			return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
+		return $this->getPropertyValueType()==self::LIST_TYPE;
 	}
 
 	/**
@@ -315,28 +315,28 @@ 
 	{
 		if($this->getType()===null)
 		{
-			$prop = TPropertyAccess::get($target,$this->getProperty());
+			$prop=TPropertyAccess::get($target, $this->getProperty());
 			if(is_object($prop))
 				return $prop instanceof ArrayAccess;
 			return is_array($prop);
 		}
-		return $this->getPropertyValueType() == self::ARRAY_TYPE;
+		return $this->getPropertyValueType()==self::ARRAY_TYPE;
 	}
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = 'TResultProperty';
-		if ($this->_nullValue===null) $exprops[] = "\0$cn\0_nullValue";
-		if ($this->_propertyName===null) $exprops[] = "\0$cn\0_propertyNama";
-		if ($this->_columnName===null) $exprops[] = "\0$cn\0_columnName";
-		if ($this->_columnIndex==-1) $exprops[] = "\0$cn\0_columnIndex";
-		if ($this->_nestedResultMapName===null) $exprops[] = "\0$cn\0_nestedResultMapName";
-		if ($this->_nestedResultMap===null) $exprops[] = "\0$cn\0_nestedResultMap";
-		if ($this->_valueType===null) $exprops[] = "\0$cn\0_valueType";
-		if ($this->_typeHandler===null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_isLazyLoad===false) $exprops[] = "\0$cn\0_isLazyLoad";
-		if ($this->_select===null) $exprops[] = "\0$cn\0_select";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn='TResultProperty';
+		if($this->_nullValue===null) $exprops[]="\0$cn\0_nullValue";
+		if($this->_propertyName===null) $exprops[]="\0$cn\0_propertyNama";
+		if($this->_columnName===null) $exprops[]="\0$cn\0_columnName";
+		if($this->_columnIndex==-1) $exprops[]="\0$cn\0_columnIndex";
+		if($this->_nestedResultMapName===null) $exprops[]="\0$cn\0_nestedResultMapName";
+		if($this->_nestedResultMap===null) $exprops[]="\0$cn\0_nestedResultMap";
+		if($this->_valueType===null) $exprops[]="\0$cn\0_valueType";
+		if($this->_typeHandler===null) $exprops[]="\0$cn\0_typeHandler";
+		if($this->_isLazyLoad===false) $exprops[]="\0$cn\0_isLazyLoad";
+		if($this->_select===null) $exprops[]="\0$cn\0_select";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Regular expression for parsing inline parameter maps.
 	 */
-	const PARAMETER_TOKEN_REGEXP = '/#([^#]+)#/';
+	const PARAMETER_TOKEN_REGEXP='/#([^#]+)#/';
 
 	/**
 	 * Parse the sql text for inline parameters.
@@ -35,14 +35,14 @@ 
 	 */
 	public function parse($sqlText, $scope)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
 
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $this->parseMapping($matches[1][$i], $scope);
-			$sqlText = str_replace($matches[0][$i], '?', $sqlText);
+			$mappings[]=$this->parseMapping($matches[1][$i], $scope);
+			$sqlText=str_replace($matches[0][$i], '?', $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}
@@ -55,13 +55,13 @@ 
 	 */
 	protected function parseMapping($token, $scope)
 	{
-		$mapping = new TParameterProperty;
-		$properties = explode(',', $token);
+		$mapping=new TParameterProperty;
+		$properties=explode(',', $token);
 		$mapping->setProperty(trim(array_shift($properties)));
 		foreach($properties as $property)
 		{
-			$prop = explode('=',$property);
-			$name = trim($prop[0]); $value=trim($prop[1]);
+			$prop=explode('=', $property);
+			$name=trim($prop[0]); $value=trim($prop[1]);
 			if($mapping->canSetProperty($name))
 				$mapping->{'set'.$name}($value);
 			else

framework/Data/SqlMap/Configuration/TParameterMap.php

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_properties = new TList;
-		$this->_propertyMap = new TMap;
+		$this->_properties=new TList;
+		$this->_propertyMap=new TMap;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extend = $value;
+		$this->_extend=$value;
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue,$property);
+		$value=$this->getObjectValue($parameterValue, $property);
 
 		if(($handler=$this->createTypeHandler($property, $registry))!==null)
-			$value = $handler->getParameter($value);
+			$value=$handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property,$value);
+		$value=$this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType())!==null)
-			$value = $registry->convertToType($type, $value);
+		if(($type=$property->getType())!==null)
+			$value=$registry->convertToType($type, $value);
 
 		return $value;
 	}
@@ -161,7 +161,7 @@ 
 		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -172,13 +172,13 @@ 
 	 * @return mixed property value.
 	 * @throws TSqlMapException if property access is invalid.
 	 */
-	protected function getObjectValue($object,$property)
+	protected function getObjectValue($object, $property)
 	{
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
 		}
-		catch (TInvalidPropertyException $e)
+		catch(TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -196,12 +196,12 @@ 
 	 * @param mixed current property value
 	 * @return mixed null if NullValue matches currrent value.
 	 */
-	protected function nullifyDefaultValue($property,$value)
+	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue())!==null)
+		if(($nullValue=$property->getNullValue())!==null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue===$value)
+				$value=null;
 		}
 		return $value;
 	}

framework/Data/TDbDataReader.php

Spacing +6 added lines, -6 removed lines

@@ -63,9 +63,9 @@ 
 	public function bindColumn($column, &$value, $dataType=null)
 	{
 		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if($this->_index < 0)
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;

framework/Data/DataGateway/TSqlCriteria.php

Spacing +30 added lines, -30 removed lines

@@ -48,10 +48,10 @@ 
 	public function __construct($condition=null, $parameters=array())
 	{
 		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
+			$parameters=array_slice(func_get_args(), 1);
 		$this->_parameters=new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy=new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	{
 		if(empty($value)) {
 			// reset the condition
-			$this->_condition = null;
+			$this->_condition=null;
 			return;
 		}
 
@@ -140,7 +140,7 @@ 
 
 		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
-			$value = str_replace($matches[0], '', $value);
+			$value=str_replace($matches[0], '', $value);
 			if(strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
 			} else if(strlen($matches[2]) > 0) {
@@ -150,23 +150,23 @@ 
 
 		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
-			$value = str_replace($matches[0], '', $value); // remove limit from query
+			$value=str_replace($matches[0], '', $value); // remove limit from query
 			if(strpos($matches[1], ',')) { // both offset and limit given
-				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				list($offset, $limit)=explode(',', $matches[1]);
+				$this->_limit=(int) $limit;
+				$this->_offset=(int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit=(int) $matches[1];
 			}
 		}
 
 		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
-			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$value=str_replace($matches[0], '', $value); // remove offset from query
+			$this->_offset=(int) $matches[1]; // set offset in criteria
 		}
 
-		$this->_condition = trim($value);
+		$this->_condition=trim($value);
 	}
 
 	/**
@@ -213,12 +213,12 @@ 
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/',' ',(string)$value));
+			$value=trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys=array();
-			foreach(explode(',',$value) as $orderBy)
+			foreach(explode(',', $value) as $orderBy)
 			{
-				$vs=explode(' ',trim($orderBy));
-				$orderBys[$vs[0]]=isset($vs[1])?$vs[1]:'asc';
+				$vs=explode(' ', trim($orderBy));
+				$orderBys[$vs[0]]=isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -261,23 +261,23 @@ 
 	 */
 	public function __toString()
 	{
-		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"'.(string)$this->getCondition().'"';
-		$params = array();
+		$str='';
+		if(strlen((string) $this->getCondition()) > 0)
+			$str.='"'.(string) $this->getCondition().'"';
+		$params=array();
 		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+			$params[]="{$k} => ${v}";
 		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
-		$orders = array();
+			$str.=', "'.implode(', ', $params).'"';
+		$orders=array();
 		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+			$orders[]="{$k} => ${v}";
 		if(count($orders) > 0)
-			$str .= ', "'.implode(', ',$orders).'"';
-		if($this->_limit !==null)
-			$str .= ', '.$this->_limit;
-		if($this->_offset !== null)
-			$str .= ', '.$this->_offset;
+			$str.=', "'.implode(', ', $orders).'"';
+		if($this->_limit!==null)
+			$str.=', '.$this->_limit;
+		if($this->_offset!==null)
+			$str.=', '.$this->_offset;
 		return $str;
 	}
 }

framework/Data/DataGateway/TTableGateway.php

Spacing +38 added lines, -38 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
 	 */
-	public function __construct($table,$connection)
+	public function __construct($table, $connection)
 	{
 		$this->_connection=$connection;
 		if(is_string($table))
@@ -103,7 +103,7 @@ 
 	 */
 	protected function setTableInfo($tableInfo)
 	{
-		$builder = $tableInfo->createCommandBuilder($this->getDbConnection());
+		$builder=$tableInfo->createCommandBuilder($this->getDbConnection());
 		$this->initCommandBuilder($builder);
 	}
 
@@ -114,7 +114,7 @@ 
 	protected function setTableName($tableName)
 	{
 		Prado::using('System.Data.Common.TDbMetaData');
-		$meta = TDbMetaData::getInstance($this->getDbConnection());
+		$meta=TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
 
@@ -133,9 +133,9 @@ 
 	 */
 	protected function initCommandBuilder($builder)
 	{
-		$this->_command = new TDataGatewayCommand($builder);
-		$this->_command->OnCreateCommand[] = array($this, 'onCreateCommand');
-		$this->_command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
+		$this->_command=new TDataGatewayCommand($builder);
+		$this->_command->OnCreateCommand[]=array($this, 'onCreateCommand');
+		$this->_command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -202,8 +202,8 @@ 
 	 */
 	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -226,8 +226,8 @@ 
 	 */
 	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -239,9 +239,9 @@ 
 	 */
 	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->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -260,7 +260,7 @@ 
 	public function findByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -284,7 +284,7 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -301,8 +301,8 @@ 
 	 */
 	public function deleteAll($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -332,7 +332,7 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -342,7 +342,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 
@@ -352,11 +352,11 @@ 
 	 * @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->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -376,8 +376,8 @@ 
 	 */
 	public function update($data, $criteria, $parameters=array())
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(),2) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -414,8 +414,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -452,21 +452,21 @@ 
 	 * @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($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		$delete=false;
+		if($findOne=substr(strtolower($method), 0, 6)==='findby')
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(substr(strtolower($method), 0, 9)==='findallby')
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=substr(strtolower($method), 0, 8)==='deleteby')
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=substr(strtolower($method), 0, 11)==='deleteallby')
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
-		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getCommand()->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else