pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -222,7 +222,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -250,7 +250,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
-		$enabled = TPropertyValue::ensureBoolean($value);
+		$enabled=TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
 	}
 
@@ -256,8 +256,8 @@ 
 	 */
 	public function getEnablePageStateUpdate()
 	{
-		$option = $this->getOption('EnablePageStateUpdate');
-		return ($option === null) ? true : $option;
+		$option=$this->getOption('EnablePageStateUpdate');
+		return ($option===null) ? true : $option;
 	}
 
 	/**
@@ -274,7 +274,7 @@ 
 	public function setPostBackTarget($value)
 	{
 		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+			$value=$value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}
 

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

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				$dt->format('j'),
 				$dt->format('Y')
 			);
-		}
-		else
+		} else
 			return parent::getDateTimeValue($container, $column, $record);
 	}
 }

Spacing +10 added lines, -10 removed lines

@@ -61,8 +61,8 @@ 
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$control = parent::createDateControl($container, $column, $record);
-		$value = $this->getRecordPropertyValue($column, $record);
+		$control=parent::createDateControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 			$control->setTimestamp(intval($value));
 		return $control;
@@ -70,11 +70,11 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$time = parent::createDateTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$time=parent::createDateTimeControl($container, $column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$dt = new \DateTime;
+			$dt=new \DateTime;
 			$dt->setTimestamp(intval($value));
 			$time[1]->setSelectedValue($dt->format('G'));
 			$time[2]->setSelectedValue($dt->format('i'));
@@ -87,12 +87,12 @@ 
 	{
 		if(preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
-			$dt = new \DateTime;
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
+			$dt=new \DateTime;
 			$dt->setTimestamp($time);
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 			return $s->getTimeStamp(
 				$hour,
 				$mins,

framework/Collections/TPagedListIterator.php

Doc Comments +2 added lines

@@ -35,6 +35,8 @@
 	 * @param TList the data to be iterated through
 	 * @param integer start index
 	 * @param integer number of items to be iterated through
+	 * @param integer $startIndex
+	 * @param integer $count
 	 */
 	public function __construct(TList $list, $startIndex, $count)
 	{

Spacing +6 added lines, -6 removed lines

@@ -38,13 +38,13 @@ 
 	 */
 	public function __construct(TList $list, $startIndex, $count)
 	{
-		$this->_list = $list;
-		$this->_index = 0;
-		$this->_startIndex = $startIndex;
+		$this->_list=$list;
+		$this->_index=0;
+		$this->_startIndex=$startIndex;
 		if($startIndex + $count > $list->getCount())
-			$this->_count = $list->getCount() - $startIndex;
+			$this->_count=$list->getCount() - $startIndex;
 		else
-			$this->_count = $count;
+			$this->_count=$count;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_index = 0;
+		$this->_index=0;
 	}
 
 	/**

framework/Collections/TPagedMapIterator.php

Doc Comments +2 added lines

@@ -34,6 +34,8 @@
 	/**
 	 * Constructor.
 	 * @param array the data to be iterated through
+	 * @param integer $startIndex
+	 * @param integer $count
 	 */
 	public function __construct(TMap $map, $startIndex, $count)
 	{

Spacing +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@ 
 	 */
 	public function __construct(TMap $map, $startIndex, $count)
 	{
-		$this->_map = $map;
-		$this->_index = 0;
-		$this->_startIndex = $startIndex;
+		$this->_map=$map;
+		$this->_index=0;
+		$this->_startIndex=$startIndex;
 		if($startIndex + $count > $map->getCount())
-			$this->_count = $map->getCount() - $startIndex;
+			$this->_count=$map->getCount() - $startIndex;
 		else
-			$this->_count = $count;
-		$this->_iterator = $map->getIterator();
+			$this->_count=$count;
+		$this->_iterator=$map->getIterator();
 	}
 
 	/**
@@ -54,9 +54,9 @@ 
 	public function rewind()
 	{
 		$this->_iterator->rewind();
-		for($i = 0;$i < $this->_startIndex;++$i)
+		for($i=0; $i < $this->_startIndex; ++$i)
 			$this->_iterator->next();
-		$this->_index = 0;
+		$this->_index=0;
 	}
 
 	/**

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Doc Comments +6 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getCommandBuilder()
 	{
@@ -173,7 +173,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getForeignCommandBuilder()
 	{
@@ -210,6 +210,7 @@ 
 	 * @param string active record class name.
 	 * @param array row data
 	 * @param array foreign key column names
+	 * @param string $type
 	 * @return TActiveRecord
 	 */
 	protected function createFkObject($type, $row, $foreignKeys)
@@ -343,6 +344,9 @@ 
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
+	/**
+	 * @param TActiveRecord $obj
+	 */
 	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);

Spacing +91 added lines, -91 removed lines

@@ -89,7 +89,7 @@ 
 	private $_association;
 	private $_sourceTable;
 	private $_foreignTable;
-	private $_association_columns = [];
+	private $_association_columns=[];
 
 	/**
 	 * Get the foreign key index values from the results and make calls to the
@@ -98,9 +98,9 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
-		$properties = array_values($sourceKeys);
-		$indexValues = $this->getIndexValues($properties, $results);
+		list($sourceKeys, $foreignKeys)=$this->getRelationForeignKeys();
+		$properties=array_values($sourceKeys);
+		$indexValues=$this->getIndexValues($properties, $results);
 		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
@@ -109,10 +109,10 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$association = $this->getAssociationTable();
-		$sourceKeys = $this->findForeignKeys($association, $this->getSourceRecord(), true);
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		$foreignKeys = $this->findForeignKeys($association, $fkObject);
+		$association=$this->getAssociationTable();
+		$sourceKeys=$this->findForeignKeys($association, $this->getSourceRecord(), true);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		$foreignKeys=$this->findForeignKeys($association, $fkObject);
 		return [$sourceKeys, $foreignKeys];
 	}
 
@@ -121,18 +121,18 @@ 
 	 */
 	protected function getAssociationTable()
 	{
-		if($this->_association === null)
+		if($this->_association===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$conn = $this->getSourceRecord()->getDbConnection();
+			$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());
+			$table=explode('.', $this->getContext()->getAssociationTable());
 			if(count($table) > 1)
 			{
-				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/', $columns);
+				$columns=preg_replace('/^\((.*)\)/', '\1', $table[1]);
+				$this->_association_columns=preg_split('/\s*[, ]\*/', $columns);
 			}
-			$this->_association = $gateway->getTableInfo($conn, $table[0]);
+			$this->_association=$gateway->getTableInfo($conn, $table[0]);
 		}
 		return $this->_association;
 	}
@@ -142,10 +142,10 @@ 
 	 */
 	protected function getSourceTable()
 	{
-		if($this->_sourceTable === null)
+		if($this->_sourceTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$this->_sourceTable=$gateway->getRecordTableInfo($this->getSourceRecord());
 		}
 		return $this->_sourceTable;
 	}
@@ -155,11 +155,11 @@ 
 	 */
 	protected function getForeignTable()
 	{
-		if($this->_foreignTable === null)
+		if($this->_foreignTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$fkObject = $this->getContext()->getForeignRecordFinder();
-			$this->_foreignTable = $gateway->getRecordTableInfo($fkObject);
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$fkObject=$this->getContext()->getForeignRecordFinder();
+			$this->_foreignTable=$gateway->getRecordTableInfo($fkObject);
 		}
 		return $this->_foreignTable;
 	}
@@ -177,7 +177,7 @@ 
 	 */
 	protected function getForeignCommandBuilder()
 	{
-		$obj = $this->getContext()->getForeignRecordFinder();
+		$obj=$this->getContext()->getForeignRecordFinder();
 		return $this->getSourceRecord()->getRecordGateway()->getCommand($obj);
 	}
 
@@ -189,19 +189,19 @@ 
 	 */
 	protected function fetchForeignObjects(&$results, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$criteria = $this->getCriteria();
-		$finder = $this->getContext()->getForeignRecordFinder();
-		$type = get_class($finder);
-		$command = $this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
-		$srcProps = array_keys($sourceKeys);
-		$collections = [];
+		$criteria=$this->getCriteria();
+		$finder=$this->getContext()->getForeignRecordFinder();
+		$type=get_class($finder);
+		$command=$this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
+		$srcProps=array_keys($sourceKeys);
+		$collections=[];
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
-			$hash = $this->getObjectHash($row, $srcProps);
+			$hash=$this->getObjectHash($row, $srcProps);
 			foreach($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type, $row, $foreignKeys);
-			$collections[$hash][] = $obj;
+			$obj=$this->createFkObject($type, $row, $foreignKeys);
+			$collections[$hash][]=$obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
 	}
@@ -214,10 +214,10 @@ 
 	 */
 	protected function createFkObject($type, $row, $foreignKeys)
 	{
-		$obj = TActiveRecord::createRecord($type, $row);
+		$obj=TActiveRecord::createRecord($type, $row);
 		if(count($this->_association_columns) > 0)
 		{
-			$i = 0;
+			$i=0;
 			foreach($foreignKeys as $ref => $fk)
 				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
 		}
@@ -232,20 +232,20 @@ 
 	 */
 	public function createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
-		$fkTable = $this->getForeignTable()->getTableFullName();
-		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where = $criteria->getCondition()) === null)
-			$where = '1=1';
-		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
+		$innerJoin=$this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
+		$fkTable=$this->getForeignTable()->getTableFullName();
+		$srcColumns=$this->getSourceColumns($sourceKeys);
+		if(($where=$criteria->getCondition())===null)
+			$where='1=1';
+		$sql="SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 
-		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
+		$builder=$this->getForeignCommandBuilder()->getBuilder();
+		$command=$builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -256,12 +256,12 @@ 
 	 */
 	protected function getSourceColumns($sourceKeys)
 	{
-		$columns = [];
-		$table = $this->getAssociationTable();
-		$tableName = $table->getTableFullName();
-		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
+		$columns=[];
+		$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();
+			$columns[]=$tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -274,26 +274,26 @@ 
 	 */
 	protected function getAssociationJoin($foreignKeys, $indexValues, $sourceKeys)
 	{
-		$refInfo = $this->getAssociationTable();
-		$fkInfo = $this->getForeignTable();
+		$refInfo=$this->getAssociationTable();
+		$fkInfo=$this->getForeignTable();
 
-		$refTable = $refInfo->getTableFullName();
-		$fkTable = $fkInfo->getTableFullName();
+		$refTable=$refInfo->getTableFullName();
+		$fkTable=$fkInfo->getTableFullName();
 
-		$joins = [];
-		$hasAssociationColumns = count($this->_association_columns) > 0;
-		$i = 0;
+		$joins=[];
+		$hasAssociationColumns=count($this->_association_columns) > 0;
+		$i=0;
 		foreach($foreignKeys as $ref => $fk)
 		{
 			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+				$refField=$refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
-			$fkField = $fkInfo->getColumn($fk)->getColumnName();
-			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
+				$refField=$refInfo->getColumn($ref)->getColumnName();
+			$fkField=$fkInfo->getColumn($fk)->getColumnName();
+			$joins[]="{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
-		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
+		$joinCondition=implode(' AND ', $joins);
+		$index=$this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -303,15 +303,15 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
-		$success = true;
-		if(($total = count($fkObjects)) > 0)
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
+		$success=true;
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			$source=$this->getSourceRecord();
+			$builder=$this->getAssociationTableCommandBuilder();
+			for($i=0; $i < $total; $i++)
+				$success=$fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -322,57 +322,57 @@ 
 	 */
 	protected function getAssociationTableCommandBuilder()
 	{
-		$conn = $this->getContext()->getSourceRecord()->getDbConnection();
+		$conn=$this->getContext()->getSourceRecord()->getDbConnection();
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
 	private function hasAssociationData($builder, $data)
 	{
-		$condition = [];
-		$table = $this->getAssociationTable();
+		$condition=[];
+		$table=$this->getAssociationTable();
 		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()));
+			$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;
 	}
 
 	private function addAssociationData($builder, $data)
 	{
-		$command = $builder->createInsertCommand($data);
+		$command=$builder->createInsertCommand($data);
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
 	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
-		$source = $this->getSourceRecordValues($obj);
-		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
-		$success = true;
+		$source=$this->getSourceRecordValues($obj);
+		$foreignKeys=$this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
+		$success=true;
 		foreach($fkObjects as $fkObject)
 		{
-			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
+			$data=array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
 			if(!$this->hasAssociationData($builder, $data))
-				$success = $this->addAssociationData($builder, $data) && $success;
+				$success=$this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
 	}
 
 	private function getSourceRecordValues($obj)
 	{
-		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
-		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
-		$data = [];
-		$i = 0;
+		$sourceKeys=$this->findForeignKeys($this->getAssociationTable(), $obj);
+		$indexValues=$this->getIndexValues(array_values($sourceKeys), $obj);
+		$data=[];
+		$i=0;
 		foreach($sourceKeys as $name => $srcKey)
-			$data[$name] = $indexValues[0][$i++];
+			$data[$name]=$indexValues[0][$i++];
 		return $data;
 	}
 
 	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
-		$data = [];
+		$data=[];
 		foreach($foreignKeys as $name => $fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+			$data[$name]=$fkObject->getColumnValue($fKey);
 		return $data;
 	}
 }

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Doc Comments +2 added lines, -1 removed lines

@@ -95,6 +95,7 @@ 
 
 	/**
 	 * Fetch results for current relationship.
+	 * @param TActiveRecord $obj
 	 * @return boolean always true.
 	 */
 	public function fetchResultsInto($obj)
@@ -107,7 +108,6 @@ 
 	 * Returns foreign keys in $fromRecord with source column names as key
 	 * and foreign column names in the corresponding $matchesRecord as value.
 	 * The method returns the first matching foreign key between these 2 records.
-	 * @param TActiveRecord $fromRecord
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
@@ -215,6 +215,7 @@ 
 	 * @param array source property names
 	 * @param array foreign objects
 	 * @param array foreign object field names.
+	 * @param TActiveRecord[] $fkObjects
 	 */
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{

Spacing +38 added lines, -38 removed lines

@@ -33,8 +33,8 @@ 
 
 	public function __construct(TActiveRecordRelationContext $context, $criteria)
 	{
-		$this->_context = $context;
-		$this->_criteria = $criteria;
+		$this->_context=$context;
+		$this->_criteria=$criteria;
 	}
 
 	/**
@@ -76,20 +76,20 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		static $stack = [];
+		static $stack=[];
 
-		$results = call_user_func_array([$this->getSourceRecord(),$method], $args);
-		$validArray = is_array($results) && count($results) > 0;
+		$results=call_user_func_array([$this->getSourceRecord(), $method], $args);
+		$validArray=is_array($results) && count($results) > 0;
 		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)
-			$stack[] = $this; //call it later
-		elseif($results === null || !$validArray)
-			$stack = [];
+			$stack[]=$this; //call it later
+		elseif($results===null || !$validArray)
+			$stack=[];
 		return $results;
 	}
 
@@ -111,30 +111,30 @@ 
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
-	protected function findForeignKeys($from, $matchesRecord, $loose = false)
+	protected function findForeignKeys($from, $matchesRecord, $loose=false)
 	{
-		$gateway = $matchesRecord->getRecordGateway();
-		$recordTableInfo = $gateway->getRecordTableInfo($matchesRecord);
-		$matchingTableName = strtolower($recordTableInfo->getTableName());
-		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
-		$tableInfo = $from;
+		$gateway=$matchesRecord->getRecordGateway();
+		$recordTableInfo=$gateway->getRecordTableInfo($matchesRecord);
+		$matchingTableName=strtolower($recordTableInfo->getTableName());
+		$matchingFullTableName=strtolower($recordTableInfo->getTableFullName());
+		$tableInfo=$from;
 		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+			$tableInfo=$gateway->getRecordTableInfo($from);
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
-			$fkTable = strtolower($fkeys['table']);
-			if($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
+			$fkTable=strtolower($fkeys['table']);
+			if($fkTable===$matchingTableName || $fkTable===$matchingFullTableName)
 			{
-				$hasFkField = !$loose && $this->getContext()->hasFkField();
-				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
+				$hasFkField=!$loose && $this->getContext()->hasFkField();
+				$key=$hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
 				if(!empty($key))
 					return $key;
 			}
 		}
 
 		//none found
-		$matching = $gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
+		$matching=$gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
 		throw new TActiveRecordException('ar_relations_missing_fk',
 			$tableInfo->getTableFullName(), $matching);
 	}
@@ -152,13 +152,13 @@ 
 	 */
 	private function getFkFields($fkeys)
 	{
-		$matching = [];
+		$matching=[];
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
-		$fields = [];
+		$fields=[];
 		foreach($fkeys as $fkName => $field)
 		{
 			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+				$fields[$fkName]=$field;
 		}
 		return $fields;
 	}
@@ -170,9 +170,9 @@ 
 	 */
 	protected function getObjectHash($obj, $properties)
 	{
-		$ids = [];
+		$ids=[];
 		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+			$ids[]=is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -184,7 +184,7 @@ 
 	 */
 	protected function findForeignObjects($fields, $indexValues)
 	{
-		$finder = $this->getContext()->getForeignRecordFinder();
+		$finder=$this->getContext()->getForeignRecordFinder();
 		return $finder->findAllByIndex($this->_criteria, $fields, $indexValues);
 	}
 
@@ -197,14 +197,14 @@ 
 	protected function getIndexValues($keys, $results)
 	{
 		if(!is_array($results) && !$results instanceof \ArrayAccess)
-			$results = [$results];
-		$values = [];
+			$results=[$results];
+		$values=[];
 		foreach($results as $result)
 		{
-			$value = [];
+			$value=[];
 			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
-			$values[] = $value;
+				$value[]=$result->getColumnValue($name);
+			$values[]=$value;
 		}
 		return $values;
 	}
@@ -218,9 +218,9 @@ 
 	 */
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
-		$collections = [];
+		$collections=[];
 		foreach($fkObjects as $fkObject)
-			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+			$collections[$this->getObjectHash($fkObject, $fields)][]=$fkObject;
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -234,7 +234,7 @@ 
 	{
 		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
@@ -249,9 +249,9 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
-		$source->$prop = isset($collections[$hash]) ? $collections[$hash] : [];
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
+		$source->$prop=isset($collections[$hash]) ? $collections[$hash] : [];
 	}
 }
 

Braces +5 added lines, -6 removed lines

@@ -83,10 +83,10 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		elseif($results instanceof TActiveRecordRelation)
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} elseif($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
 		elseif($results === null || !$validArray)
 			$stack = [];
@@ -236,8 +236,7 @@ 
 		{
 			for($i = 0,$k = count($results);$i < $k;$i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

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

Doc Comments +3 added lines

@@ -66,6 +66,9 @@
 		return $control;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getDefaultControlValue($container, $column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);

Spacing +78 added lines, -78 removed lines

@@ -34,7 +34,7 @@ 
 	{
 		$control->setID(self::DEFAULT_ID);
 		$control->setEnabled($this->getIsEnabled($column, $record));
-		$container->Controls[] = $control;
+		$container->Controls[]=$control;
 	}
 
 	protected function setNotNullProperty($container, $control, $column, $record)
@@ -46,8 +46,8 @@ 
 
 	protected function createBooleanControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TCheckBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TCheckBox();
 		$control->setChecked(TPropertyValue::ensureBoolean($value));
 		$control->setCssClass('boolean-checkbox');
 		$this->setDefaultProperty($container, $control, $column, $record);
@@ -56,11 +56,11 @@ 
 
 	protected function createDefaultControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setCssClass('default-textbox scaffold_input');
-		if(($len = $column->getColumnSize()) !== null)
+		if(($len=$column->getColumnSize())!==null)
 			$control->setMaxLength($len);
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
@@ -68,7 +68,7 @@ 
 
 	protected function getDefaultControlValue($container, $column, $record)
 	{
-		$control = $container->findControl(self::DEFAULT_ID);
+		$control=$container->findControl(self::DEFAULT_ID);
 		if($control instanceof TCheckBox)
 			return $control->getChecked();
 		elseif($control instanceof TControl)
@@ -77,8 +77,8 @@ 
 
 	protected function createMultiLineControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setTextMode(TTextBoxMode::MultiLine);
 		$control->setCssClass('multiline-textbox scaffold_input');
@@ -88,13 +88,13 @@ 
 
 	protected function createYearControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDropDownList();
-		$years = [];
-		$current = intval(@date('Y'));
-		$from = $current - 10; $to = $current + 10;
-		for($i = $from; $i <= $to; $i++)
-			$years[$i] = $i;
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDropDownList();
+		$years=[];
+		$current=intval(@date('Y'));
+		$from=$current - 10; $to=$current + 10;
+		for($i=$from; $i <= $to; $i++)
+			$years[$i]=$i;
 		$control->setDataSource($years);
 		$control->setSelectedValue(empty($value) ? $current : $value);
 		$control->setCssClass('year-dropdown');
@@ -104,8 +104,8 @@ 
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Integer);
 		$val->setErrorMessage('Please entery an integer.');
 		return $control;
@@ -113,111 +113,111 @@ 
 
 	protected function createFloatControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Float);
 		$val->setErrorMessage('Please entery a decimal number.');
-		if(($max = $column->getMaxiumNumericConstraint()) !== null)
+		if(($max=$column->getMaxiumNumericConstraint())!==null)
 		{
-			$val = $this->createRangeValidator($container, $column, $record);
+			$val=$this->createRangeValidator($container, $column, $record);
 			$val->setDataType(TValidationDataType::Float);
 			$val->setMaxValue($max);
 			$val->setStrictComparison(true);
-			$val->setErrorMessage('Please entery a decimal number strictly less than ' . $max . '.');
+			$val->setErrorMessage('Please entery a decimal number strictly less than '.$max.'.');
 		}
 		return $control;
 	}
 
 	protected function createRequiredValidator($container, $column, $record)
 	{
-		$val = new TRequiredFieldValidator();
+		$val=new TRequiredFieldValidator();
 		$val->setErrorMessage('*');
 		$val->setControlCssClass('required-input');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTypeValidator($container, $column, $record)
 	{
-		$val = new TDataTypeValidator();
+		$val=new TDataTypeValidator();
 		$val->setControlCssClass('required-input2');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createRangeValidator($container, $column, $record)
 	{
-		$val = new TRangeValidator();
+		$val=new TRangeValidator();
 		$val->setControlCssClass('required-input3');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$hours = [];
-		for($i = 0;$i < 24;$i++) $hours[] = str_pad($i, 2, '0', STR_PAD_LEFT);
-		$mins = [];
-		for($i = 0;$i < 60;$i++) $mins[] = str_pad($i, 2, '0', STR_PAD_LEFT);
-		$hour = intval(@date('H'));
-		$min = intval(@date('i'));
-		$sec = intval(@date('s'));
+		$value=$this->getRecordPropertyValue($column, $record);
+		$hours=[];
+		for($i=0; $i < 24; $i++) $hours[]=str_pad($i, 2, '0', STR_PAD_LEFT);
+		$mins=[];
+		for($i=0; $i < 60; $i++) $mins[]=str_pad($i, 2, '0', STR_PAD_LEFT);
+		$hour=intval(@date('H'));
+		$min=intval(@date('i'));
+		$sec=intval(@date('s'));
 		if(!empty($value))
 		{
-			$match = [];
+			$match=[];
 			if(preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
 			{
-				$hour = $match[1];
-				$min = $match[2];
+				$hour=$match[1];
+				$min=$match[2];
 				if(isset($match[3]))
-					$sec = $match[3];
+					$sec=$match[3];
 			}
 		}
 
-		$hcontrol = new TDropDownList();
+		$hcontrol=new TDropDownList();
 		$hcontrol->setDataSource($hours);
 		$hcontrol->setID(self::DEFAULT_ID);
 		$hcontrol->dataBind();
 		$hcontrol->setSelectedValue(intval($hour));
-		$container->Controls[] = $hcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$hcontrol;
+		$container->Controls[]=' : ';
 
-		$mcontrol = new TDropDownList();
+		$mcontrol=new TDropDownList();
 		$mcontrol->setDataSource($mins);
 		$mcontrol->dataBind();
 		$mcontrol->setID('scaffold_time_min');
 		$mcontrol->setSelectedValue(intval($min));
-		$container->Controls[] = $mcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$mcontrol;
+		$container->Controls[]=' : ';
 
-		$scontrol = new TDropDownList();
+		$scontrol=new TDropDownList();
 		$scontrol->setDataSource($mins);
 		$scontrol->dataBind();
 		$scontrol->setID('scaffold_time_sec');
 		$scontrol->setSelectedValue(intval($sec));
-		$container->Controls[] = $scontrol;
+		$container->Controls[]=$scontrol;
 
-		return [$hcontrol,$mcontrol,$scontrol];
+		return [$hcontrol, $mcontrol, $scontrol];
 	}
 
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDatePicker();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDatePicker();
 		$control->setFromYear(1900);
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
 		$control->setDateFormat('yyyy-MM-dd');
@@ -230,13 +230,13 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = $this->createDateControl($container, $column, $record);
-		$container->Controls[] = ' @ ';
-		$time = $this->createTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=$this->createDateControl($container, $column, $record);
+		$container->Controls[]=' @ ';
+		$time=$this->createTimeControl($container, $column, $record);
 		if(!empty($value))
 		{
-			$match = [];
+			$match=[];
 			if(preg_match('/(\d+):(\d+):?(\d+)?/', substr($value, 11), $match))
 			{
 				$time[0]->setSelectedValue(intval($match[1]));
@@ -251,27 +251,27 @@ 
 
 	protected function getDateTimeValue($container, $column, $record)
 	{
-		$date = $container->findControl(self::DEFAULT_ID)->getDate();
-		$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$date=$container->findControl(self::DEFAULT_ID)->getDate();
+		$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$date} {$hour}:{$mins}:{$secs}";
 	}
 
 	protected function getTimeValue($container, $column, $record)
 	{
-		$hour = $container->findControl(self::DEFAULT_ID)->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$hour=$container->findControl(self::DEFAULT_ID)->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$hour}:{$mins}:{$secs}";
 	}
 
 	protected function createSetControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TCheckBoxList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TCheckBoxList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
 		$control->setSelectedIndices($this->getMatchingIndices($values, $selectedValues));
@@ -283,24 +283,24 @@ 
 
 	protected function getMatchingIndices($checks, $values)
 	{
-		$index = [];
-		for($i = 0, $k = count($checks); $i < $k; $i++)
+		$index=[];
+		for($i=0, $k=count($checks); $i < $k; $i++)
 		{
 			if(in_array($checks[$i], $values))
-				$index[] = $i;
+				$index[]=$i;
 		}
 		return $index;
 	}
 
 	protected function createEnumControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TRadioButtonList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TRadioButtonList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
-		$index = $this->getMatchingIndices($values, $selectedValues);
+		$index=$this->getMatchingIndices($values, $selectedValues);
 		if(count($index) > 0)
 			$control->setSelectedIndex($index[0]);
 		$control->setID(self::DEFAULT_ID);
@@ -311,11 +311,11 @@ 
 
 	protected function getSetValue($container, $column, $record)
 	{
-		$value = [];
+		$value=[];
 		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
 		{
 			if($item->getSelected())
-				$value[] = $item->getText();
+				$value[]=$item->getText();
 		}
 		return implode(',', $value);
 	}

framework/Data/Common/Oracle/TOracleMetaData.php

Doc Comments +3 added lines, -1 removed lines

@@ -149,7 +149,7 @@ 
 	/**
 	 * @param string table schema name
 	 * @param string table name.
-	 * @return boolean true if the table is a view.
+	 * @return integer true if the table is a view.
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
@@ -171,6 +171,7 @@ 
 	/**
 	 * @param TOracleTableInfo table information.
 	 * @param array column information.
+	 * @param TOracleTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
@@ -326,6 +327,7 @@ 
 	/**
 	 * @param string column name.
 	 * @param TOracleTableInfo table information.
+	 * @param string $columnId
 	 * @return boolean true if column is a foreign key.
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)

Spacing +68 added lines, -68 removed lines

@@ -29,7 +29,7 @@ 
  */
 class TOracleMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'system';
+	private $_defaultSchema='system';
 
 
 	/**
@@ -45,7 +45,7 @@ 
 	 */
 	public function setDefaultSchema($schema)
 	{
-		$this->_defaultSchema = $schema;
+		$this->_defaultSchema=$schema;
 	}
 
 	/**
@@ -62,10 +62,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts = explode('.', str_replace('"', '', $table))) > 1)
+		if(count($parts=explode('.', str_replace('"', '', $table))) > 1)
 			return [$parts[0], $parts[1]];
 		else
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 	}
 
 	/**
@@ -75,12 +75,12 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName, $tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
 		// sequence on the field.
-		$sql =
+		$sql=
 <<<EOD
 		SELECT
 			a.COLUMN_ID,
@@ -100,17 +100,17 @@ 
 EOD;
 		$this->getDbConnection()->setActive(true);
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
-		$index = 0;
+		$tableInfo=$this->createNewTableInfo($schemaName, $tableName);
+		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index === 0)
+		if($index===0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		return $tableInfo;
 	}
@@ -122,12 +122,12 @@ 
 	 */
 	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName'] = $this->assertIdentifier($tableName);
-		$info['IsView'] = false;
-		if($this->getIsView($schemaName, $tableName)) $info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
+		$info['IsView']=false;
+		if($this->getIsView($schemaName, $tableName)) $info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
 	}
 
@@ -138,9 +138,9 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if(strpos($name, '"') !== false)
+		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.oracle.com';
+			$ref='http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -154,7 +154,7 @@ 
 	protected function getIsView($schemaName, $tableName)
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$sql =
+		$sql=
 <<<EOD
 		select	OBJECT_TYPE
 		from 	ALL_OBJECTS
@@ -162,10 +162,10 @@ 
 		and 	OWNER = '{$schemaName}'
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
 		//$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar() === 'VIEW');
+		return intval($command->queryScalar()==='VIEW');
 	}
 
 	/**
@@ -174,17 +174,17 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = strtolower($col['attname']); //use column name as column Id
+		$columnId=strtolower($col['attname']); //use column name as column Id
 
 		//$info['ColumnName'] 	= '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnName'] = $columnId; //NOT quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
-		if(! (bool)$col['attnotnull']) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if((int)$col['atttypmod'] > 0) $info['ColumnSize'] = $col['atttypmod']; // - 4;
-		if((bool)$col['atthasdef']) $info['DefaultValue'] = $col['adsrc'];
+		$info['ColumnName']=$columnId; //NOT quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
+		if(!(bool) $col['attnotnull']) $info['AllowNull']=true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey']=true;
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey']=true;
+		if((int) $col['atttypmod'] > 0) $info['ColumnSize']=$col['atttypmod']; // - 4;
+		if((bool) $col['atthasdef']) $info['DefaultValue']=$col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -198,22 +198,22 @@ 
 			}
 		}
 		*/
-		$matches = [];
+		$matches=[];
 		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
+			$info['DbType']=preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
 			if($this->isPrecisionType($info['DbType']))
 			{
-				$info['NumericPrecision'] = intval($matches[1]);
+				$info['NumericPrecision']=intval($matches[1]);
 				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+					$info['NumericScale']=intval($matches[2]);
 			}
 			else
-				$info['ColumnSize'] = intval($matches[1]);
+				$info['ColumnSize']=intval($matches[1]);
 		}
 		else
-			$info['DbType'] = $col['type'];
-		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
+			$info['DbType']=$col['type'];
+		$tableInfo->Columns[$columnId]=new TOracleTableColumn($info);
 	}
 
 	/**
@@ -221,13 +221,13 @@ 
 	 */
 	protected function getSequenceName($tableInfo, $src)
 	{
-		$matches = [];
+		$matches=[];
 		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
 			if(is_int(strpos($matches[1], '.')))
 				return $matches[1];
 			else
-				return $tableInfo->getSchemaName() . '.' . $matches[1];
+				return $tableInfo->getSchemaName().'.'.$matches[1];
 		}
 	}
 
@@ -236,8 +236,8 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
-		return $type === 'number'; // || $type==='interval' || strpos($type, 'time')===0;
+		$type=strtolower(trim($type));
+		return $type==='number'; // || $type==='interval' || strpos($type, 'time')===0;
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 //		select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc,
-		$sql =
+		$sql=
 <<<EOD
 		select b.COLUMN_NAME as consrc,
 			   a.CONSTRAINT_TYPE as contype
@@ -261,24 +261,24 @@ 
 		and   a.CONSTRAINT_TYPE in ('P','R')
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$primary = [];
-		$foreign = [];
+		$primary=[];
+		$foreign=[];
 		foreach($command->query() as $row)
 		{
 			switch(strtolower($row['contype']))
 			{
 				case 'p':
-					$primary = array_merge($primary, [strtolower($row['consrc'])]);
+					$primary=array_merge($primary, [strtolower($row['consrc'])]);
 					/*
 					$arr = $this->getPrimaryKeys($row['consrc']);
 					$primary = array_merge( $primary, array(strtolower( $arr[0] )) );
 					*/
 					break;
 				case 'r':
-					$foreign = array_merge($foreign, [strtolower($row['consrc'])]);
+					$foreign=array_merge($foreign, [strtolower($row['consrc'])]);
 					/*
 					// if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
 					$fkey = $this->getForeignKeys( $row['consrc'] );
@@ -287,7 +287,7 @@ 
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	protected function getPrimaryKeys($src)
 	{
-		$matches = [];
+		$matches=[];
 		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
 			return preg_split('/,\s+/', $matches[1]);
 		return [];
@@ -310,15 +310,15 @@ 
 	 */
 	protected function getForeignKeys($src)
 	{
-		$matches = [];
-		$brackets = '\(([^\)]+)\)';
-		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
+		$matches=[];
+		$brackets='\(([^\)]+)\)';
+		$find="/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
 		if(preg_match($find, $src, $matches))
 		{
-			$keys = preg_split('/,\s+/', $matches[1]);
-			$fkeys = [];
+			$keys=preg_split('/,\s+/', $matches[1]);
+			$fkeys=[];
 			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+				$fkeys[$keys[$i]]=$fkey;
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
 	}
@@ -332,7 +332,7 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if($fk == $columnId)
+			if($fk==$columnId)
 			//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
@@ -345,33 +345,33 @@ 
 		 * If not empty, the returned table names will be prefixed with the schema name.
 		 * @return array all table names in the database.
 		 */
-	public function findTableNames($schema = '')
+	public function findTableNames($schema='')
 	{
-		if($schema === '')
+		if($schema==='')
 		{
-			$sql = <<<EOD
+			$sql=<<<EOD
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
-			$command = $this->getDbConnection()->createCommand($sql);
+			$command=$this->getDbConnection()->createCommand($sql);
 		}
 		else
 		{
-			$sql = <<<EOD
+			$sql=<<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects
 WHERE object_type = 'TABLE' AND owner=:schema
 EOD;
-			$command = $this->getDbConnection()->createCommand($sql);
+			$command=$this->getDbConnection()->createCommand($sql);
 			$command->bindParam(':schema', $schema);
 		}
 
-		$rows = $command->queryAll();
-		$names = [];
+		$rows=$command->queryAll();
+		$names=[];
 		foreach($rows as $row)
 		{
-			if($schema === $this->getDefaultSchema() || $schema === '')
-				$names[] = $row['TABLE_NAME'];
+			if($schema===$this->getDefaultSchema() || $schema==='')
+				$names[]=$row['TABLE_NAME'];
 			else
-				$names[] = $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+				$names[]=$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
 		}
 		return $names;
 	}

Braces +3 added lines, -6 removed lines

@@ -207,11 +207,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
@@ -353,8 +351,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command = $this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql = <<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects

framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php

Doc Comments +5 added lines

@@ -255,6 +255,7 @@ 
 	 * in the sql text. Extracts inline parameter maps.
 	 * @param TSqlMapStatement mapped statement.
 	 * @param SimpleXmlElement statement node.
+	 * @param TSqlMapStatement $statement
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
@@ -278,6 +279,7 @@ 
 	 * @param TSqlMapStatement statement object.
 	 * @param string sql text
 	 * @param SimpleXmlElement statement node.
+	 * @param string $sqlStatement
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
@@ -375,6 +377,7 @@ 
 	/**
 	 * Load the selectKey statement from xml mapping.
 	 * @param SimpleXmlElement selectkey node
+	 * @param TSqlMapInsert $insert
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
@@ -465,6 +468,7 @@ 
 	 * Load the flush interval
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement cache node
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
@@ -500,6 +504,7 @@ 
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{

Spacing +93 added lines, -93 removed lines

@@ -40,25 +40,25 @@ 
 
 	private $_document;
 
-	private $_FlushOnExecuteStatements = [];
+	private $_FlushOnExecuteStatements=[];
 
 	/**
 	 * Regular expressions for escaping simple/inline parameter symbols
 	 */
-	const SIMPLE_MARK = '$';
-	const INLINE_SYMBOL = '#';
-	const ESCAPED_SIMPLE_MARK_REGEXP = '/\$\$/';
-	const ESCAPED_INLINE_SYMBOL_REGEXP = '/\#\#/';
-	const SIMPLE_PLACEHOLDER = '`!!`';
-	const INLINE_PLACEHOLDER = '`!!!`';
+	const SIMPLE_MARK='$';
+	const INLINE_SYMBOL='#';
+	const ESCAPED_SIMPLE_MARK_REGEXP='/\$\$/';
+	const ESCAPED_INLINE_SYMBOL_REGEXP='/\#\#/';
+	const SIMPLE_PLACEHOLDER='`!!`';
+	const INLINE_PLACEHOLDER='`!!!`';
 
 	/**
 	 * @param TSqlMapXmlConfiguration parent xml configuration.
 	 */
 	public function __construct(TSqlMapXmlConfiguration $xmlConfig)
 	{
-		$this->_xmlConfig = $xmlConfig;
-		$this->_manager = $xmlConfig->getManager();
+		$this->_xmlConfig=$xmlConfig;
+		$this->_manager=$xmlConfig->getManager();
 	}
 
 	protected function getConfigFile()
@@ -72,13 +72,13 @@ 
 	 */
 	public function configure($filename)
 	{
-		$this->_configFile = $filename;
-		$document = $this->loadXmlDocument($filename, $this->_xmlConfig);
-		$this->_document = $document;
+		$this->_configFile=$filename;
+		$document=$this->loadXmlDocument($filename, $this->_xmlConfig);
+		$this->_document=$document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies===null)
+			$bCacheDependencies=true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
 		if($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
@@ -121,15 +121,15 @@ 
 	 */
 	protected function loadResultMap($node)
 	{
-		$resultMap = $this->createResultMap($node);
+		$resultMap=$this->createResultMap($node);
 
 		//find extended result map.
-		if(strlen($extendMap = $resultMap->getExtends()) > 0)
+		if(strlen($extendMap=$resultMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getResultMaps()->contains($extendMap))
 			{
-				$extendNode = $this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
-				if($extendNode !== null)
+				$extendNode=$this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
+				if($extendNode!==null)
 					$this->loadResultMap($extendNode);
 			}
 
@@ -137,7 +137,7 @@ 
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
-			$superMap = $this->_manager->getResultMap($extendMap);
+			$superMap=$this->_manager->getResultMap($extendMap);
 			$resultMap->getColumns()->mergeWith($superMap->getColumns());
 		}
 
@@ -154,37 +154,37 @@ 
 	 */
 	protected function createResultMap($node)
 	{
-		$resultMap = new TResultMap();
+		$resultMap=new TResultMap();
 		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
 		foreach($node->result as $result)
 		{
-			$property = new TResultProperty($resultMap);
+			$property=new TResultProperty($resultMap);
 			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//create the discriminator
-		$discriminator = null;
+		$discriminator=null;
 		if(isset($node->discriminator))
 		{
-			$discriminator = new TDiscriminator();
+			$discriminator=new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
 
 		foreach($node->xpath('subMap') as $subMapNode)
 		{
-			if($discriminator === null)
+			if($discriminator===null)
 				throw new TSqlMapConfigurationException(
 					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
-			$subMap = new TSubMap;
+			$subMap=new TSubMap;
 			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
-		if($discriminator !== null)
+		if($discriminator!==null)
 			$resultMap->setDiscriminator($discriminator);
 
 		return $resultMap;
@@ -197,22 +197,22 @@ 
 	 */
 	protected function loadParameterMap($node)
 	{
-		$parameterMap = $this->createParameterMap($node);
+		$parameterMap=$this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if(strlen($extendMap=$parameterMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
-				$extendNode = $this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
-				if($extendNode !== null)
+				$extendNode=$this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
+				if($extendNode!==null)
 					$this->loadParameterMap($extendNode);
 			}
 
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
-			$superMap = $this->_manager->getParameterMap($extendMap);
-			$index = 0;
+			$superMap=$this->_manager->getParameterMap($extendMap);
+			$index=0;
 			foreach($superMap->getPropertyNames() as $propertyName)
 				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
@@ -226,11 +226,11 @@ 
 	 */
 	protected function createParameterMap($node)
 	{
-		$parameterMap = new TParameterMap();
+		$parameterMap=new TParameterMap();
 		$this->setObjectPropFromNode($parameterMap, $node);
 		foreach($node->parameter as $parameter)
 		{
-			$property = new TParameterProperty();
+			$property=new TParameterProperty();
 			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
@@ -243,10 +243,10 @@ 
 	 */
 	protected function loadStatementTag($node)
 	{
-		$statement = new TSqlMapStatement();
+		$statement=new TSqlMapStatement();
 		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
-		$mappedStatement = new TMappedStatement($this->_manager, $statement);
+		$mappedStatement=new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -258,12 +258,12 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
-		if(strlen($extend = $statement->getExtends()) > 0)
+		$commandText=(string) $node;
+		if(strlen($extend=$statement->getExtends()) > 0)
 		{
-			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
-			if($superNode !== null)
-				$commandText = (string)$superNode . $commandText;
+			$superNode=$this->getElementByIdValue($this->_document, '*', $extend);
+			if($superNode!==null)
+				$commandText=(string) $superNode.$commandText;
 			else
 				throw new TSqlMapConfigurationException(
 						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
@@ -281,27 +281,27 @@ 
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
-		$scope['file'] = $this->_configFile;
-		$scope['node'] = $node;
+		$scope['file']=$this->_configFile;
+		$scope['node']=$node;
 
-		$sqlStatement = preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
-		if($statement->parameterMap() === null)
+		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
+		if($statement->parameterMap()===null)
 		{
 			// Build a Parametermap with the inline parameters.
 			// if they exist. Then delete inline infos from sqltext.
-			$parameterParser = new TInlineParameterMapParser;
-			$sqlText = $parameterParser->parse($sqlStatement, $scope);
+			$parameterParser=new TInlineParameterMapParser;
+			$sqlText=$parameterParser->parse($sqlStatement, $scope);
 			if(count($sqlText['parameters']) > 0)
 			{
-				$map = new TParameterMap();
-				$map->setID($statement->getID() . '-InLineParameterMap');
+				$map=new TParameterMap();
+				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
 				foreach($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
-			$sqlStatement = $sqlText['sql'];
+			$sqlStatement=$sqlText['sql'];
 		}
-		$sqlStatement = preg_replace('/' . self::INLINE_PLACEHOLDER . '/', self::INLINE_SYMBOL, $sqlStatement);
+		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/', self::INLINE_SYMBOL, $sqlStatement);
 
 		$this->prepareSql($statement, $sqlStatement, $node);
 	}
@@ -315,17 +315,17 @@ 
 	 */
 	protected function prepareSql($statement, $sqlStatement, $node)
 	{
-		$simpleDynamic = new TSimpleDynamicParser;
-		$sqlStatement = preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
-		$dynamics = $simpleDynamic->parse($sqlStatement);
+		$simpleDynamic=new TSimpleDynamicParser;
+		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
+		$dynamics=$simpleDynamic->parse($sqlStatement);
 		if(count($dynamics['parameters']) > 0)
 		{
-			$sql = new TSimpleDynamicSql($dynamics['parameters']);
-			$sqlStatement = $dynamics['sql'];
+			$sql=new TSimpleDynamicSql($dynamics['parameters']);
+			$sqlStatement=$dynamics['sql'];
 		}
 		else
-			$sql = new TStaticSql();
-		$sqlStatement = preg_replace('/' . self::SIMPLE_PLACEHOLDER . '/', self::SIMPLE_MARK, $sqlStatement);
+			$sql=new TStaticSql();
+		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -336,12 +336,12 @@ 
 	 */
 	protected function loadSelectTag($node)
 	{
-		$select = new TSqlMapSelect;
+		$select=new TSqlMapSelect;
 		$this->setObjectPropFromNode($select, $node);
 		$this->processSqlStatement($select, $node);
-		$mappedStatement = new TMappedStatement($this->_manager, $select);
+		$mappedStatement=new TMappedStatement($this->_manager, $select);
 		if(strlen($select->getCacheModel()) > 0)
-			$mappedStatement = new TCachingStatement($mappedStatement);
+			$mappedStatement=new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
@@ -352,9 +352,9 @@ 
 	 */
 	protected function loadInsertTag($node)
 	{
-		$insert = $this->createInsertStatement($node);
+		$insert=$this->createInsertStatement($node);
 		$this->processSqlStatement($insert, $node);
-		$mappedStatement = new TInsertMappedStatement($this->_manager, $insert);
+		$mappedStatement=new TInsertMappedStatement($this->_manager, $insert);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -365,7 +365,7 @@ 
 	 */
 	protected function createInsertStatement($node)
 	{
-		$insert = new TSqlMapInsert;
+		$insert=new TSqlMapInsert;
 		$this->setObjectPropFromNode($insert, $node);
 		if(isset($node->selectKey))
 			$this->loadSelectKeyTag($insert, $node->selectKey);
@@ -378,13 +378,13 @@ 
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
-		$selectKey = new TSqlMapSelectKey;
+		$selectKey=new TSqlMapSelectKey;
 		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
-		$selectKey->setID($insert->getID() . '.SelectKey');
+		$selectKey->setID($insert->getID().'.SelectKey');
 		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
-		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
+		$mappedStatement=new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -394,10 +394,10 @@ 
 	 */
 	protected function loadUpdateTag($node)
 	{
-		$update = new TSqlMapUpdate;
+		$update=new TSqlMapUpdate;
 		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
-		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
+		$mappedStatement=new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -407,10 +407,10 @@ 
 	 */
 	protected function loadDeleteTag($node)
 	{
-		$delete = new TSqlMapDelete;
+		$delete=new TSqlMapDelete;
 		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
-		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
+		$mappedStatement=new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -430,23 +430,23 @@ 
 	 */
 	protected function loadCacheModel($node)
 	{
-		$cacheModel = new TSqlMapCacheModel;
-		$properties = ['id','implementation'];
+		$cacheModel=new TSqlMapCacheModel;
+		$properties=['id', 'implementation'];
 		foreach($node->attributes() as $name => $value)
 		{
 			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set' . $name}((string)$value);
+				$cacheModel->{'set'.$name}((string) $value);
 		}
-		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
+		$cache=Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
 		$this->setObjectPropFromNode($cache, $node, $properties);
 
 		foreach($node->xpath('property') as $propertyNode)
 		{
-			$name = $propertyNode->attributes()->name;
-			if($name === null || $name === '') continue;
+			$name=$propertyNode->attributes()->name;
+			if($name===null || $name==='') continue;
 
-			$value = $propertyNode->attributes()->value;
-			if($value === null || $value === '') continue;
+			$value=$propertyNode->attributes()->value;
+			if($value===null || $value==='') continue;
 
 			if(!TPropertyAccess::has($cache, $name)) continue;
 
@@ -468,27 +468,27 @@ 
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
-		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
-		$duration = 0;
+		$flushInterval=$node->xpath('flushInterval');
+		if($flushInterval===null || count($flushInterval)===0) return;
+		$duration=0;
 		foreach($flushInterval[0]->attributes() as $name => $value)
 		{
 			switch(strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration+=(integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration+=60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration+=3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration+=86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration=(integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -503,13 +503,13 @@ 
 	 */
 	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
-		$id = $cacheModel->getID();
+		$id=$cacheModel->getID();
 		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = [];
+			$this->_FlushOnExecuteStatements[$id]=[];
 		foreach($node->attributes() as $name => $value)
 		{
-			if(strtolower($name) === 'statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+			if(strtolower($name)==='statement')
+				$this->_FlushOnExecuteStatements[$id][]=(string) $value;
 		}
 	}
 
@@ -520,10 +520,10 @@ 
 	{
 		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
-			$cacheModel = $this->_manager->getCacheModel($cacheID);
+			$cacheModel=$this->_manager->getCacheModel($cacheID);
 			foreach($statementIDs as $statementID)
 			{
-				$statement = $this->_manager->getMappedStatement($statementID);
+				$statement=$this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -322,8 +322,7 @@
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
-		}
-		else
+		} else
 			$sql = new TStaticSql();
 		$sqlStatement = preg_replace('/' . self::SIMPLE_PLACEHOLDER . '/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);