pradosoft / prado

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;

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

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;

framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php

Spacing +12 added lines, -12 removed lines

@@ -92,13 +92,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$fkeys=$this->getRelationForeignKeys();
+		$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);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -118,8 +118,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)
@@ -134,9 +134,9 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$fkObject = $this->getContext()->getPropertyValue();
-		$source = $this->getSourceRecord();
-		$fkeys = $this->findForeignKeys($fkObject, $source);
+		$fkObject=$this->getContext()->getPropertyValue();
+		$source=$this->getSourceRecord();
+		$fkeys=$this->findForeignKeys($fkObject, $source);
 		foreach($fkeys as $fKey => $srcKey)
 			$fkObject->setColumnValue($fKey, $source->getColumnValue($srcKey));
 		return $fkObject->save();

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * TActiveRecordHasOne class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @version $Id$
- * @package System.Data.ActiveRecord.Relations
- */
+	 * TActiveRecordHasOne class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @version $Id$
+	 * @package System.Data.ActiveRecord.Relations
+	 */
 
 /**
  * Loads base active record relationship class.

framework/Data/ActiveRecord/Scaffold/TScaffoldView.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 * Handle the "edit" and "new" commands by displaying the edit view.
 	 * Default command shows the list view.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		switch(strtolower($param->getCommandName()))
 		{

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

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 			case 'char': case 'varchar':
 				return $this->createMultiLineControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 			case 'timestamp':
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 			case 'datetime': case 'smalldatetime':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				$control = $this->createDefaultControl($container,$column, $record);
+				$control=$this->createDefaultControl($container, $column, $record);
 				if($column->getIsExcluded())
 					$control->setEnabled(false);
 				return $control;
@@ -40,9 +40,9 @@ 
 			case 'boolean':
 				return $container->findControl(self::DEFAULT_ID)->getChecked();
 			case 'datetime': case 'smalldatetime':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				$value = $this->getDefaultControlValue($container,$column, $record);
+				$value=$this->getDefaultControlValue($container, $column, $record);
 				if(trim($value)==='' && $column->getAllowNull())
 					return null;
 				else

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

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 			case 'timestamp without time zone':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -45,9 +45,9 @@ 
 			case 'time without time zone':
 				return $this->getTimeValue($container, $column, $record);
 			case 'timestamp without time zone':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
 		switch($dbtype)
 		{
 			case 'date':
@@ -42,7 +42,7 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
 		switch($dbtype)
 		{
 			case 'date':
@@ -52,15 +52,15 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			case 'tinyint':
-				return $this->getIntBooleanValue($container,$column, $record);
+				return $this->getIntBooleanValue($container, $column, $record);
 			case 'set':
 				return $this->getSetValue($container, $column, $record);
 			case 'enum':
 				return $this->getEnumValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
@@ -72,12 +72,12 @@ 
 			parent::createIntegerControl($container, $column, $record);
 	}
 
-	protected function getIntBooleanValue($container,$column, $record)
+	protected function getIntBooleanValue($container, $column, $record)
 	{
 		if($column->getColumnSize()==1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+			return (int) $container->findControl(self::DEFAULT_ID)->getChecked();
 		else
-			return $this->getDefaultControlValue($container,$column, $record);
+			return $this->getDefaultControlValue($container, $column, $record);
 	}
 }
 

framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php

Spacing +10 added lines, -10 removed lines

@@ -45,10 +45,10 @@ 
 	 */
 	protected function getListView()
 	{
-		if($this->_list===null && ($id = $this->getListViewID()) !== null)
+		if($this->_list===null && ($id=$this->getListViewID())!==null)
 		{
-			$this->_list = $this->getParent()->findControl($id);
-			if($this->_list ===null)
+			$this->_list=$this->getParent()->findControl($id);
+			if($this->_list===null)
 				throw new TConfigurationException('scaffold_unable_to_find_list_view', $id);
 		}
 		return $this->_list;
@@ -78,7 +78,7 @@ 
 	{
 		if(strtolower($param->getCommandName())==='search')
 		{
-			if(($list = $this->getListView()) !== null)
+			if(($list=$this->getListView())!==null)
 			{
 				$list->setSearchCondition($this->createSearchCondition());
 				return false;
@@ -93,10 +93,10 @@ 
 	 */
 	protected function createSearchCondition()
 	{
-		$table = $this->getTableInfo();
+		$table=$this->getTableInfo();
 		if(strlen($str=$this->getSearchText()->getText()) > 0)
 		{
-			$builder = $table->createCommandBuilder($this->getRecordFinder()->getDbConnection());
+			$builder=$table->createCommandBuilder($this->getRecordFinder()->getDbConnection());
 			return $builder->getSearchExpression($this->getFields(), $str);
 		}
 	}
@@ -106,10 +106,10 @@ 
 	 */
 	protected function getFields()
 	{
-		if(strlen(trim($str=$this->getSearchableFields()))>0)
-			$fields = preg_split('/\s*,\s*/', $str);
+		if(strlen(trim($str=$this->getSearchableFields())) > 0)
+			$fields=preg_split('/\s*,\s*/', $str);
 		else
-			$fields = $this->getTableInfo()->getColumns()->getKeys();
+			$fields=$this->getTableInfo()->getColumns()->getKeys();
 		return $fields;
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getSearchableFields()
 	{
-		return $this->getViewState('SearchableFields','');
+		return $this->getViewState('SearchableFields', '');
 	}
 
 	/**