pradosoft / prado

framework/Data/Common/TDbTableInfo.php

Spacing +9 added lines, -9 removed lines

@@ -31,13 +31,13 @@ 
 	 * @var null|array
 	 * @since 3.1.7
 	 */
-	private $_names = null;
+	private $_names=null;
 
 	/**
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())
+	public function __construct($tableInfo=array(), $primary=array(), $foreign=array())
 	{
 		$this->_info=$tableInfo;
 		$this->_primaryKeys=$primary;
@@ -52,7 +52,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.TDbCommandBuilder');
-		return new TDbCommandBuilder($connection,$this);
+		return new TDbCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name,$default=null)
+	protected function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -69,7 +69,7 @@ 
 	 * @param string information array key name
 	 * @param mixed new information array value.
 	 */
-	protected function setInfo($name,$value)
+	protected function setInfo($name, $value)
 	{
 		$this->_info[$name]=$value;
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
+		if(($column=$this->_columns->itemAt($name))!==null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -127,7 +127,7 @@ 
 		{
 			$this->_names=array();
 			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+				$this->_names[]=$column->getColumnName();
 		}
 		return $this->_names;
 	}
@@ -157,7 +157,7 @@ 
 		{
 			$this->_lowercase=array();
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

framework/Data/Common/Sqlite/TSqliteMetaData.php

Spacing +36 added lines, -36 removed lines

@@ -69,30 +69,30 @@ 
 	 */
 	protected function createTableInfo($tableName)
 	{
-		$tableName = str_replace("'",'',$tableName);
+		$tableName=str_replace("'", '', $tableName);
 		$this->getDbConnection()->setActive(true);
-		$table = $this->getDbConnection()->quoteString($tableName);
-		$sql = "PRAGMA table_info({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$foreign = $this->getForeignKeys($table);
+		$table=$this->getDbConnection()->quoteString($tableName);
+		$sql="PRAGMA table_info({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$foreign=$this->getForeignKeys($table);
 		$index=0;
 		$columns=array();
 		$primary=array();
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
-			$column = $this->processColumn($col, $foreign);
-			$columns[$col['name']] = $column;
+			$col['index']=$index++;
+			$column=$this->processColumn($col, $foreign);
+			$columns[$col['name']]=$column;
 			if($column->getIsPrimaryKey())
-				$primary[] = $col['name'];
+				$primary[]=$col['name'];
 		}
-		$info['TableName'] = $tableName;
+		$info['TableName']=$tableName;
 		if($this->getIsView($tableName))
-			$info['IsView'] = true;
+			$info['IsView']=true;
 		if(count($columns)===0)
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
-		$class = $this->getTableInfoClass();
-		$tableInfo = new $class($info,$primary,$foreign);
+		$class=$this->getTableInfoClass();
+		$tableInfo=new $class($info, $primary, $foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
 		return $tableInfo;
 	}
@@ -103,11 +103,11 @@ 
 	 */
 	protected function getIsView($tableName)
 	{
-		$sql = 'SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
+		$sql='SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -117,39 +117,39 @@ 
 	 */
 	protected function processColumn($col, $foreign)
 	{
-		$columnId = $col['name']; //use column name as column Id
+		$columnId=$col['name']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']='"'.$columnId.'"'; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 
 		if($col['notnull']!=='99')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 
 		if($col['pk']==='1')
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $foreign))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['dflt_value']!==null)
-			$info['DefaultValue'] = $col['dflt_value'];
+			$info['DefaultValue']=$col['dflt_value'];
 
-		$type = strtolower($col['type']);
-		$info['AutoIncrement'] = $type==='integer' && $col['pk']==='1';
+		$type=strtolower($col['type']);
+		$info['AutoIncrement']=$type==='integer' && $col['pk']==='1';
 
-		$info['DbType'] = $type;
+		$info['DbType']=$type;
 		$match=array();
 		if(is_int($pos=strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
 		{
-			$ps = explode(',', $match[1]);
+			$ps=explode(',', $match[1]);
 			if(count($ps)===2)
 			{
-				$info['NumericPrecision'] = intval($ps[0]);
-				$info['NumericScale'] = intval($ps[1]);
+				$info['NumericPrecision']=intval($ps[0]);
+				$info['NumericScale']=intval($ps[1]);
 			}
 			else
 				$info['ColumnSize']=intval($match[1]);
-			$info['DbType'] = substr($type,0,$pos);
+			$info['DbType']=substr($type, 0, $pos);
 		}
 
 		return new TSqliteTableColumn($info);
@@ -163,13 +163,13 @@ 
 	 */
 	protected function getForeignKeys($table)
 	{
-		$sql = "PRAGMA foreign_key_list({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$fkeys = array();
+		$sql="PRAGMA foreign_key_list({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$fkeys=array();
 		foreach($command->query() as $col)
 		{
-			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
-			$fkeys[$col['table']]['table'] = $col['table'];
+			$fkeys[$col['table']]['keys'][$col['from']]=$col['to'];
+			$fkeys[$col['table']]['table']=$col['table'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Spacing +4 added lines, -4 removed lines

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

framework/Data/Common/Sqlite/TSqliteTableInfo.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Sqlite.TSqliteCommandBuilder');
-		return new TSqliteCommandBuilder($connection,$this);
+		return new TSqliteCommandBuilder($connection, $this);
 	}
 
 	/**

framework/Data/Common/Sqlite/TSqliteTableColumn.php

Spacing +2 added lines, -2 removed lines

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

framework/Data/TDataSourceConfig.php

Spacing +6 added lines, -6 removed lines

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

framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php

Spacing +14 added lines, -14 removed lines

@@ -77,13 +77,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_keys($fkeys);
-		$fields = array_values($fkeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields, $indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$properties=array_keys($fkeys);
+		$fields=array_values($fkeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -92,8 +92,8 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		return $this->findForeignKeys($this->getSourceRecord(),$fkObject);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		return $this->findForeignKeys($this->getSourceRecord(), $fkObject);
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
 			if(count($collections[$hash]) > 1)
@@ -121,13 +121,13 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObject = $obj->getColumnValue($this->getContext()->getProperty());
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObject=$obj->getColumnValue($this->getContext()->getProperty());
 		if($fkObject!==null)
 		{
 			$fkObject->save();
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($source, $fkObject);
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($source, $fkObject);
 			foreach($fkeys as $srcKey => $fKey)
 				$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
 			return true;

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
 
 	public function getPropertyValue()
 	{
-		$obj = $this->getSourceRecord();
+		$obj=$this->getSourceRecord();
 		return $obj->getColumnValue($this->getProperty());
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:array();
+		return isset($this->_relation[4]) ? $this->_relation[4] : array();
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function hasFkField()
 	{
-		$notManyToMany = $this->getRelationType() !== TActiveRecord::MANY_TO_MANY;
+		$notManyToMany=$this->getRelationType()!==TActiveRecord::MANY_TO_MANY;
 		return $notManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function hasAssociationTable()
 	{
-		$isManyToMany = $this->getRelationType() === TActiveRecord::MANY_TO_MANY;
+		$isManyToMany=$this->getRelationType()===TActiveRecord::MANY_TO_MANY;
 		return $isManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -174,7 +174,7 @@ 
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
 		if($criteria===null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+			$criteria=new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -202,15 +202,15 @@ 
 		$success=true;
 		foreach($this->_record->getRecordRelations() as $data)
 		{
-			list($property, $relation) = $data;
-			$belongsTo = $relation[0]==TActiveRecord::BELONGS_TO;
+			list($property, $relation)=$data;
+			$belongsTo=$relation[0]==TActiveRecord::BELONGS_TO;
 			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
-				$obj = $this->getSourceRecord();
+				$obj=$this->getSourceRecord();
 				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
-					$context = new TActiveRecordRelationContext($this->getSourceRecord(),$property,$relation);
-					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
+					$context=new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
+					$success=$context->getRelationHandler()->updateAssociatedRecords() && $success;
 				}
 			}
 		}
@@ -220,7 +220,7 @@ 
 	protected function isEmptyFkObject($obj)
 	{
 		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
+			return $obj instanceof TList ? $obj->count()===0 : false;
 		else if(is_array($obj))
 			return count($obj)===0;
 		else

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Spacing +14 added lines, -14 removed lines

@@ -75,14 +75,14 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$properties=array_values($fkeys);
+		$fields=array_keys($fkeys);
 
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields,$indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -101,18 +101,18 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
-			for($i=0;$i<$total;$i++)
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($fkObjects[0], $source);
+			for($i=0; $i < $total; $i++)
 			{
 				foreach($fkeys as $fKey => $srcKey)
 					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
-				$success = $fkObjects[$i]->save() && $success;
+				$success=$fkObjects[$i]->save() && $success;
 			}
 		}
 		return $success;