pradosoft / prado

framework/Data/SqlMap/Configuration/TDiscriminator.php

Doc Comments +3 added lines

@@ -132,6 +132,7 @@ 
 
 	/**
 	 * @param TSubMap add new sub mapping.
+	 * @param TSubMap $subMap
 	 */
 	public function addSubMap($subMap)
 	{
@@ -140,6 +141,7 @@ 
 
 	/**
 	 * @param string database value
+	 * @param string $value
 	 * @return TResultMap result mapping.
 	 */
 	public function getSubMap($value)
@@ -151,6 +153,7 @@ 
 	/**
 	 * Copies the discriminator properties to a new TResultProperty.
 	 * @param TResultMap result map holding the discriminator.
+	 * @param TResultMap $resultMap
 	 */
 	public function initMapping($resultMap)
 	{

Spacing +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function addSubMap($subMap)
 	{
-		$this->_subMaps[] = $subMap;
+		$this->_subMaps[]=$subMap;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function initMapping($resultMap)
 	{
-		$this->_mapping = new TResultProperty($resultMap);
+		$this->_mapping=new TResultProperty($resultMap);
 		$this->_mapping->setColumn($this->getColumn());
 		$this->_mapping->setColumnIndex($this->getColumnIndex());
 		$this->_mapping->setType($this->getType());
@@ -173,7 +173,7 @@ 
 	{
 		foreach($this->_subMaps as $subMap)
 		{
-			$this->_resultMaps[$subMap->getValue()] =
+			$this->_resultMaps[$subMap->getValue()]=
 				$manager->getResultMap($subMap->getResultMapping());
 		}
 	}

framework/Data/SqlMap/Configuration/TParameterMap.php

Doc Comments +3 added lines, -1 removed lines

@@ -55,6 +55,7 @@ 
 
 	/**
 	 * @param string a unique identifier for the <parameterMap>.
+	 * @param string $value
 	 */
 	public function setID($value)
 	{
@@ -62,7 +63,7 @@ 
 	}
 
 	/**
-	 * @return TParameterProperty[] list of properties for the parameter map.
+	 * @return TList list of properties for the parameter map.
 	 */
 	public function getProperties()
 	{
@@ -112,6 +113,7 @@ 
 	/**
 	 * @param int parameter property index
 	 * @param TParameterProperty new parameter property.
+	 * @param integer $index
 	 */
 	public function insertProperty($index, TParameterProperty $property)
 	{

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',

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/SqlMap/Configuration/TParameterProperty.php

Doc Comments +1 added lines

@@ -110,6 +110,7 @@
 
 	/**
 	 * @param string name of a property of the parameter object.
+	 * @param string $value
 	 */
 	public function setProperty($value)
 	{

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/TResultProperty.php

Doc Comments +3 added lines

@@ -103,6 +103,7 @@ 
 	/**
 	 * @param string name of the column in the result set from which the value
 	 * will be used to populate the property.
+	 * @param string $value
 	 */
 	public function setColumn($value)
 	{
@@ -121,6 +122,7 @@ 
 	/**
 	 * @param int index of the column in the ResultSet from which the value will
 	 * be used to populate the object property
+	 * @param integer $value
 	 */
 	public function setColumnIndex($value)
 	{
@@ -185,6 +187,7 @@ 
 
 	/**
 	 * @param string custom type handler class name (may use namespace).
+	 * @param string $value
 	 */
 	public function setTypeHandler($value)
 	{

Spacing +42 added lines, -42 removed lines

@@ -53,8 +53,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.
@@ -63,7 +63,7 @@ 
 	public function __construct($resultMap=null)
 	{
 		if($resultMap instanceof TResultMap)
-			$this->_hostResultMapID = $resultMap->getID();
+			$this->_hostResultMapID=$resultMap->getID();
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_propertyName = $value;
+		$this->_propertyName=$value;
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_columnName = $value;
+		$this->_columnName=$value;
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setResultMapping($value)
 	{
-		$this->_nestedResultMapName = $value;
+		$this->_nestedResultMapName=$value;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setNestedResultMap($value)
 	{
-		$this->_nestedResultMap = $value;
+		$this->_nestedResultMap=$value;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_valueType = $value;
+		$this->_valueType=$value;
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function setLazyLoad($value)
 	{
-		$this->_isLazyLoad = TPropertyValue::ensureBoolean($value,false);
+		$this->_isLazyLoad=TPropertyValue::ensureBoolean($value, false);
 	}
 
 	/**
@@ -238,17 +238,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;
 	}
 
@@ -257,9 +257,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);
@@ -275,7 +275,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;
 	}
 
@@ -285,17 +285,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;
 	}
 
@@ -308,8 +308,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;
 	}
 
 	/**
@@ -322,28 +322,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/TSqlMapStatement.php

Doc Comments +1 added lines

@@ -268,6 +268,7 @@
 	 * @param TSqlMapTypeHandlerRegistry type handler registry
 	 * @param string result class name.
 	 * @param array result data.
+	 * @param string $type
 	 * @return mixed result object.
 	 */
 	protected function createInstanceOf($registry,$type,$row=null)

Spacing +35 added lines, -35 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	public function setParameterMap($value)
 	{
-		$this->_parameterMapName = $value;
+		$this->_parameterMapName=$value;
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setParameterClass($value)
 	{
-		$this->_parameterClassName = $value;
+		$this->_parameterClassName=$value;
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function setResultMap($value)
 	{
-		$this->_resultMapName = $value;
+		$this->_resultMapName=$value;
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setResultClass($value)
 	{
-		$this->_resultClassName = $value;
+		$this->_resultClassName=$value;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function setCacheModel($value)
 	{
-		$this->_cacheModelName = $value;
+		$this->_cacheModelName=$value;
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function setCache($value)
 	{
-		$this->_cache = $value;
+		$this->_cache=$value;
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function setSqlText($value)
 	{
-		$this->_SQL = $value;
+		$this->_SQL=$value;
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function setListClass($value)
 	{
-		$this->_listClass = $value;
+		$this->_listClass=$value;
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extendStatement = $value;
+		$this->_extendStatement=$value;
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 */
 	public function setInlineParameterMap($map)
 	{
-		$this->_parameterMap = $map;
+		$this->_parameterMap=$map;
 	}
 
 	/**
@@ -249,9 +249,9 @@ 
 	public function initialize($manager)
 	{
 		if(strlen($this->_resultMapName) > 0)
-			$this->_resultMap = $manager->getResultMap($this->_resultMapName);
+			$this->_resultMap=$manager->getResultMap($this->_resultMapName);
 		if(strlen($this->_parameterMapName) > 0)
-			$this->_parameterMap = $manager->getParameterMap($this->_parameterMapName);
+			$this->_parameterMap=$manager->getParameterMap($this->_parameterMapName);
 	}
 
 	/**
@@ -260,8 +260,8 @@ 
 	 */
 	public function createInstanceOfListClass($registry)
 	{
-		if(strlen($type = $this->getListClass()) > 0)
-			return $this->createInstanceOf($registry,$type);
+		if(strlen($type=$this->getListClass()) > 0)
+			return $this->createInstanceOf($registry, $type);
 		return array();
 	}
 
@@ -272,9 +272,9 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	protected function createInstanceOf($registry,$type,$row=null)
+	protected function createInstanceOf($registry, $type, $row=null)
 	{
-		$handler = $registry->getTypeHandler($type);
+		$handler=$registry->getTypeHandler($type);
 		if($handler!==null)
 			return $handler->createNewInstance($row);
 		else
@@ -287,30 +287,30 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	public function createInstanceOfResultClass($registry,$row)
+	public function createInstanceOfResultClass($registry, $row)
 	{
-		if(strlen($type= $this->getResultClass()) > 0)
-			return $this->createInstanceOf($registry,$type,$row);
+		if(strlen($type=$this->getResultClass()) > 0)
+			return $this->createInstanceOf($registry, $type, $row);
 	}
 
 	public function __sleep()
 	{
-		$cn = __CLASS__;
-		$exprops = array("\0$cn\0_resultMap");
-		if (!$this->_parameterMapName) $exprops[] = "\0$cn\0_parameterMapName";
-		if (!$this->_parameterMap) $exprops[] = "\0$cn\0_parameterMap";
-		if (!$this->_parameterClassName) $exprops[] = "\0$cn\0_parameterClassName";
-		if (!$this->_resultMapName) $exprops[] = "\0$cn\0_resultMapName";
-		if (!$this->_resultMap) $exprops[] = "\0$cn\0_resultMap";
-		if (!$this->_resultClassName) $exprops[] = "\0$cn\0_resultClassName";
-		if (!$this->_cacheModelName) $exprops[] = "\0$cn\0_cacheModelName";
-		if (!$this->_SQL) $exprops[] = "\0$cn\0_SQL";
-		if (!$this->_listClass) $exprops[] = "\0$cn\0_listClass";
-		if (!$this->_typeHandler) $exprops[] = "\0$cn\0_typeHandler";
-		if (!$this->_extendStatement) $exprops[] = "\0$cn\0_extendStatement";
-		if (!$this->_cache) $exprops[] = "\0$cn\0_cache";
-
-		return array_diff(parent::__sleep(),$exprops);
+		$cn=__CLASS__;
+		$exprops=array("\0$cn\0_resultMap");
+		if(!$this->_parameterMapName) $exprops[]="\0$cn\0_parameterMapName";
+		if(!$this->_parameterMap) $exprops[]="\0$cn\0_parameterMap";
+		if(!$this->_parameterClassName) $exprops[]="\0$cn\0_parameterClassName";
+		if(!$this->_resultMapName) $exprops[]="\0$cn\0_resultMapName";
+		if(!$this->_resultMap) $exprops[]="\0$cn\0_resultMap";
+		if(!$this->_resultClassName) $exprops[]="\0$cn\0_resultClassName";
+		if(!$this->_cacheModelName) $exprops[]="\0$cn\0_cacheModelName";
+		if(!$this->_SQL) $exprops[]="\0$cn\0_SQL";
+		if(!$this->_listClass) $exprops[]="\0$cn\0_listClass";
+		if(!$this->_typeHandler) $exprops[]="\0$cn\0_typeHandler";
+		if(!$this->_extendStatement) $exprops[]="\0$cn\0_extendStatement";
+		if(!$this->_cache) $exprops[]="\0$cn\0_cache";
+
+		return array_diff(parent::__sleep(), $exprops);
 	}
 
 }
\ No newline at end of file

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Doc Comments +3 added lines

@@ -40,6 +40,7 @@ 
 	 * @param int page size
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
+	 * @param integer $pageSize
 	 */
 	public function __construct(IMappedStatement $statement,$parameter, $pageSize, $delegate=null, $page=0)
 	{
@@ -55,6 +56,8 @@ 
 	 * @param mixed query parameters
 	 * @param int page size.
 	 * @param int number of page.
+	 * @param IMappedStatement $statement
+	 * @param integer $page
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{

Braces +4 added lines, -8 removed lines

@@ -129,28 +129,24 @@
 			{
 				$param->setData($data);
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
 				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
 			}
-		}
-		else
+		} else
 		{
 			if($total <= $pageSize)
 			{
 				$this->_prevPageList = array_slice($data, 0, $total);
 				$param->setData(array());
 				$this->_nextPageList = null;
-			}
-			else if($total <= $pageSize*2)
+			} else if($total <= $pageSize*2)
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));

Spacing +24 added lines, -24 removed lines

@@ -41,11 +41,11 @@ 
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
 	 */
-	public function __construct(IMappedStatement $statement,$parameter, $pageSize, $delegate=null, $page=0)
+	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate=null, $page=0)
 	{
 		parent::__construct();
 		parent::setCustomPaging(true);
-		$this->initialize($statement,$parameter, $pageSize, $page);
+		$this->initialize($statement, $parameter, $pageSize, $page);
 		$this->_delegate=$delegate;
 	}
 
@@ -58,8 +58,8 @@ 
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{
-		$this->_statement = $statement;
-		$this->_parameter = $parameter;
+		$this->_statement=$statement;
+		$this->_parameter=$parameter;
 		$this->setPageSize($pageSize);
 		$this->attachEventHandler('OnFetchData', array($this, 'fetchDataFromStatement'));
 		$this->gotoPage($page);
@@ -80,9 +80,9 @@ 
 	 */
 	protected function fetchDataFromStatement($sender, $param)
 	{
-		$limit = $this->getOffsetAndLimit($param);
-		$connection = $this->_statement->getManager()->getDbConnection();
-		$data = $this->_statement->executeQueryForList($connection,
+		$limit=$this->getOffsetAndLimit($param);
+		$connection=$this->_statement->getManager()->getDbConnection();
+		$data=$this->_statement->executeQueryForList($connection,
 						$this->_parameter, null, $limit[0], $limit[1], $this->_delegate);
 		$this->populateData($param, $data);
 	}
@@ -112,49 +112,49 @@ 
 	 */
 	protected function populateData($param, $data)
 	{
-		$total = $data instanceof TList ? $data->getCount() : count($data);
-		$pageSize = $this->getPageSize();
+		$total=$data instanceof TList ? $data->getCount() : count($data);
+		$pageSize=$this->getPageSize();
 		if($total < 1)
 		{
 			$param->setData($data);
-			$this->_prevPageList = null;
-			$this->_nextPageList = null;
+			$this->_prevPageList=null;
+			$this->_nextPageList=null;
 			return;
 		}
 
 		if($param->getNewPageIndex() < 1)
 		{
-			$this->_prevPageList = null;
+			$this->_prevPageList=null;
 			if($total <= $pageSize)
 			{
 				$param->setData($data);
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
+				$this->_nextPageList=array_slice($data, $pageSize - 1, $total);
 			}
 		}
 		else
 		{
 			if($total <= $pageSize)
 			{
-				$this->_prevPageList = array_slice($data, 0, $total);
+				$this->_prevPageList=array_slice($data, 0, $total);
 				$param->setData(array());
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
-			else if($total <= $pageSize*2)
+			else if($total <= $pageSize * 2)
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize*2, $total-$pageSize*2);
+				$this->_nextPageList=array_slice($data, $pageSize * 2, $total - $pageSize * 2);
 			}
 		}
 	}
@@ -166,9 +166,9 @@ 
 	 */
 	protected function getOffsetAndLimit($param)
 	{
-		$index = $param->getNewPageIndex();
-		$pageSize = $this->getPageSize();
-		return $index < 1 ? array($index, $pageSize*2) : array(($index-1)*$pageSize, $pageSize*3);
+		$index=$param->getNewPageIndex();
+		$pageSize=$this->getPageSize();
+		return $index < 1 ? array($index, $pageSize * 2) : array(($index - 1) * $pageSize, $pageSize * 3);
 	}
 
 	/**

framework/Data/SqlMap/Statements/TCachingStatement.php

Doc Comments +4 added lines

@@ -97,6 +97,10 @@
 		return $cacheKey->getHash();
 	}
 
+	/**
+	 * @param integer $skip
+	 * @param integer $max
+	 */
 	protected function createCommand($connection, $parameter, $skip=null, $max=null)
 	{
 		return $this->_mappedStatement->getCommand()->create($this->getManager(),

Spacing +16 added lines, -16 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function __construct(TMappedStatement $statement)
 	{
-		$this->_mappedStatement = $statement;
+		$this->_mappedStatement=$statement;
 	}
 
 	public function getID()
@@ -40,15 +40,15 @@ 
 		return $this->_mappedStatement->getManager();
 	}
 
-	public function executeQueryForMap($connection, $parameter,$keyProperty, $valueProperty=null,  $skip=-1, $max=-1,$delegate=null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty,$skip, $max));
-		$map = $this->getStatement()->getCache()->get($key);
+		$sql=$this->createCommand($connection, $parameter, $skip, $max);
+		$key=$this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty, $skip, $max));
+		$map=$this->getStatement()->getCache()->get($key);
 		if($map===null)
 		{
-			$map = $this->_mappedStatement->runQueryForMap(
-				$connection, $parameter, $sql, $keyProperty, $valueProperty,  $delegate);
+			$map=$this->_mappedStatement->runQueryForMap(
+				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 			$this->getStatement()->getCache()->set($key, $map);
 		}
 		return $map;
@@ -66,12 +66,12 @@ 
 
 	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey(array(clone($sql), $parameter, $skip, $max));
-		$list = $this->getStatement()->getCache()->get($key);
+		$sql=$this->createCommand($connection, $parameter, $skip, $max);
+		$key=$this->getCacheKey(array(clone($sql), $parameter, $skip, $max));
+		$list=$this->getStatement()->getCache()->get($key);
 		if($list===null)
 		{
-			$list = $this->_mappedStatement->runQueryForList(
+			$list=$this->_mappedStatement->runQueryForList(
 				$connection, $parameter, $sql, $result, $delegate);
 			$this->getStatement()->getCache()->set($key, $list);
 		}
@@ -80,12 +80,12 @@ 
 
 	public function executeQueryForObject($connection, $parameter, $result=null)
 	{
-		$sql = $this->createCommand($connection, $parameter);
-		$key = $this->getCacheKey(array(clone($sql), $parameter));
-		$object = $this->getStatement()->getCache()->get($key);
+		$sql=$this->createCommand($connection, $parameter);
+		$key=$this->getCacheKey(array(clone($sql), $parameter));
+		$object=$this->getStatement()->getCache()->get($key);
 		if($object===null)
 		{
-			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
+			$object=$this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);
 		}
 		return $object;
@@ -93,7 +93,7 @@ 
 
 	protected function getCacheKey($object)
 	{
-		$cacheKey = new TSqlMapCacheKey($object);
+		$cacheKey=new TSqlMapCacheKey($object);
 		return $cacheKey->getHash();
 	}
 

framework/Data/SqlMap/TSqlMapConfig.php

Doc Comments +1 added lines

@@ -77,6 +77,7 @@
 
 	/**
 	 * Saves the current SqlMap manager to cache.
+	 * @param TSqlMapManager $manager
 	 * @return boolean true if SqlMap manager was cached, false otherwise.
 	 */
 	protected function cacheSqlMapManager($manager)

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;

Spacing +19 added lines, -19 removed lines

@@ -51,8 +51,8 @@ 
 	 */
 	public function clearCache()
 	{
-		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		$cache=$this->getApplication()->getCache();
+		if($cache!==null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -66,16 +66,16 @@ 
 	 * @since 3.1.7
 	 */
 	public function getSqlMapManager() {
-		if(($manager = $this->loadCachedSqlMapManager())===null)
+		if(($manager=$this->loadCachedSqlMapManager())===null)
 		{
-			$manager = new TSqlMapManager($this->getDbConnection());
+			$manager=new TSqlMapManager($this->getDbConnection());
 			if(strlen($file=$this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif($this->getConnectionID()!=='') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -89,11 +89,11 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null) {
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					$dependencies=$manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -108,10 +108,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TSqlMapManager)
 					return $manager;
 			}
@@ -138,11 +138,11 @@ 
 			$this->_configFile=$value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			$file=Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
+			if($file===null || !is_file($file))
+				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
-				$this->_configFile = $file;
+				$this->_configFile=$file;
 		}
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
+		if($this->_sqlmap===null)
 			$this->_sqlmap=$this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}

framework/Data/TDataSourceConfig.php

Doc Comments +1 added lines

@@ -149,6 +149,7 @@
 	/**
 	 * Finds the database connection instance from the Application modules.
 	 * @param string Database connection module ID.
+	 * @param string $id
 	 * @return TDbConnection database connection.
 	 * @throws TConfigurationException when module is not of TDbConnection or TDataSourceConfig.
 	 */

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+					$db->setSubProperty($name, $value);
 			}
 		}
 		else
@@ -71,7 +71,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+					$db->setSubproperty($name, $value);
 			}
 		}
 	}
@@ -106,9 +106,9 @@ 
 		if($this->_conn===null)
 		{
 			if($this->_connID!=='')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
+				$this->_conn=$this->findConnectionByID($this->getConnectionID());
 			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+				$this->_conn=Prado::createComponent($this->getConnectionClass());
 		}
 		return $this->_conn;
 	}
@@ -154,12 +154,12 @@ 
 	 */
 	protected function findConnectionByID($id)
 	{
-		$conn = $this->getApplication()->getModule($id);
+		$conn=$this->getApplication()->getModule($id);
 		if($conn instanceof TDbConnection)
 			return $conn;
 		else if($conn instanceof TDataSourceConfig)
 			return $conn->getDbConnection();
 		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				foreach($xml['database'] as $name=>$value)
 					$db->setSubProperty($name,$value);
 			}
-		}
-		else
+		} else
 		{
 			if($prop=$xml->getElementByTagName('database'))
 			{