pradosoft / prado

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Braces +4 added lines, -8 removed lines

@@ -115,8 +115,7 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
 			if($this->_editRenderer===null)
 				$this->createEditRenderer($record, $classPath);
@@ -140,8 +139,7 @@ 
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index,$this->_editRenderer);
 			$this->_editRenderer->setData($record);
-		}
-		else
+		} else
 		{
 			throw new TConfigurationException(
 				'scaffold_invalid_edit_renderer', $this->getID(), get_class($record));
@@ -204,15 +202,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		else if($this->_editRenderer!==null)
+		} else if($this->_editRenderer!==null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());

Doc Comments +4 added lines, -1 removed lines

@@ -103,7 +103,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecord current Active Record instance
+	 * @return \Prado\Data\ActiveRecord\TActiveRecord current Active Record instance
 	 */
 	protected function getCurrentRecord()
 	{
@@ -136,6 +136,8 @@ 
 	 * Instantiate the external edit renderer.
 	 * @param TActiveRecord record to be edited
 	 * @param string external edit renderer class name.
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 * @param string $classPath
 	 * @throws TConfigurationException raised when renderer is not an
 	 * instance of IScaffoldEditRenderer.
 	 */
@@ -267,6 +269,7 @@ 
 	/**
 	 * Create the default scaffold editor control factory.
 	 * @param TActiveRecord record instance.
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
 	 * @return TScaffoldInputBase scaffold editor control factory.
 	 */
 	protected function getScaffoldInputBuilder($record)

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
  * xxx is the property name).
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldEditView extends TScaffoldBase

Spacing +19 added lines, -19 removed lines

@@ -90,7 +90,7 @@ 
 	public function setRecordPk($value)
 	{
 		$this->clearRecordObject();
-		$val = TPropertyValue::ensureArray($value);
+		$val=TPropertyValue::ensureArray($value);
 		$this->setViewState('PK', count($val) > 0 ? $val : null);
 	}
 
@@ -115,11 +115,11 @@ 
 	 */
 	public function initializeEditForm()
 	{
-		$record = $this->getCurrentRecord();
-		$classPath = $this->getEditRenderer();
-		if($classPath === '')
+		$record=$this->getCurrentRecord();
+		$classPath=$this->getEditRenderer();
+		if($classPath==='')
 		{
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
 		}
@@ -141,11 +141,11 @@ 
 	 */
 	protected function createEditRenderer($record, $classPath)
 	{
-		$this->_editRenderer = Prado::createComponent($classPath);
+		$this->_editRenderer=Prado::createComponent($classPath);
 		if($this->_editRenderer instanceof IScaffoldEditRenderer)
 		{
-			$index = $this->getControls()->remove($this->getInputRepeater());
-			$this->getControls()->insertAt($index,$this->_editRenderer);
+			$index=$this->getControls()->remove($this->getInputRepeater());
+			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
 		}
 		else
@@ -160,16 +160,16 @@ 
 	 */
 	protected function createRepeaterEditItem($sender, $param)
 	{
-		$type = $param->getItem()->getItemType();
+		$type=$param->getItem()->getItemType();
 		if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 		{
-			$item = $param->getItem();
-			$column = $item->getData();
+			$item=$param->getItem();
+			$column=$item->getData();
 			if($column===null)
 				return;
 
-			$record = $this->getCurrentRecord();
-			$builder = $this->getScaffoldInputBuilder($record);
+			$record=$this->getCurrentRecord();
+			$builder=$this->getScaffoldInputBuilder($record);
 			$builder->createScaffoldInput($this, $item, $column, $record);
 		}
 	}
@@ -201,14 +201,14 @@ 
 	{
 		if($this->getPage()->getIsValid())
 		{
-			$record = $this->getCurrentRecord();
+			$record=$this->getCurrentRecord();
 			if($this->_editRenderer===null)
 			{
-				$table = $this->getTableInfo();
-				$builder = $this->getScaffoldInputBuilder($record);
+				$table=$this->getTableInfo();
+				$builder=$this->getScaffoldInputBuilder($record);
 				foreach($this->getInputRepeater()->getItems() as $item)
 				{
-					$column = $table->getColumn($item->getCustomData());
+					$column=$table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
 			}
@@ -272,10 +272,10 @@ 
 	protected function getScaffoldInputBuilder($record)
 	{
 		static $_builders=array();
-		$class = get_class($record);
+		$class=get_class($record);
 		if(!isset($_builders[$class]))
 		{
-			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
+			$_builders[$class]=TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
 	}

framework/Data/ActiveRecord/TActiveRecordGateway.php

Braces +2 added lines, -4 removed lines

@@ -67,16 +67,14 @@
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record),self::TABLE_CONST);
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record),self::TABLE_METHOD);
 			return $value;
-		}
-		else
+		} else
 			return strtolower(get_class($record));
 	}
 

Doc Comments +4 added lines

@@ -236,6 +236,7 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
+	 * @param TSqlCriteria $criteria
 	 * @return array result.
 	 */
 	public function findRecordBySql(TActiveRecord $record, $criteria)
@@ -247,6 +248,7 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
+	 * @param TSqlCriteria $criteria
 	 * @return TDbDataReader result iterator.
 	 */
 	public function findRecordsBySql(TActiveRecord $record, $criteria)
@@ -288,6 +290,7 @@ 
 	/**
 	 * Sets the last insert ID to the corresponding property of the record if available.
 	 * @param TActiveRecord record for insertion
+	 * @param TActiveRecord $record
 	 */
 	protected function updatePostInsert($record)
 	{
@@ -405,6 +408,7 @@ 
 	 * Delete multiple records by criteria.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function deleteRecordsByCriteria(TActiveRecord $record, $criteria)

Spacing +50 added lines, -50 removed lines

@@ -70,21 +70,21 @@ 
 	 */
 	protected function getRecordTableName(TActiveRecord $record)
 	{
-		$class = new ReflectionClass($record);
+		$class=new ReflectionClass($record);
 		if($class->hasConstant(self::TABLE_CONST))
 		{
-			$value = $class->getConstant(self::TABLE_CONST);
+			$value=$class->getConstant(self::TABLE_CONST);
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
-					get_class($record),self::TABLE_CONST);
+					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
-			$value = $record->{self::TABLE_METHOD}();
+			$value=$record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
-					get_class($record),self::TABLE_METHOD);
+					get_class($record), self::TABLE_METHOD);
 			return $value;
 		}
 		else
@@ -98,7 +98,7 @@ 
 	 */
 	public function getRecordTableInfo(TActiveRecord $record)
 	{
-		$tableName = $this->getRecordTableName($record);
+		$tableName=$this->getRecordTableName($record);
 		return $this->getTableInfo($record->getDbConnection(), $tableName);
 	}
 
@@ -110,27 +110,27 @@ 
 	 */
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
-		$connStr = $connection->getConnectionString();
-		$key = $connStr.$tableName;
+		$connStr=$connection->getConnectionString();
+		$key=$connStr.$tableName;
 		if(!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
 			//will find the correct driver dependent classes.
 			if(!isset($this->_meta[$connStr]))
 			{
-				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
+				$this->_meta[$connStr]=TDbMetaData::getInstance($connection);
 			}
 
-			$tableInfo = null;
+			$tableInfo=null;
 			if(($cache=$this->getManager()->getCache())!==null)
-				$tableInfo = $cache->get($key);
+				$tableInfo=$cache->get($key);
 			if(empty($tableInfo))
 			{
-				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
+				$tableInfo=$this->_meta[$connStr]->getTableInfo($tableName);
 				if($cache!==null)
 					$cache->set($key, $tableInfo);
 			}
-			$this->_tables[$key] = $tableInfo;
+			$this->_tables[$key]=$tableInfo;
 		}
 		return $this->_tables[$key];
 	}
@@ -141,16 +141,16 @@ 
 	 */
 	public function getCommand(TActiveRecord $record)
 	{
-		$conn = $record->getDbConnection();
-		$connStr = $conn->getConnectionString();
-		$tableInfo = $this->getRecordTableInfo($record);
+		$conn=$record->getDbConnection();
+		$connStr=$conn->getConnectionString();
+		$tableInfo=$this->getRecordTableInfo($record);
 		if(!isset($this->_commandBuilders[$connStr]))
 		{
-			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
-			$command = new TDataGatewayCommand($builder);
-			$command->OnCreateCommand[] = array($this, 'onCreateCommand');
-			$command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
-			$this->_commandBuilders[$connStr] = $command;
+			$builder=$tableInfo->createCommandBuilder($record->getDbConnection());
+			$command=new TDataGatewayCommand($builder);
+			$command->OnCreateCommand[]=array($this, 'onCreateCommand');
+			$command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
+			$this->_commandBuilders[$connStr]=$command;
 
 		}
 		$this->_commandBuilders[$connStr]->getBuilder()->setTableInfo($tableInfo);
@@ -200,9 +200,9 @@ 
 	 * @param array primary name value pairs
 	 * @return array record data
 	 */
-	public function findRecordByPK(TActiveRecord $record,$keys)
+	public function findRecordByPK(TActiveRecord $record, $keys)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $command->findByPk($keys);
 	}
 
@@ -228,7 +228,7 @@ 
 	 */
 	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator=false)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $iterator ? $command->findAll($criteria) : $command->find($criteria);
 	}
 
@@ -256,7 +256,7 @@ 
 
 	public function findRecordsByIndex(TActiveRecord $record, $criteria, $fields, $values)
 	{
-		return $this->getCommand($record)->findAllByIndex($criteria,$fields,$values);
+		return $this->getCommand($record)->findAllByIndex($criteria, $fields, $values);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	public function insert(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
+		$result=$this->getCommand($record)->insert($this->getInsertValues($record));
 		if($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
@@ -291,12 +291,12 @@ 
 	 */
 	protected function updatePostInsert($record)
 	{
-		$command = $this->getCommand($record);
-		$tableInfo = $command->getTableInfo();
+		$command=$this->getCommand($record);
+		$tableInfo=$command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->hasSequence())
-				$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 		}
 	}
 
@@ -307,20 +307,20 @@ 
 	protected function getInsertValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($value!==null)
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
 		return $values;
 	}
@@ -333,8 +333,8 @@ 
 	public function update(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		list($data, $keys) = $this->getUpdateValues($record);
-		$result = $this->getCommand($record)->updateByPk($data, $keys);
+		list($data, $keys)=$this->getUpdateValues($record);
+		$result=$this->getCommand($record)->updateByPk($data, $keys);
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
@@ -342,30 +342,30 @@ 
 	protected function getUpdateValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
+				$primary[$name]=$value;
 			else
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
-		return array($values,$primary);
+		return array($values, $primary);
 	}
 
-	protected function updateAssociatedRecords(TActiveRecord $record,$updateBelongsTo=false)
+	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo=false)
 	{
-		$context = new TActiveRecordRelationContext($record);
+		$context=new TActiveRecordRelationContext($record);
 		return $context->updateAssociatedRecords($updateBelongsTo);
 	}
 
@@ -381,12 +381,12 @@ 
 
 	protected function getPrimaryKeyValues(TActiveRecord $record)
 	{
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+				$primary[$name]=$record->getColumnValue($name);
 		}
 		return $primary;
 	}
@@ -419,12 +419,12 @@ 
 	 * @param TActiveRecord active record
 	 * @param TActiveRecordCriteria data for the command.
 	 */
-	protected function raiseCommandEvent($event,$command,$record,$criteria)
+	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
 		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null,$criteria);
-		$param = new TActiveRecordEventParameter($command,$record,$criteria);
-		$manager = $record->getRecordManager();
+			$criteria=new TActiveRecordCriteria(null, $criteria);
+		$param=new TActiveRecordEventParameter($command, $record, $criteria);
+		$manager=$record->getRecordManager();
 		$manager->{$event}($param);
 		$record->{$event}($param);
 	}

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
 			if($handler!==null)
@@ -165,7 +165,7 @@ 
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -179,18 +179,18 @@ 
 	 * @param array row data.
 	 * @return TResultMap result sub-map.
 	 */
-	public function resolveSubMap($registry,$row)
+	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator())!==null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry,$row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
 			if($subMap===null)
-				$subMap = $this;
-			else if($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry,$row);
+				$subMap=$this;
+			else if($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/Util/TSimpleDateFormatter.php

Braces +4 added lines, -8 removed lines

@@ -225,8 +225,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -262,8 +261,7 @@ 
 						$year = $iYear + 2000;
 				}
 				$year = (int)$year;
-			}
-			elseif($token=='MM' || $token=='M')
+			} elseif($token=='MM' || $token=='M')
 			{
 				$month=$this->getInteger($value,$i_val,
 									$this->length($token),2);
@@ -273,8 +271,7 @@ 
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token=='dd' || $token=='d')
+			} elseif ($token=='dd' || $token=='d')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
@@ -284,8 +281,7 @@ 
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
 				if($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;

Doc Comments +11 added lines, -1 removed lines

@@ -65,6 +65,7 @@ 
 	 * Constructor, create a new date time formatter.
 	 * @param string formatting pattern.
 	 * @param string pattern and value charset
+	 * @param string $pattern
 	 */
 	public function __construct($pattern, $charset='UTF-8')
 	{
@@ -98,6 +99,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -172,7 +174,7 @@ 
 	/**
 	 * Gets the time stamp from string or integer.
 	 * @param string|int date to parse
-	 * @return array date info array
+	 * @return \DateTime date info array
 	 */
 	private function getDate($value)
 	{
@@ -324,6 +326,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -349,6 +352,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -361,6 +367,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str,$i,$minlength,$maxlength)

Spacing +78 added lines, -78 removed lines

@@ -59,7 +59,7 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
@@ -85,7 +85,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -111,17 +111,17 @@ 
 	 */
 	public function format($value)
 	{
-		$dt = $this->getDate($value);
-		$bits['yyyy'] = $dt->format('Y');
-		$bits['yy'] = $dt->format('y');
+		$dt=$this->getDate($value);
+		$bits['yyyy']=$dt->format('Y');
+		$bits['yy']=$dt->format('y');
 
-		$bits['MM'] = $dt->format('m');
-		$bits['M'] = $dt->format('n');
+		$bits['MM']=$dt->format('m');
+		$bits['M']=$dt->format('n');
 
-		$bits['dd'] = $dt->format('d');
-		$bits['d'] = $dt->format('j');
+		$bits['dd']=$dt->format('d');
+		$bits['d']=$dt->format('j');
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -158,13 +158,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = array();
-		if(is_int($day= strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month= strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year= strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=array();
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -178,10 +178,10 @@ 
 	{
 		if(is_numeric($value))
 		{
-			$date = new \DateTime;
+			$date=new \DateTime;
 			$date->setTimeStamp($value);
 		} else {
-			$date = new \DateTime($value);
+			$date=new \DateTime($value);
 		}
 		return $date;
 	}
@@ -191,10 +191,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value,$defaultToCurrentTime=true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -213,111 +213,111 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
 		$token='';
 		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern,$i_format);
+			$c=$this->charAt($pattern, $i_format);
 			$token='';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token=='yyyy' || $token=='yy' || $token=='y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token=='yyyy') { $x=4;$y=4; }
-				if ($token=='yy')   { $x=2;$y=2; }
-				if ($token=='y')    { $x=2;$y=4; }
-				$year = $this->getInteger($value,$i_val,$x,$y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
 			elseif($token=='MM' || $token=='M')
 			{
-				$month=$this->getInteger($value,$i_val,
-									$this->length($token),2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12 )
+				$month=$this->getInteger($value, $i_val,
+									$this->length($token), 2);
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token=='dd' || $token=='d')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay >31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
 
-			$s = new \DateTime;
+			$s=new \DateTime;
 			$s->setDate($year, $month, $day);
-			$s->setTime(0, 0 , 0);
+			$s->setTime(0, 0, 0);
 			return $s->getTimeStamp();
 		}
 	}
@@ -352,7 +352,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -363,15 +363,15 @@ 
 	 * @param int maximum integer length
 	 * @return string integer portion of the string, null otherwise
 	 */
-	private function getInteger($str,$i,$minlength,$maxlength)
+	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token= $this->substring($str, $i,$x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -310,8 +309,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -322,8 +320,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

Spacing +17 added lines, -17 removed lines

@@ -114,7 +114,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
@@ -149,13 +149,13 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
-				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
+				$name=trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password=isset($user['password']) ? $user['password'] : '';
+				$this->_users[$name]=$password;
+				$roles=isset($user['roles']) ? $user['roles'] : '';
 				if($roles!=='')
 				{
-					foreach(explode(',',$roles) as $role)
+					foreach(explode(',', $roles) as $role)
 					{
 						if(($role=trim($role))!=='')
 							$this->_roles[$name][]=$role;
@@ -167,9 +167,9 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',',$users) as $user)
+				$name=isset($role['name']) ? $role['name'] : '';
+				$users=isset($role['users']) ? $role['users'] : '';
+				foreach(explode(',', $users) as $user)
 				{
 					if(($user=trim($user))!=='')
 						$this->_roles[strtolower($user)][]=$name;
@@ -190,7 +190,7 @@ 
 			$this->_users[$name]=$node->getAttribute('password');
 			if(($roles=trim($node->getAttribute('roles')))!=='')
 			{
-				foreach(explode(',',$roles) as $role)
+				foreach(explode(',', $roles) as $role)
 				{
 					if(($role=trim($role))!=='')
 						$this->_roles[$name][]=$role;
@@ -199,7 +199,7 @@ 
 		}
 		foreach($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',',$node->getAttribute('users')) as $user)
+			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
 				if(($user=trim($user))!=='')
 					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
@@ -249,8 +249,8 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		else if(($this->_userFile=Prado::getPathOfNamespace($value, self::USER_FILE_EXT))===null || !is_file($this->_userFile))
+			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'Prado\\Security\\TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'Prado\\Security\\TUserManagerPasswordMode');
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
 		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
 			$password=md5($password);
@@ -344,7 +344,7 @@ 
 			$data=unserialize($data);
 			if(is_array($data) && count($data)===2)
 			{
-				list($username,$token)=$data;
+				list($username, $token)=$data;
 				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
@@ -363,7 +363,7 @@ 
 		$username=strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data=array($username,md5($username.$this->_users[$username]));
+			$data=array($username, md5($username.$this->_users[$username]));
 			$cookie->setValue(serialize($data));
 		}
 	}

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user=Prado::createComponent($this->_userClass,$this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -162,7 +162,8 @@
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
-	 * @return TDbConnection the created DB connection
+	 * @param string $connectionID
+	 * @return \Prado\Data\TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
 	protected function createDbConnection($connectionID)

Spacing +6 added lines, -6 removed lines

@@ -62,9 +62,9 @@ 
 	{
 		if($this->_userClass==='')
 			throw new TConfigurationException('dbusermanager_userclass_required');
-		$this->_userFactory=Prado::createComponent($this->_userClass,$this);
+		$this->_userFactory=Prado::createComponent($this->_userClass, $this);
 		if(!($this->_userFactory instanceof TDbUser))
-			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid',$this->_userClass);
+			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
-		return $this->_userFactory->validateUser($username,$password);
+		return $this->_userFactory->validateUser($username, $password);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	{
 		if($username===null)
 		{
-			$user=Prado::createComponent($this->_userClass,$this);
+			$user=Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
 		}
@@ -173,7 +173,7 @@ 
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('dbusermanager_connectionid_required');

framework/I18N/core/HTTPNegotiator.php

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
                     // i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
-				}
-				else
+				} else
 				{
 					for($i = 0, $k = count($codes); $i<$k; ++$i)
 					{

Indentation +14 added lines, -14 removed lines

@@ -53,24 +53,24 @@ 
 		$this->languages = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            return $this->languages;
+			return $this->languages;
 
 		$info = new CultureInfo();
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
-            // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+			// Cut off any q-value that might come after a semi-colon
+			if ($pos = strpos($lang, ';'))
+				$lang = trim(substr($lang, 0, $pos));
 
 			if (strstr($lang, '-'))
 			{
 				$codes = explode('-',$lang);
 				if($codes[0] == 'i')
 				{
-                    // Language not listed in ISO 639 that are not variants
-                    // of any listed language, which can be registerd with the
-                    // i-prefix, such as i-cherokee
+					// Language not listed in ISO 639 that are not variants
+					// of any listed language, which can be registerd with the
+					// i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
 				}
@@ -84,13 +84,13 @@ 
 							$lang .= '_'.strtoupper($codes[$i]);
 					}
 				}
-            }
+			}
 
 
 
 			if($info->validCulture($lang))
 				$this->languages[] = $lang;
-        }
+		}
 
 		return $this->languages;
 	}
@@ -101,20 +101,20 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+		if($this->charsets !== null) {
 			return $this->charsets;
 		}
 
 		$this->charsets = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
-            return $this->charsets;
+			return $this->charsets;
 
 		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
-        }
+			if (!empty($charset))
+				$this->charsets[] = preg_replace('/;.*/', '', $charset);
+		}
 
 		return $this->charsets;
 	}

Spacing +22 added lines, -22 removed lines

@@ -46,42 +46,42 @@ 
 	 */
 	function getLanguages()
 	{
-		if($this->languages !== null) {
+		if($this->languages!==null) {
 			return $this->languages;
 		}
 
-		$this->languages = array();
+		$this->languages=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
             return $this->languages;
 
-		$info = new CultureInfo();
+		$info=new CultureInfo();
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
             // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+            if($pos=strpos($lang, ';'))
+                $lang=trim(substr($lang, 0, $pos));
 
-			if (strstr($lang, '-'))
+			if(strstr($lang, '-'))
 			{
-				$codes = explode('-',$lang);
-				if($codes[0] == 'i')
+				$codes=explode('-', $lang);
+				if($codes[0]=='i')
 				{
                     // Language not listed in ISO 639 that are not variants
                     // of any listed language, which can be registerd with the
                     // i-prefix, such as i-cherokee
-					if(count($codes)>1)
-						$lang = $codes[1];
+					if(count($codes) > 1)
+						$lang=$codes[1];
 				}
 				else
 				{
-					for($i = 0, $k = count($codes); $i<$k; ++$i)
+					for($i=0, $k=count($codes); $i < $k; ++$i)
 					{
-						if($i == 0)
-							$lang = strtolower($codes[0]);
+						if($i==0)
+							$lang=strtolower($codes[0]);
 						else
-							$lang .= '_'.strtoupper($codes[$i]);
+							$lang.='_'.strtoupper($codes[$i]);
 					}
 				}
             }
@@ -89,7 +89,7 @@ 
 
 
 			if($info->validCulture($lang))
-				$this->languages[] = $lang;
+				$this->languages[]=$lang;
         }
 
 		return $this->languages;
@@ -101,19 +101,19 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+        if($this->charsets!==null) {
 			return $this->charsets;
 		}
 
-		$this->charsets = array();
+		$this->charsets=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
+		if(!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
             return $this->charsets;
 
-		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
+            if(!empty($charset))
+                $this->charsets[]=preg_replace('/;.*/', '', $charset);
         }
 
 		return $this->charsets;

framework/I18N/TDateFormat.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			&& strlen($datetime[1]) == 1)
 		{
 			$pattern = $datetime;
-		}
-		else //no subpattern, try the presets
+		} else //no subpattern, try the presets
 			$pattern = $this->getPreset($string);
 
 		//no presets found, use the string as the pattern

Spacing +35 added lines, -35 removed lines

@@ -70,11 +70,11 @@ 
 	 * A set of pattern presets and their respective formatting shorthand.
 	 * @var array
 	 */
-	static private $_patternPresets = array(
-			'fulldate'=>'P','full'=>'P',
-			'longdate'=>'D','long'=>'d',
-			'mediumdate'=>'p','medium'=>'p',
-			'shortdate'=>'d','short'=>'d',
+	static private $_patternPresets=array(
+			'fulldate'=>'P', 'full'=>'P',
+			'longdate'=>'D', 'long'=>'d',
+			'mediumdate'=>'p', 'medium'=>'p',
+			'shortdate'=>'d', 'short'=>'d',
 			'fulltime'=>'Q', 'longtime'=>'T',
 			'mediumtime'=>'q', 'shorttime'=>'t');
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->setViewState('Pattern',$value,'');
+		$this->setViewState('Pattern', $value, '');
 	}
 
 	/**
@@ -93,35 +93,35 @@ 
 	 */
 	public function getPattern()
 	{
-		$string = $this->getViewState('Pattern','');
+		$string=$this->getViewState('Pattern', '');
 
-		$pattern = null;
+		$pattern=null;
 
 		//try the subpattern of "date time" presets
-		$subpatterns = explode(' ',$string,2);
-		$datetime = array();
+		$subpatterns=explode(' ', $string, 2);
+		$datetime=array();
 		if(count($subpatterns)==2)
 		{
-			$datetime[] = $this->getPreset($subpatterns[0]);
-			$datetime[] = $this->getPreset($subpatterns[1]);
+			$datetime[]=$this->getPreset($subpatterns[0]);
+			$datetime[]=$this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
-			&& strlen($datetime[0]) == 1
-			&& strlen($datetime[1]) == 1)
+		if(count($datetime)==2
+			&& strlen($datetime[0])==1
+			&& strlen($datetime[1])==1)
 		{
-			$pattern = $datetime;
+			$pattern=$datetime;
 		}
 		else //no subpattern, try the presets
-			$pattern = $this->getPreset($string);
+			$pattern=$this->getPreset($string);
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
 		if($pattern===null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+			$pattern=$string;
+		if(!is_array($pattern) && strlen($pattern)==0)
+			$pattern=null;
 		return $pattern;
 	}
 
@@ -132,10 +132,10 @@ 
 	 */
 	protected function getPreset($string)
 	{
-		$string = strtolower($string);
+		$string=strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if($string==$pattern)
 				return $preset;
 		}
 	}
@@ -146,10 +146,10 @@ 
 	 */
 	public function getValue()
 	{
-		$value = $this->getViewState('Value','');
+		$value=$this->getViewState('Value', '');
 		if(empty($value))
 		{
-			$defaultText = $this->getDefaultText();
+			$defaultText=$this->getDefaultText();
 			if(empty($defaultText))
 				return time();
 		}
@@ -162,7 +162,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -217,29 +217,29 @@ 
 	 */
 	protected function getFormattedDate()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new DateFormat($app->getCulture());
+			self::$formatter=new DateFormat($app->getCulture());
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if(strlen($culture) && $app->getCulture()!==$culture)
 		{
-			$formatter = new DateFormat($culture);
+			$formatter=new DateFormat($culture);
 			return $formatter->format($value,
 									  $this->getPattern(),
 									  $this->getCharset());
 		}
 		//return the application wide culture formatted date time.
-		$result = self::$formatter->format($value,
+		$result=self::$formatter->format($value,
 										$this->getPattern(),
 										$this->getCharset());
 		return $result;

framework/Web/UI/WebControls/TRadioButton.php

Braces +2 added lines, -4 removed lines

@@ -120,11 +120,9 @@
 			{
 				$this->setChecked(true);
 				return true;
-			}
-			else
+			} else
 				return false;
-		}
-		else if($this->getChecked())
+		} else if($this->getChecked())
 			$this->setChecked(false);
 		return false;
 	}

Spacing +30 added lines, -30 removed lines

@@ -76,7 +76,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_globalID = self::$_buttonCount++;
+		$this->_globalID=self::$_buttonCount++;
 	}
 
 	/**
@@ -108,10 +108,10 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uniqueGroupName=$this->getUniqueGroupName();
-		$value=isset($values[$uniqueGroupName])?$values[$uniqueGroupName]:null;
+		$value=isset($values[$uniqueGroupName]) ? $values[$uniqueGroupName] : null;
 		if($value!==null && $value===$this->getValueAttribute())
 		{
 			if(!$this->getChecked())
@@ -132,7 +132,7 @@ 
 	 */
 	public function getGroupName()
 	{
-		return $this->getViewState('GroupName','');
+		return $this->getViewState('GroupName', '');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setGroupName($value)
 	{
-		$this->setViewState('GroupName',$value,'');
+		$this->setViewState('GroupName', $value, '');
 		$this->_uniqueGroupName=null;
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName=$this->getViewState('UniqueGroupName',''))!=='')
+		if(($groupName=$this->getViewState('UniqueGroupName', ''))!=='')
 			return $groupName;
 		else if(($uniqueID=$this->getUniqueID())!==$this->_previousUniqueID || $this->_uniqueGroupName===null)
 		{
@@ -160,12 +160,12 @@ 
 			$this->_previousUniqueID=$uniqueID;
 			if($uniqueID!=='')
 			{
-				if(($pos=strrpos($uniqueID,\Prado\Web\UI\TControl::ID_SEPARATOR))!==false)
+				if(($pos=strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR))!==false)
 				{
 					if($groupName!=='')
-						$groupName=substr($uniqueID,0,$pos+1).$groupName;
+						$groupName=substr($uniqueID, 0, $pos + 1).$groupName;
 					else if($this->getNamingContainer() instanceof TRadioButtonList)
-						$groupName=substr($uniqueID,0,$pos);
+						$groupName=substr($uniqueID, 0, $pos);
 				}
 				if($groupName==='')
 					$groupName=$uniqueID;
@@ -193,7 +193,7 @@ 
 	 */
 	public function setUniqueGroupName($value)
 	{
-		$this->setViewState('UniqueGroupName',$value,'');
+		$this->setViewState('UniqueGroupName', $value, '');
 	}
 
 	/**
@@ -204,12 +204,12 @@ 
 	 */
 	public function getRadioButtonsInGroup()
 	{
-		$group = $this->getUniqueGroupName();
-		$buttons = array();
+		$group=$this->getUniqueGroupName();
+		$buttons=array();
 		foreach(self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
-				$buttons[] = $control;
+			if($control->getUniqueGroupName()===$group)
+				$buttons[]=$control;
 		}
 		return $buttons;
 	}
@@ -230,7 +230,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -247,19 +247,19 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
-		$writer->addAttribute('type','radio');
-		$writer->addAttribute('name',$this->getUniqueGroupName());
-		$writer->addAttribute('value',$this->getValueAttribute());
+			$writer->addAttribute('id', $clientID);
+		$writer->addAttribute('type', 'radio');
+		$writer->addAttribute('name', $this->getUniqueGroupName());
+		$writer->addAttribute('value', $this->getValueAttribute());
 		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
+			$writer->addAttribute('onclick', $onclick);
 		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
+			$writer->addAttribute('checked', 'checked');
 		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 
 		$page=$this->getPage();
 		if($this->getEnabled(true)
@@ -271,10 +271,10 @@ 
 		}
 
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
+			$writer->addAttribute('accesskey', $accesskey);
+		if(($tabindex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabindex");
+		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -285,8 +285,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**