pradosoft / prado

framework/Data/SqlMap/TSqlMapManager.php

Spacing +12 added lines, -12 removed lines

@@ -93,7 +93,7 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers === null)
+		if ($this->_typeHandlers === null)
 			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway === null)
+		if ($this->_gateway === null)
 			$this->_gateway = $this->createSqlMapGateway();
 		return $this->_gateway;
 	}
@@ -124,7 +124,7 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
+		if ($this->_cacheDependencies === null)
 			$this->_cacheDependencies = new TChainedCacheDependency();
 
 		return $this->_cacheDependencies;
@@ -156,7 +156,7 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
+		if ($this->_mappedStatements->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
 		return $this->_mappedStatements[$name];
 	}
@@ -170,7 +170,7 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		if ($this->_mappedStatements->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -191,7 +191,7 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
+		if ($this->_resultMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
 		return $this->_resultMaps[$name];
 	}
@@ -203,7 +203,7 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		if ($this->_resultMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -223,7 +223,7 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
+		if ($this->_parameterMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
 		return $this->_parameterMaps[$name];
 	}
@@ -235,7 +235,7 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		if ($this->_parameterMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}
@@ -247,7 +247,7 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
+		if ($this->_cacheModels->contains($cacheModel->getID()))
 			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
 		else
 			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
@@ -261,7 +261,7 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
+		if (!$this->_cacheModels->contains($name))
 			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
 		return $this->_cacheModels[$name];
 	}
@@ -271,7 +271,7 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
+		foreach ($this->_cacheModels as $cache)
 			$cache->flush();
 	}
 }

Braces +38 added lines, -26 removed lines

@@ -93,8 +93,9 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers === null)
-			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
+		if($this->_typeHandlers === null) {
+					$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
+		}
 		return $this->_typeHandlers;
 	}
 
@@ -103,8 +104,9 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway === null)
-			$this->_gateway = $this->createSqlMapGateway();
+		if($this->_gateway === null) {
+					$this->_gateway = $this->createSqlMapGateway();
+		}
 		return $this->_gateway;
 	}
 
@@ -124,8 +126,9 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies = new TChainedCacheDependency();
+		if($this->_cacheDependencies === null) {
+					$this->_cacheDependencies = new TChainedCacheDependency();
+		}
 
 		return $this->_cacheDependencies;
 	}
@@ -156,8 +159,9 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		if($this->_mappedStatements->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		}
 		return $this->_mappedStatements[$name];
 	}
 
@@ -170,8 +174,9 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		if($this->_mappedStatements->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		}
 		$this->_mappedStatements->add($key, $statement);
 	}
 
@@ -191,8 +196,9 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		if($this->_resultMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		}
 		return $this->_resultMaps[$name];
 	}
 
@@ -203,8 +209,9 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		if($this->_resultMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		}
 		$this->_resultMaps->add($key, $result);
 	}
 
@@ -223,8 +230,9 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		if($this->_parameterMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		}
 		return $this->_parameterMaps[$name];
 	}
 
@@ -235,8 +243,9 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		if($this->_parameterMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		}
 		$this->_parameterMaps->add($key, $parameter);
 	}
 
@@ -247,10 +256,11 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
-			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
-		else
-			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		if($this->_cacheModels->contains($cacheModel->getID())) {
+					throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
+		} else {
+					$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		}
 	}
 
 	/**
@@ -261,8 +271,9 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
-			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		if(!$this->_cacheModels->contains($name)) {
+					throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		}
 		return $this->_cacheModels[$name];
 	}
 
@@ -271,8 +282,9 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
-			$cache->flush();
+		foreach($this->_cacheModels as $cache) {
+					$cache->flush();
+		}
 	}
 }
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Spacing +19 added lines, -19 removed lines

@@ -78,17 +78,17 @@ 
 	{
 		static $stack = [];
 
-		$results = call_user_func_array([$this->getSourceRecord(),$method], $args);
+		$results = call_user_func_array([$this->getSourceRecord(), $method], $args);
 		$validArray = is_array($results) && count($results) > 0;
-		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
+		if ($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
+			while ($obj = array_pop($stack))
 				$obj->collectForeignObjects($results);
 		}
-		elseif($results instanceof TActiveRecordRelation)
+		elseif ($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
-		elseif($results === null || !$validArray)
+		elseif ($results === null || !$validArray)
 			$stack = [];
 		return $results;
 	}
@@ -118,17 +118,17 @@ 
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
 		$tableInfo = $from;
-		if($from instanceof TActiveRecord)
+		if ($from instanceof TActiveRecord)
 			$tableInfo = $gateway->getRecordTableInfo($from);
 		//find first non-empty FK
-		foreach($tableInfo->getForeignKeys() as $fkeys)
+		foreach ($tableInfo->getForeignKeys() as $fkeys)
 		{
 			$fkTable = strtolower($fkeys['table']);
-			if($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
+			if ($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
+				if (!empty($key))
 					return $key;
 			}
 		}
@@ -155,9 +155,9 @@ 
 		$matching = [];
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
 		$fields = [];
-		foreach($fkeys as $fkName => $field)
+		foreach ($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
+			if (in_array($fkName, $matching[2]))
 				$fields[$fkName] = $field;
 		}
 		return $fields;
@@ -171,8 +171,8 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids = [];
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach ($properties as $property)
+			$ids[] = is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -196,13 +196,13 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof \ArrayAccess)
+		if (!is_array($results) && !$results instanceof \ArrayAccess)
 			$results = [$results];
 		$values = [];
-		foreach($results as $result)
+		foreach ($results as $result)
 		{
 			$value = [];
-			foreach($keys as $name)
+			foreach ($keys as $name)
 				$value[] = $result->getColumnValue($name);
 			$values[] = $value;
 		}
@@ -219,7 +219,7 @@ 
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections = [];
-		foreach($fkObjects as $fkObject)
+		foreach ($fkObjects as $fkObject)
 			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
 		$this->setResultCollection($results, $collections, $properties);
 	}
@@ -232,9 +232,9 @@ 
 	 */
 	protected function setResultCollection(&$results, &$collections, $properties)
 	{
-		if(is_array($results) || $results instanceof \ArrayAccess)
+		if (is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
+			for ($i = 0, $k = count($results); $i < $k; $i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
 		}
 		else

Braces +35 added lines, -24 removed lines

@@ -83,13 +83,16 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} elseif($results instanceof TActiveRecordRelation) {
+					$stack[] = $this;
+		}
+		//call it later
+		elseif($results === null || !$validArray) {
+					$stack = [];
 		}
-		elseif($results instanceof TActiveRecordRelation)
-			$stack[] = $this; //call it later
-		elseif($results === null || !$validArray)
-			$stack = [];
 		return $results;
 	}
 
@@ -118,8 +121,9 @@ 
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
 		$tableInfo = $from;
-		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+		if($from instanceof TActiveRecord) {
+					$tableInfo = $gateway->getRecordTableInfo($from);
+		}
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
@@ -128,8 +132,9 @@ 
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
-					return $key;
+				if(!empty($key)) {
+									return $key;
+				}
 			}
 		}
 
@@ -157,8 +162,9 @@ 
 		$fields = [];
 		foreach($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+			if(in_array($fkName, $matching[2])) {
+							$fields[$fkName] = $field;
+			}
 		}
 		return $fields;
 	}
@@ -171,8 +177,9 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids = [];
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach($properties as $property) {
+					$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		}
 		return serialize($ids);
 	}
 
@@ -196,14 +203,16 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof \ArrayAccess)
-			$results = [$results];
+		if(!is_array($results) && !$results instanceof \ArrayAccess) {
+					$results = [$results];
+		}
 		$values = [];
 		foreach($results as $result)
 		{
 			$value = [];
-			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
+			foreach($keys as $name) {
+							$value[] = $result->getColumnValue($name);
+			}
 			$values[] = $value;
 		}
 		return $values;
@@ -219,8 +228,9 @@ 
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections = [];
-		foreach($fkObjects as $fkObject)
-			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		foreach($fkObjects as $fkObject) {
+					$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		}
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -234,11 +244,12 @@ 
 	{
 		if(is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
-				$this->setObjectProperty($results[$i], $properties, $collections);
+			for($i = 0,$k = count($results);$i < $k;$i++) {
+							$this->setObjectProperty($results[$i], $properties, $collections);
+			}
+		} else {
+					$this->setObjectProperty($results, $properties, $collections);
 		}
-		else
-			$this->setObjectProperty($results, $properties, $collections);
 	}
 
 	/**

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Spacing +11 added lines, -11 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys === null)
+		if ($this->_fkeys === null)
 			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
 		return $this->_fkeys;
 	}
@@ -117,7 +117,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:[];
+		return isset($this->_relation[4]) ? $this->_relation[4] : [];
 	}
 
 	/**
@@ -174,14 +174,14 @@ 
 	 */
 	public function getRelationHandler($criteria = null)
 	{
-		if(!$this->hasRecordRelation())
+		if (!$this->hasRecordRelation())
 		{
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria === null)
+		if ($criteria === null)
 			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
-		switch($this->getRelationType())
+		switch ($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
 				return new TActiveRecordHasMany($this, $criteria);
@@ -202,14 +202,14 @@ 
 	public function updateAssociatedRecords($updateBelongsTo = false)
 	{
 		$success = true;
-		foreach($this->_record->getRecordRelations() as $data)
+		foreach ($this->_record->getRecordRelations() as $data)
 		{
 			list($property, $relation) = $data;
 			$belongsTo = $relation[0] == TActiveRecord::BELONGS_TO;
-			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
+			if (($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
 				$obj = $this->getSourceRecord();
-				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
+				if (!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
 					$context = new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
 					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
@@ -221,9 +221,9 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
+		if (is_object($obj))
 			return $obj instanceof TList ? $obj->count() === 0 : false;
-		elseif(is_array($obj))
+		elseif (is_array($obj))
 			return count($obj) === 0;
 		else
 			return empty($obj);

Braces +13 added lines, -10 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys === null)
-			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
+		if($this->_fkeys === null) {
+					$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
+		}
 		return $this->_fkeys;
 	}
 
@@ -179,8 +180,9 @@ 
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria === null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		if($criteria === null) {
+					$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		}
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -221,12 +223,13 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
-		elseif(is_array($obj))
-			return count($obj) === 0;
-		else
-			return empty($obj);
+		if(is_object($obj)) {
+					return $obj instanceof TList ? $obj->count() === 0 : false;
+		} elseif(is_array($obj)) {
+					return count($obj) === 0;
+		} else {
+					return empty($obj);
+		}
 	}
 }
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Spacing +21 added lines, -21 removed lines

@@ -121,13 +121,13 @@ 
 	 */
 	protected function getAssociationTable()
 	{
-		if($this->_association === null)
+		if ($this->_association === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$conn = $this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
 			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table) > 1)
+			if (count($table) > 1)
 			{
 				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
 				$this->_association_columns = preg_split('/\s*[, ]\*/', $columns);
@@ -142,7 +142,7 @@ 
 	 */
 	protected function getSourceTable()
 	{
-		if($this->_sourceTable === null)
+		if ($this->_sourceTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
@@ -155,7 +155,7 @@ 
 	 */
 	protected function getForeignTable()
 	{
-		if($this->_foreignTable === null)
+		if ($this->_foreignTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$fkObject = $this->getContext()->getForeignRecordFinder();
@@ -195,10 +195,10 @@ 
 		$command = $this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
 		$srcProps = array_keys($sourceKeys);
 		$collections = [];
-		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
+		foreach ($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
+			foreach ($srcProps as $column)
 				unset($row[$column]);
 			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
@@ -215,10 +215,10 @@ 
 	protected function createFkObject($type, $row, $foreignKeys)
 	{
 		$obj = TActiveRecord::createRecord($type, $row);
-		if(count($this->_association_columns) > 0)
+		if (count($this->_association_columns) > 0)
 		{
 			$i = 0;
-			foreach($foreignKeys as $ref => $fk)
+			foreach ($foreignKeys as $ref => $fk)
 				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
 		}
 		return $obj;
@@ -235,7 +235,7 @@ 
 		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where = $criteria->getCondition()) === null)
+		if (($where = $criteria->getCondition()) === null)
 			$where = '1=1';
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
@@ -260,8 +260,8 @@ 
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
 		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		foreach ($columnNames as $name)
+			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -283,9 +283,9 @@ 
 		$joins = [];
 		$hasAssociationColumns = count($this->_association_columns) > 0;
 		$i = 0;
-		foreach($foreignKeys as $ref => $fk)
+		foreach ($foreignKeys as $ref => $fk)
 		{
-			if($hasAssociationColumns)
+			if ($hasAssociationColumns)
 				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
 				$refField = $refInfo->getColumn($ref)->getColumnName();
@@ -306,11 +306,11 @@ 
 		$obj = $this->getContext()->getSourceRecord();
 		$fkObjects = &$obj->{$this->getContext()->getProperty()};
 		$success = true;
-		if(($total = count($fkObjects)) > 0)
+		if (($total = count($fkObjects)) > 0)
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
+			for ($i = 0; $i < $total; $i++)
 				$success = $fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
@@ -330,8 +330,8 @@ 
 	{
 		$condition = [];
 		$table = $this->getAssociationTable();
-		foreach($data as $name => $value)
-			$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		foreach ($data as $name => $value)
+			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
 		$command = $builder->createCountCommand(implode(' AND ', $condition), array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
@@ -348,10 +348,10 @@ 
 		$source = $this->getSourceRecordValues($obj);
 		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
 		$success = true;
-		foreach($fkObjects as $fkObject)
+		foreach ($fkObjects as $fkObject)
 		{
 			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
-			if(!$this->hasAssociationData($builder, $data))
+			if (!$this->hasAssociationData($builder, $data))
 				$success = $this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
@@ -363,7 +363,7 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = [];
 		$i = 0;
-		foreach($sourceKeys as $name => $srcKey)
+		foreach ($sourceKeys as $name => $srcKey)
 			$data[$name] = $indexValues[0][$i++];
 		return $data;
 	}
@@ -371,7 +371,7 @@ 
 	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data = [];
-		foreach($foreignKeys as $name => $fKey)
+		foreach ($foreignKeys as $name => $fKey)
 			$data[$name] = $fkObject->getColumnValue($fKey);
 		return $data;
 	}

Braces +32 added lines, -22 removed lines

@@ -198,8 +198,9 @@ 
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
-				unset($row[$column]);
+			foreach($srcProps as $column) {
+							unset($row[$column]);
+			}
 			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
 		}
@@ -218,8 +219,9 @@ 
 		if(count($this->_association_columns) > 0)
 		{
 			$i = 0;
-			foreach($foreignKeys as $ref => $fk)
-				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			foreach($foreignKeys as $ref => $fk) {
+							$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			}
 		}
 		return $obj;
 	}
@@ -235,8 +237,9 @@ 
 		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where = $criteria->getCondition()) === null)
-			$where = '1=1';
+		if(($where = $criteria->getCondition()) === null) {
+					$where = '1=1';
+		}
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
@@ -260,8 +263,9 @@ 
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
 		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		foreach($columnNames as $name) {
+					$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		}
 		return implode(', ', $columns);
 	}
 
@@ -285,10 +289,11 @@ 
 		$i = 0;
 		foreach($foreignKeys as $ref => $fk)
 		{
-			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
-			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
+			if($hasAssociationColumns) {
+							$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+			} else {
+							$refField = $refInfo->getColumn($ref)->getColumnName();
+			}
 			$fkField = $fkInfo->getColumn($fk)->getColumnName();
 			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
@@ -310,8 +315,9 @@ 
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			for($i = 0;$i < $total;$i++) {
+							$success = $fkObjects[$i]->save() && $success;
+			}
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -330,8 +336,9 @@ 
 	{
 		$condition = [];
 		$table = $this->getAssociationTable();
-		foreach($data as $name => $value)
-			$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		foreach($data as $name => $value) {
+					$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		}
 		$command = $builder->createCountCommand(implode(' AND ', $condition), array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
@@ -351,8 +358,9 @@ 
 		foreach($fkObjects as $fkObject)
 		{
 			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
-			if(!$this->hasAssociationData($builder, $data))
-				$success = $this->addAssociationData($builder, $data) && $success;
+			if(!$this->hasAssociationData($builder, $data)) {
+							$success = $this->addAssociationData($builder, $data) && $success;
+			}
 		}
 		return $success;
 	}
@@ -363,16 +371,18 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = [];
 		$i = 0;
-		foreach($sourceKeys as $name => $srcKey)
-			$data[$name] = $indexValues[0][$i++];
+		foreach($sourceKeys as $name => $srcKey) {
+					$data[$name] = $indexValues[0][$i++];
+		}
 		return $data;
 	}
 
 	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data = [];
-		foreach($foreignKeys as $name => $fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+		foreach($foreignKeys as $name => $fKey) {
+					$data[$name] = $fkObject->getColumnValue($fKey);
+		}
 		return $data;
 	}
 }

framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php

Spacing +4 added lines, -4 removed lines

@@ -107,9 +107,9 @@ 
 	{
 		$hash = $this->getObjectHash($source, $properties);
 		$prop = $this->getContext()->getProperty();
-		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
+		if (isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
-			if(count($collections[$hash]) > 1)
+			if (count($collections[$hash]) > 1)
 				throw new TActiveRecordException('ar_belongs_to_multiple_result');
 			$source->$prop = $collections[$hash][0];
 		}
@@ -125,12 +125,12 @@ 
 	{
 		$obj = $this->getContext()->getSourceRecord();
 		$fkObject = $obj->getColumnValue($this->getContext()->getProperty());
-		if($fkObject !== null)
+		if ($fkObject !== null)
 		{
 			$fkObject->save();
 			$source = $this->getSourceRecord();
 			$fkeys = $this->findForeignKeys($source, $fkObject);
-			foreach($fkeys as $srcKey => $fKey)
+			foreach ($fkeys as $srcKey => $fKey)
 				$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
 			return true;
 		}

Braces +8 added lines, -6 removed lines

@@ -109,12 +109,13 @@ 
 		$prop = $this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
-			if(count($collections[$hash]) > 1)
-				throw new TActiveRecordException('ar_belongs_to_multiple_result');
+			if(count($collections[$hash]) > 1) {
+							throw new TActiveRecordException('ar_belongs_to_multiple_result');
+			}
 			$source->$prop = $collections[$hash][0];
+		} else {
+					$source->$prop = null;
 		}
-		else
-			$source->$prop = null;
 	}
 
 	/**
@@ -130,8 +131,9 @@ 
 			$fkObject->save();
 			$source = $this->getSourceRecord();
 			$fkeys = $this->findForeignKeys($source, $fkObject);
-			foreach($fkeys as $srcKey => $fKey)
-				$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
+			foreach($fkeys as $srcKey => $fKey) {
+							$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
+			}
 			return true;
 		}
 		return false;

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Spacing +19 added lines, -19 removed lines

@@ -65,12 +65,12 @@ 
 		$table = $this->getTableInfo();
 		$sorts = ['Sort By', str_repeat('-', 15)];
 		$headers = [];
-		foreach($table->getColumns() as $name => $colum)
+		foreach ($table->getColumns() as $name => $colum)
 		{
 			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name . ' ASC'] = $fname . ' Ascending';
-			$sorts[$name . ' DESC'] = $fname . ' Descending';
-			$headers[] = $fname ;
+			$sorts[$name.' ASC'] = $fname.' Ascending';
+			$sorts[$name.' DESC'] = $fname.' Descending';
+			$headers[] = $fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -84,7 +84,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
+		if (!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
 		{
 			$this->initializeSort();
 			$this->setViewState('CurrentClass', $this->getRecordClass());
@@ -113,17 +113,17 @@ 
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
 		$offset = $this->_list->getCurrentPageIndex() * $limit;
-		if($offset + $limit > $total)
+		if ($offset + $limit > $total)
 			$limit = $total - $offset;
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
-		if($limit > 0)
+		if ($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
+			if ($offset <= $total)
 				$criteria->setOffset($offset);
 		}
 		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
+		if (is_array($order) && count($order) === 2)
 			$criteria->OrdersBy[$order[0]] = $order[1];
 		return $criteria;
 	}
@@ -165,7 +165,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		switch(strtolower($param->getCommandName()))
+		switch (strtolower($param->getCommandName()))
 		{
 			case 'delete':
 				return $this->deleteRecord($sender, $param);
@@ -181,9 +181,9 @@ 
 	 */
 	protected function initializeEdit($sender, $param)
 	{
-		if(($ctrl = $this->getEditViewControl()) !== null)
+		if (($ctrl = $this->getEditViewControl()) !== null)
 		{
-			if($param instanceof TRepeaterCommandEventParameter)
+			if ($param instanceof TRepeaterCommandEventParameter)
 			{
 				$pk = $param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
@@ -197,7 +197,7 @@ 
 	 */
 	protected function deleteRecord($sender, $param)
 	{
-		if($param instanceof TRepeaterCommandEventParameter)
+		if ($param instanceof TRepeaterCommandEventParameter)
 		{
 			$pk = $param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
@@ -210,10 +210,10 @@ 
 	protected function listItemCreated($sender, $param)
 	{
 		$item = $param->getItem();
-		if($item instanceof IItemDataRenderer)
+		if ($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
+			if ($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
 	}
@@ -225,10 +225,10 @@ 
 	protected function populateField($sender, $param)
 	{
 		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		if (($data = $item->getData()) !== null)
 		{
 			$item->setCustomData($this->getRecordPkValues($data));
-			if(($prop = $item->findControl('_properties')) !== null)
+			if (($prop = $item->findControl('_properties')) !== null)
 			{
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
 				$item->_properties->dataBind();
@@ -301,10 +301,10 @@ 
 	 */
 	protected function getEditViewControl()
 	{
-		if(($id = $this->getEditViewID()) !== null)
+		if (($id = $this->getEditViewID()) !== null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl === null)
+			if ($ctrl === null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;
 		}

Braces +15 added lines, -10 removed lines

@@ -113,18 +113,21 @@ 
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
 		$offset = $this->_list->getCurrentPageIndex() * $limit;
-		if($offset + $limit > $total)
-			$limit = $total - $offset;
+		if($offset + $limit > $total) {
+					$limit = $total - $offset;
+		}
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
-				$criteria->setOffset($offset);
+			if($offset <= $total) {
+							$criteria->setOffset($offset);
+			}
 		}
 		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
-			$criteria->OrdersBy[$order[0]] = $order[1];
+		if(is_array($order) && count($order) === 2) {
+					$criteria->OrdersBy[$order[0]] = $order[1];
+		}
 		return $criteria;
 	}
 
@@ -213,8 +216,9 @@ 
 		if($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
-				$this->populateField($sender, $param);
+			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem) {
+							$this->populateField($sender, $param);
+			}
 		}
 	}
 
@@ -304,8 +308,9 @@ 
 		if(($id = $this->getEditViewID()) !== null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl === null)
-				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			if($ctrl === null) {
+							throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			}
 			return $ctrl;
 		}
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 	protected function getRecordPropertyValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
+		foreach ($this->getTableInfo()->getColumns() as $name => $column)
 			$data[] = $record->getColumnValue($name);
 		return $data;
 	}
@@ -71,9 +71,9 @@ 
 	protected function getRecordPkValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
+		foreach ($this->getTableInfo()->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$data[] = $record->getColumnValue($name);
 		}
 		return $data;
@@ -124,19 +124,19 @@ 
 	 */
 	protected function getRecordObject($pk = null)
 	{
-		if($this->_record === null)
+		if ($this->_record === null)
 		{
-			if($pk !== null)
+			if ($pk !== null)
 			{
 				$this->_record = $this->getRecordFinder()->findByPk($pk);
-				if($this->_record === null)
+				if ($this->_record === null)
 					throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
 			}
 			else
 			{
 				$class = $this->getRecordClass();
-				if($class !== null)
+				if ($class !== null)
 					$this->_record = Prado::createComponent($class);
 				else
 				{
@@ -202,9 +202,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnableDefaultStyle())
+		if ($this->getEnableDefaultStyle())
 		{
-			$url = $this->publishAsset($this->getDefaultStyle() . '.css');
+			$url = $this->publishAsset($this->getDefaultStyle().'.css');
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}

Braces +13 added lines, -11 removed lines

@@ -59,8 +59,9 @@ 
 	protected function getRecordPropertyValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
-			$data[] = $record->getColumnValue($name);
+		foreach($this->getTableInfo()->getColumns() as $name => $column) {
+					$data[] = $record->getColumnValue($name);
+		}
 		return $data;
 	}
 
@@ -73,8 +74,9 @@ 
 		$data = [];
 		foreach($this->getTableInfo()->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
-				$data[] = $record->getColumnValue($name);
+			if($column->getIsPrimaryKey()) {
+							$data[] = $record->getColumnValue($name);
+			}
 		}
 		return $data;
 	}
@@ -129,16 +131,16 @@ 
 			if($pk !== null)
 			{
 				$this->_record = $this->getRecordFinder()->findByPk($pk);
-				if($this->_record === null)
-					throw new TConfigurationException('scaffold_invalid_record_pk',
+				if($this->_record === null) {
+									throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
-			}
-			else
+				}
+			} else
 			{
 				$class = $this->getRecordClass();
-				if($class !== null)
-					$this->_record = Prado::createComponent($class);
-				else
+				if($class !== null) {
+									$this->_record = Prado::createComponent($class);
+				} else
 				{
 					throw new TConfigurationException('scaffold_invalid_record_class',
 						$this->getRecordClass(), $this->getID());

framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		switch(strtolower($column->getDbType()))
+		switch (strtolower($column->getDbType()))
 		{
 			case 'date':
 				return $this->createDateControl($container, $column, $record);
@@ -39,7 +39,7 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		switch(strtolower($column->getDbType()))
+		switch (strtolower($column->getDbType()))
 		{
 			case 'date':
 				return $container->findControl(self::DEFAULT_ID)->getDate();

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php

Spacing +7 added lines, -7 removed lines

@@ -17,8 +17,8 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($column->getDbType())));
-		switch($dbtype)
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($column->getDbType())));
+		switch ($dbtype)
 		{
 			case 'date':
 				return $this->createDateControl($container, $column, $record);
@@ -46,8 +46,8 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($column->getDbType())));
-		switch($dbtype)
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($column->getDbType())));
+		switch ($dbtype)
 		{
 			case 'date':
 				return $container->findControl(self::DEFAULT_ID)->getDate();
@@ -70,7 +70,7 @@ 
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
+		if ($column->getColumnSize() == 1)
 			return $this->createBooleanControl($container, $column, $record);
 		else
 			parent::createIntegerControl($container, $column, $record);
@@ -78,8 +78,8 @@ 
 
 	protected function getIntBooleanValue($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+		if ($column->getColumnSize() == 1)
+			return (int) $container->findControl(self::DEFAULT_ID)->getChecked();
 		else
 			return $this->getDefaultControlValue($container, $column, $record);
 	}

Braces +10 added lines, -8 removed lines

@@ -70,18 +70,20 @@
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return $this->createBooleanControl($container, $column, $record);
-		else
-			parent::createIntegerControl($container, $column, $record);
+		if($column->getColumnSize() == 1) {
+					return $this->createBooleanControl($container, $column, $record);
+		} else {
+					parent::createIntegerControl($container, $column, $record);
+		}
 	}
 
 	protected function getIntBooleanValue($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
-		else
-			return $this->getDefaultControlValue($container, $column, $record);
+		if($column->getColumnSize() == 1) {
+					return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+		} else {
+					return $this->getDefaultControlValue($container, $column, $record);
+		}
 	}
 }